6 files changed, 6 insertions, 38 deletions
diff --git a/keyboards/qwertyydox/config.h b/keyboards/qwertyydox/config.h
index 5ea65094f9..a816a920e2 100644
--- a/keyboards/qwertyydox/config.h
+++ b/keyboards/qwertyydox/config.h
@@ -17,26 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-// wiring of each half
-#define MATRIX_ROW_PINS { B6, B2, B3, B1 }
-#define MATRIX_COL_PINS { F7, F6, F5, C6, D7, D4, D1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define RGB_DI_PIN D6
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 12
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -53,7 +34,6 @@ 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
-#endif
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/qwertyydox/info.json b/keyboards/qwertyydox/info.json
index df34cd9fa7..ee61129722 100644
--- a/keyboards/qwertyydox/info.json
+++ b/keyboards/qwertyydox/info.json
@@ -9,6 +9,11 @@
     "pid": "0x1256",
     "device_version": "1.0.0"
   },
+  "matrix_pins": {
+    "cols": ["F7", "F6", "F5", "C6", "D7", "D4", "D1"],
+    "rows": ["B6", "B2", "B3", "B1"]
+  },
+  "diode_direction": "COL2ROW",
   "split": {
     "soft_serial_pin": "D0"
   },
diff --git a/keyboards/qwertyydox/qwertyydox.c b/keyboards/qwertyydox/qwertyydox.c
deleted file mode 100644
index 53c3eca648..0000000000
--- a/keyboards/qwertyydox/qwertyydox.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "qwertyydox.h"
diff --git a/keyboards/qwertyydox/qwertyydox.h b/keyboards/qwertyydox/qwertyydox.h
deleted file mode 100644
index 9eb4073dfe..0000000000
--- a/keyboards/qwertyydox/qwertyydox.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_qwertyydox_rev1
-    #include "rev1.h"
-#endif
diff --git a/keyboards/qwertyydox/rev1/rev1.c b/keyboards/qwertyydox/rev1/rev1.c
deleted file mode 100644
index 520a869e57..0000000000
--- a/keyboards/qwertyydox/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev1.h"
diff --git a/keyboards/qwertyydox/rev1/rev1.h b/keyboards/qwertyydox/rev1/rev1.h
index a7b30b648f..d1c5588606 100644
--- a/keyboards/qwertyydox/rev1/rev1.h
+++ b/keyboards/qwertyydox/rev1/rev1.h
@@ -1,14 +1,6 @@
 #pragma once
 
-#include "qwertyydox.h"
-
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-    #include <avr/io.h>
-    #include <avr/interrupt.h>
-#endif
-#endif
+#include "quantum.h"
 
 #define LAYOUT( \
     L00, L01, L02, L03, L04, L05, L06,       R00, R01, R02, R03, R04, R05, R06, \