4 files changed, 8 insertions, 23 deletions
diff --git a/keyboards/mode/m65s/config.h b/keyboards/mode/m65s/config.h
index 9cd3bfcb35..4459e37145 100644
--- a/keyboards/mode/m65s/config.h
+++ b/keyboards/mode/m65s/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x00DE
-#define PRODUCT_ID      0x6583 // For 65S
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Mode
-#define PRODUCT         SixtyFive S
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 16
@@ -49,8 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
-#define STM32_HSECLK 8000000
-
 #define OPENDRAIN_INDICATORS
 #define LED_CAPS_LOCK_PIN C8
 
diff --git a/keyboards/mode/m65s/info.json b/keyboards/mode/m65s/info.json
index cb0cf8c12c..511a05bf8f 100644
--- a/keyboards/mode/m65s/info.json
+++ b/keyboards/mode/m65s/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Mode SixtyFive S",
+    "keyboard_name": "SixtyFive S",
+    "manufacturer": "Mode",
     "url": "",
     "maintainer": "Gondolindrim",
+    "usb": {
+        "vid": "0x00DE",
+        "pid": "0x6583",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/mode/m65s/mcuconf.h b/keyboards/mode/m65s/mcuconf.h
index 97f2ee51ee..dd68a8c1e7 100644
--- a/keyboards/mode/m65s/mcuconf.h
+++ b/keyboards/mode/m65s/mcuconf.h
@@ -22,19 +22,6 @@
 #pragma once
 
 #include_next <mcuconf.h>
-#undef STM32_PLLM_VALUE
-#undef STM32_PLLN_VALUE
-#undef STM32_PLLP_VALUE
-#undef STM32_PLLQ_VALUE
-#undef STM32_PPRE1
-#undef STM32_PPRE2
-
-#define STM32_PLLM_VALUE                    4
-#define STM32_PLLN_VALUE                    168
-#define STM32_PLLP_VALUE                    4
-#define STM32_PLLQ_VALUE                    7
-#define STM32_PPRE1                         STM32_PPRE1_DIV2
-#define STM32_PPRE2                         STM32_PPRE2_DIV1
 
 #undef STM32_I2C_USE_I2C1
 #define STM32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/mode/m65s/rules.mk b/keyboards/mode/m65s/rules.mk
index bb3ebaee28..91f94bfa10 100644
--- a/keyboards/mode/m65s/rules.mk
+++ b/keyboards/mode/m65s/rules.mk
@@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F401
+BOARD = GENERIC_STM32_F401XC
 
 # Bootloader selection
 BOOTLOADER = stm32-dfu