3 files changed, 6 insertions, 15 deletions
diff --git a/keyboards/handwired/hwpm87/config.h b/keyboards/handwired/hwpm87/config.h
index 60ef15ab44..427c62a66b 100644
--- a/keyboards/handwired/hwpm87/config.h
+++ b/keyboards/handwired/hwpm87/config.h
@@ -3,12 +3,6 @@
 
 #pragma once
 
-#include "config_common.h"
-
-
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 18
 
 /*
  * Keyboard Matrix Assignments
@@ -24,6 +18,3 @@
  
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5 }
 #define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B7, F0, F1, D6, C7, B6, F7, F6, F5, F4 }
-
-#define LED_CAPS_LOCK_PIN D5
-#define LED_PIN_ON_STATE 0
diff --git a/keyboards/handwired/hwpm87/info.json b/keyboards/handwired/hwpm87/info.json
index 90d8ad397c..8654ea7561 100644
--- a/keyboards/handwired/hwpm87/info.json
+++ b/keyboards/handwired/hwpm87/info.json
@@ -8,6 +8,12 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "indicators": {
+        "caps_lock": "D5",
+        "on_state": 0
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/handwired/hwpm87/rules.mk b/keyboards/handwired/hwpm87/rules.mk
index 7f42dae592..90f47aeb93 100644
--- a/keyboards/handwired/hwpm87/rules.mk
+++ b/keyboards/handwired/hwpm87/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #