6 files changed, 10 insertions, 18 deletions
diff --git a/keyboards/themadnoodle/ncc1701kb/v2/config.h b/keyboards/themadnoodle/ncc1701kb/v2/config.h
index a9b6cfc37d..3b3edb01bd 100644
--- a/keyboards/themadnoodle/ncc1701kb/v2/config.h
+++ b/keyboards/themadnoodle/ncc1701kb/v2/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* NCC-1701-KB PCB default pin-out */
-#define MATRIX_ROW_PINS { D4, D6, D7 }
-#define MATRIX_COL_PINS { B4, B5, B6 }
-
 /* RGB BackLight */
 #define RGB_DI_PIN B7
 #define RGBLED_NUM 4
@@ -36,6 +31,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/themadnoodle/ncc1701kb/v2/info.json b/keyboards/themadnoodle/ncc1701kb/v2/info.json
index 63ebced12b..7b7cf7a27d 100644
--- a/keyboards/themadnoodle/ncc1701kb/v2/info.json
+++ b/keyboards/themadnoodle/ncc1701kb/v2/info.json
@@ -8,6 +8,11 @@
     "pid": "0x1701",
     "device_version": "0.0.2"
   },
+  "matrix_pins": {
+    "cols": ["B4", "B5", "B6"],
+    "rows": ["D4", "D6", "D7"]
+  },
+  "diode_direction": "ROW2COL",
   "encoder": {
     "rotary": [
       {"pin_a": "D0", "pin_b": "D1"}
diff --git a/keyboards/themadnoodle/ncc1701kb/v2/v2.c b/keyboards/themadnoodle/ncc1701kb/v2/v2.c
deleted file mode 100644
index caf7c6f0f2..0000000000
--- a/keyboards/themadnoodle/ncc1701kb/v2/v2.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "v2.h"
diff --git a/keyboards/themadnoodle/noodlepad/config.h b/keyboards/themadnoodle/noodlepad/config.h
index a9b6cfc37d..3b3edb01bd 100644
--- a/keyboards/themadnoodle/noodlepad/config.h
+++ b/keyboards/themadnoodle/noodlepad/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* NCC-1701-KB PCB default pin-out */
-#define MATRIX_ROW_PINS { D4, D6, D7 }
-#define MATRIX_COL_PINS { B4, B5, B6 }
-
 /* RGB BackLight */
 #define RGB_DI_PIN B7
 #define RGBLED_NUM 4
@@ -36,6 +31,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/themadnoodle/noodlepad/info.json b/keyboards/themadnoodle/noodlepad/info.json
index 487680f137..c5f64fd267 100644
--- a/keyboards/themadnoodle/noodlepad/info.json
+++ b/keyboards/themadnoodle/noodlepad/info.json
@@ -8,6 +8,11 @@
     "pid": "0x1701",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B4", "B5", "B6"],
+    "rows": ["D4", "D6", "D7"]
+  },
+  "diode_direction": "ROW2COL",
   "encoder": {
     "rotary": [
       {"pin_a": "D0", "pin_b": "D1"}
diff --git a/keyboards/themadnoodle/noodlepad/noodlepad.c b/keyboards/themadnoodle/noodlepad/noodlepad.c
deleted file mode 100644
index afabf78629..0000000000
--- a/keyboards/themadnoodle/noodlepad/noodlepad.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "noodlepad.h"