4 files changed, 5 insertions, 12 deletions
diff --git a/keyboards/kbdfans/kbd67/rev2/config.h b/keyboards/kbdfans/kbd67/rev2/config.h
index 89bb76ca9f..4b631cf615 100644
--- a/keyboards/kbdfans/kbd67/rev2/config.h
+++ b/keyboards/kbdfans/kbd67/rev2/config.h
@@ -17,15 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B7, D0, F0, F1, F4 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, D1, D2, D3, D6, D7, B4, B6, C6, C7, F7, F6, F5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -42,4 +34,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LIMIT_VAL 240
 #define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/kbdfans/kbd67/rev2/info.json b/keyboards/kbdfans/kbd67/rev2/info.json
index b148eff402..be5032126e 100644
--- a/keyboards/kbdfans/kbd67/rev2/info.json
+++ b/keyboards/kbdfans/kbd67/rev2/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6067",
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "D1", "D2", "D3", "D6", "D7", "B4", "B6", "C6", "C7", "F7", "F6", "F5"],
+        "rows": ["B7", "D0", "F0", "F1", "F4"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B5"
     },
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/config.h b/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/config.h
index 234a44ae70..9a72f85030 100644
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/config.h
+++ b/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/config.h
@@ -11,6 +11,4 @@
 #define RETRO_TAPPING
 
 /* turn off RGB when computer sleeps */
-#ifdef RGB_DI_PIN
 #define RGBLIGHT_SLEEP
-#endif
-\ No newline at end of file
diff --git a/keyboards/kbdfans/kbd67/rev2/rev2.c b/keyboards/kbdfans/kbd67/rev2/rev2.c
deleted file mode 100644
index 803d923b92..0000000000
--- a/keyboards/kbdfans/kbd67/rev2/rev2.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev2.h"
-\ No newline at end of file