7 files changed, 4 insertions, 25 deletions
diff --git a/keyboards/gmmk/gmmk2/p96/ansi/info.json b/keyboards/gmmk/gmmk2/p96/ansi/info.json
index a5a1d6c3d5..f5b05748c7 100644
--- a/keyboards/gmmk/gmmk2/p96/ansi/info.json
+++ b/keyboards/gmmk/gmmk2/p96/ansi/info.json
@@ -8,6 +8,8 @@
         "pid": "0x504B",
         "device_version": "0.0.1"
     },
+    "processor": "WB32F3G71",
+    "bootloader": "wb32-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/config.h b/keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/config.h
index b656a22f1b..0feb7d1f53 100644
--- a/keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/config.h
+++ b/keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/config.h
@@ -16,6 +16,5 @@
 
 #pragma once
 
-#include "config_common.h"
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/gmmk/gmmk2/p96/ansi/rules.mk b/keyboards/gmmk/gmmk2/p96/ansi/rules.mk
index ba78129495..4230665e7c 100644
--- a/keyboards/gmmk/gmmk2/p96/ansi/rules.mk
+++ b/keyboards/gmmk/gmmk2/p96/ansi/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = WB32F3G71
-
-# Bootloader selection
-BOOTLOADER = wb32-dfu
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/gmmk/gmmk2/p96/config.h b/keyboards/gmmk/gmmk2/p96/config.h
index aa7e59ef98..3a6390b04f 100644
--- a/keyboards/gmmk/gmmk2/p96/config.h
+++ b/keyboards/gmmk/gmmk2/p96/config.h
@@ -16,7 +16,6 @@
 
 #pragma once
 
-#include "config_common.h"
 
 /* key matrix size */
 #define MATRIX_ROWS 14
@@ -30,10 +29,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* Hold ESC on start up to clear EEPROM and boot into bootloader mode */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 0
-
 #define TAP_CODE_DELAY 10
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
@@ -111,9 +106,3 @@
 #define ENABLE_RGB_MATRIX_MULTISPLASH
 #define ENABLE_RGB_MATRIX_SOLID_SPLASH
 #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-/* Set debounce time to 5ms */
-#define DEBOUNCE 5
-
-/* Force NKRO on boot up regardless of the setting saved in the EEPROM (uncomment to enable it) */
-// #define FORCE_NKRO
diff --git a/keyboards/gmmk/gmmk2/p96/iso/info.json b/keyboards/gmmk/gmmk2/p96/iso/info.json
index df30007a01..a2f377615b 100644
--- a/keyboards/gmmk/gmmk2/p96/iso/info.json
+++ b/keyboards/gmmk/gmmk2/p96/iso/info.json
@@ -8,6 +8,8 @@
         "pid": "0x505A",
         "device_version": "0.0.1"
     },
+    "processor": "WB32F3G71",
+    "bootloader": "wb32-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/gmmk/gmmk2/p96/iso/keymaps/via/config.h b/keyboards/gmmk/gmmk2/p96/iso/keymaps/via/config.h
index b656a22f1b..0feb7d1f53 100644
--- a/keyboards/gmmk/gmmk2/p96/iso/keymaps/via/config.h
+++ b/keyboards/gmmk/gmmk2/p96/iso/keymaps/via/config.h
@@ -16,6 +16,5 @@
 
 #pragma once
 
-#include "config_common.h"
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/gmmk/gmmk2/p96/iso/rules.mk b/keyboards/gmmk/gmmk2/p96/iso/rules.mk
index ba78129495..4230665e7c 100644
--- a/keyboards/gmmk/gmmk2/p96/iso/rules.mk
+++ b/keyboards/gmmk/gmmk2/p96/iso/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = WB32F3G71
-
-# Bootloader selection
-BOOTLOADER = wb32-dfu
-
 # Build Options
 #   change yes to no to disable
 #