diff --git a/keyboards/0_sixty/config.h b/keyboards/0_sixty/config.h
index 88c0768275..702fb3c609 100644
--- a/keyboards/0_sixty/config.h
+++ b/keyboards/0_sixty/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 12
#define MATRIX_ROW_PINS { B1, F7, F6, F5, F4 }
#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5, B3, B2 }
diff --git a/keyboards/0xc7/61key/config.h b/keyboards/0xc7/61key/config.h
index 5022a3f2d8..036f18fe6c 100644
--- a/keyboards/0xc7/61key/config.h
+++ b/keyboards/0xc7/61key/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/0xcb/static/config.h b/keyboards/0xcb/static/config.h
index 795d2862e9..0f517163e5 100644
--- a/keyboards/0xcb/static/config.h
+++ b/keyboards/0xcb/static/config.h
@@ -18,11 +18,6 @@ along with this program. If not, see .
// clang-format off
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 6
-
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/10bleoledhub/config.h b/keyboards/10bleoledhub/config.h
index 11d16bd736..0fcd15894f 100644
--- a/keyboards/10bleoledhub/config.h
+++ b/keyboards/10bleoledhub/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see .*/
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 3
#define MATRIX_ROW_PINS { F0, F5, F4, F6 }
#define MATRIX_COL_PINS { D6, D7, B5 }
diff --git a/keyboards/1upkeyboards/1up60hse/config.h b/keyboards/1upkeyboards/1up60hse/config.h
index 04633f1c32..9baa65da42 100644
--- a/keyboards/1upkeyboards/1up60hse/config.h
+++ b/keyboards/1upkeyboards/1up60hse/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/1upkeyboards/1up60hte/config.h b/keyboards/1upkeyboards/1up60hte/config.h
index 2492682ec1..f6a94ae64e 100644
--- a/keyboards/1upkeyboards/1up60hte/config.h
+++ b/keyboards/1upkeyboards/1up60hte/config.h
@@ -19,10 +19,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
/* key matrix pins */
#define MATRIX_ROW_PINS { B3, B2, B1, B0, D4 }
#define MATRIX_COL_PINS { F6, F5, F4, F1, E6, D0, D1, D2, D3, D5, D6, D7, B4, B5 }
diff --git a/keyboards/1upkeyboards/1up60rgb/config.h b/keyboards/1upkeyboards/1up60rgb/config.h
index 7c4004a581..ded1ca7ccc 100644
--- a/keyboards/1upkeyboards/1up60rgb/config.h
+++ b/keyboards/1upkeyboards/1up60rgb/config.h
@@ -1,10 +1,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/* key matrix pins */
#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3, F4 }
diff --git a/keyboards/1upkeyboards/pi40/config.h b/keyboards/1upkeyboards/pi40/config.h
index 27aee912cb..6d19ace806 100644
--- a/keyboards/1upkeyboards/pi40/config.h
+++ b/keyboards/1upkeyboards/pi40/config.h
@@ -15,10 +15,6 @@
#define OLED_FONT_H "keyboards/1upkeyboards/pi40/lib/glcdfont.c"
#endif
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
#define DIODE_DIRECTION COL2ROW
#define MATRIX_ROW_PINS { GP21, GP20, GP19, GP18 }
diff --git a/keyboards/1upkeyboards/super16/config.h b/keyboards/1upkeyboards/super16/config.h
index 63d0aaffd0..7af70c5b75 100644
--- a/keyboards/1upkeyboards/super16/config.h
+++ b/keyboards/1upkeyboards/super16/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 4
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/1upkeyboards/super16v2/config.h b/keyboards/1upkeyboards/super16v2/config.h
index 2fb81d1953..f71b6b7942 100644
--- a/keyboards/1upkeyboards/super16v2/config.h
+++ b/keyboards/1upkeyboards/super16v2/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 4
-
#define MOUSEKEY_MOVE_DELTA 25
/*
diff --git a/keyboards/1upkeyboards/sweet16/config.h b/keyboards/1upkeyboards/sweet16/config.h
index d8cbecd3ff..0af14dc040 100644
--- a/keyboards/1upkeyboards/sweet16/config.h
+++ b/keyboards/1upkeyboards/sweet16/config.h
@@ -1,10 +1,5 @@
#pragma once
-
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 4
-
#define BACKLIGHT_LEVELS 10
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/25keys/aleth42/rev0/config.h b/keyboards/25keys/aleth42/rev0/config.h
index fd2fda01a0..b84cc698e4 100644
--- a/keyboards/25keys/aleth42/rev0/config.h
+++ b/keyboards/25keys/aleth42/rev0/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 11
-
/* key matrix pins */
#define MATRIX_ROW_PINS { B0, B1, B2, B3 }
#define MATRIX_COL_PINS { D0, D1, D2, D3, D4, D5, D6, C2, C4, C5, C6 }
diff --git a/keyboards/25keys/aleth42/rev1/config.h b/keyboards/25keys/aleth42/rev1/config.h
index 7b4ab267e8..fe28b50352 100644
--- a/keyboards/25keys/aleth42/rev1/config.h
+++ b/keyboards/25keys/aleth42/rev1/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 11
-
/* key matrix pins */
#define MATRIX_ROW_PINS { B4, B0, B2, B1 }
#define MATRIX_COL_PINS { D5, D3, D2, D1, D0, D6, D4, F7, F0, F1, F4 }
diff --git a/keyboards/25keys/zinc/rev1/config.h b/keyboards/25keys/zinc/rev1/config.h
index 141bacf04f..bbc9a584eb 100644
--- a/keyboards/25keys/zinc/rev1/config.h
+++ b/keyboards/25keys/zinc/rev1/config.h
@@ -28,13 +28,7 @@ along with this program. If not, see .
//#define MASTER_RIGHT
//#define EE_HANDS
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 8
#define MATRIX_ROW_PINS { F6, F7, B1, B3 }
-
-// wiring of each half
-#define MATRIX_COLS 6
#define MATRIX_COL_PINS { F4, D4, C6, D7, E6, B4 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/25keys/zinc/reva/config.h b/keyboards/25keys/zinc/reva/config.h
index c5385d7b0b..803109ca4a 100644
--- a/keyboards/25keys/zinc/reva/config.h
+++ b/keyboards/25keys/zinc/reva/config.h
@@ -28,13 +28,7 @@ along with this program. If not, see .
//#define MASTER_RIGHT
//#define EE_HANDS
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 8
#define MATRIX_ROW_PINS { D4, C6, D7, E6 }
-
-// wiring of each half
-#define MATRIX_COLS 6
#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3}
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/2key2crawl/config.h b/keyboards/2key2crawl/config.h
index e4dd5a13b2..6025ba1d01 100644
--- a/keyboards/2key2crawl/config.h
+++ b/keyboards/2key2crawl/config.h
@@ -1,10 +1,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 7
-
/* key matrix pins */
#define MATRIX_ROW_PINS { C4, C5 }
#define MATRIX_COL_PINS { B3, B4, B5, B6, B7, C7, B2 }
diff --git a/keyboards/30wer/config.h b/keyboards/30wer/config.h
index 0c9bdc7c45..23ccf24b81 100644
--- a/keyboards/30wer/config.h
+++ b/keyboards/30wer/config.h
@@ -1,10 +1,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 3
-#define MATRIX_COLS 13
-
/* pcb default pin-out */
#define MATRIX_ROW_PINS { E6, B4, B5 }
#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D1, D0, D4, C6, D7 }
diff --git a/keyboards/3keyecosystem/2key2/config.h b/keyboards/3keyecosystem/2key2/config.h
index 9e21647523..6bb66fc39f 100644
--- a/keyboards/3keyecosystem/2key2/config.h
+++ b/keyboards/3keyecosystem/2key2/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 2
-
/* Keyboard Matrix Assignments */
#define MATRIX_ROW_PINS { F6 }
#define MATRIX_COL_PINS { F4, D7 }
diff --git a/keyboards/40percentclub/25/config.h b/keyboards/40percentclub/25/config.h
index 2436d0520b..8e65230529 100644
--- a/keyboards/40percentclub/25/config.h
+++ b/keyboards/40percentclub/25/config.h
@@ -25,11 +25,6 @@
//#define MASTER_RIGHT
//#define EE_HANDS
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 5*2
-#define MATRIX_COLS 5
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/40percentclub/4x4/config.h b/keyboards/40percentclub/4x4/config.h
index 7abe92d291..ac308220e4 100644
--- a/keyboards/40percentclub/4x4/config.h
+++ b/keyboards/40percentclub/4x4/config.h
@@ -3,10 +3,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 16
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/40percentclub/5x5/config.h b/keyboards/40percentclub/5x5/config.h
index fb6aaece25..078344e34b 100644
--- a/keyboards/40percentclub/5x5/config.h
+++ b/keyboards/40percentclub/5x5/config.h
@@ -3,10 +3,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/40percentclub/6lit/config.h b/keyboards/40percentclub/6lit/config.h
index a3d41ba0cf..9b510e641c 100644
--- a/keyboards/40percentclub/6lit/config.h
+++ b/keyboards/40percentclub/6lit/config.h
@@ -25,11 +25,6 @@
//#define MASTER_RIGHT
//#define EE_HANDS
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 2*2
-#define MATRIX_COLS 3
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/40percentclub/foobar/config.h b/keyboards/40percentclub/foobar/config.h
index 746b1a8265..91995d6687 100644
--- a/keyboards/40percentclub/foobar/config.h
+++ b/keyboards/40percentclub/foobar/config.h
@@ -25,11 +25,6 @@
//#define MASTER_RIGHT
//#define EE_HANDS
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 3*2
-#define MATRIX_COLS 5
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/40percentclub/gherkin/config.h b/keyboards/40percentclub/gherkin/config.h
index b494e4ebfd..21967c7070 100644
--- a/keyboards/40percentclub/gherkin/config.h
+++ b/keyboards/40percentclub/gherkin/config.h
@@ -1,10 +1,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 6
-
/* key matrix pins */
#define MATRIX_ROW_PINS { F7, B1, B3, B2, B6 }
#define MATRIX_COL_PINS { B4, E6, D7, C6, D4, D0 }
diff --git a/keyboards/40percentclub/half_n_half/config.h b/keyboards/40percentclub/half_n_half/config.h
index 440eb25221..0cd7a17df1 100644
--- a/keyboards/40percentclub/half_n_half/config.h
+++ b/keyboards/40percentclub/half_n_half/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4*2
-#define MATRIX_COLS 7
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/40percentclub/i75/promicro/config.h b/keyboards/40percentclub/i75/promicro/config.h
index 773cc0233b..844291c8df 100644
--- a/keyboards/40percentclub/i75/promicro/config.h
+++ b/keyboards/40percentclub/i75/promicro/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 9
-#define MATRIX_COLS 9
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/40percentclub/i75/teensy2/config.h b/keyboards/40percentclub/i75/teensy2/config.h
index 6e99dce384..d8f09b1388 100644
--- a/keyboards/40percentclub/i75/teensy2/config.h
+++ b/keyboards/40percentclub/i75/teensy2/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 9
-#define MATRIX_COLS 9
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/40percentclub/luddite/config.h b/keyboards/40percentclub/luddite/config.h
index 94bb87b6eb..4028b0cf1a 100644
--- a/keyboards/40percentclub/luddite/config.h
+++ b/keyboards/40percentclub/luddite/config.h
@@ -1,10 +1,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 8
-
/* key matrix pins */
#define MATRIX_ROW_PINS { D3, D2, D1, D0, D4, C6, D7, E6 }
#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 }
diff --git a/keyboards/40percentclub/mf68/config.h b/keyboards/40percentclub/mf68/config.h
index 4ea4913965..5409d025e9 100644
--- a/keyboards/40percentclub/mf68/config.h
+++ b/keyboards/40percentclub/mf68/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 9
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/40percentclub/nori/config.h b/keyboards/40percentclub/nori/config.h
index 2a3ca30bf7..f741ab7e94 100644
--- a/keyboards/40percentclub/nori/config.h
+++ b/keyboards/40percentclub/nori/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/40percentclub/polyandry/promicro/config.h b/keyboards/40percentclub/polyandry/promicro/config.h
index 1c1578a8d3..ff148a0b3f 100644
--- a/keyboards/40percentclub/polyandry/promicro/config.h
+++ b/keyboards/40percentclub/polyandry/promicro/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 12
-
/* key matrix pins
* Direct pins is not used because there is not a shared ground position
* between all compatible microcontrollers.
diff --git a/keyboards/40percentclub/polyandry/teensy2/config.h b/keyboards/40percentclub/polyandry/teensy2/config.h
index 6a217eea5b..8eaeb3167a 100644
--- a/keyboards/40percentclub/polyandry/teensy2/config.h
+++ b/keyboards/40percentclub/polyandry/teensy2/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 12
-
/* key matrix pins */
// Note from original contributor (ryjelsum):
diff --git a/keyboards/40percentclub/tomato/config.h b/keyboards/40percentclub/tomato/config.h
index 87856a359a..357380e3a7 100644
--- a/keyboards/40percentclub/tomato/config.h
+++ b/keyboards/40percentclub/tomato/config.h
@@ -1,10 +1,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 6
-
/* key matrix pins */
#define MATRIX_ROW_PINS { F7, B1, B3, B2, B6 }
#define MATRIX_COL_PINS { B4, E6, D7, C6, D4, D0 }
diff --git a/keyboards/45_ats/config.h b/keyboards/45_ats/config.h
index 72d66e07f9..734bc8d737 100644
--- a/keyboards/45_ats/config.h
+++ b/keyboards/45_ats/config.h
@@ -19,10 +19,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 14
-
#define ENCODERS_PAD_A { B4 }
#define ENCODERS_PAD_B { B5 }
diff --git a/keyboards/4by3/config.h b/keyboards/4by3/config.h
index 0a2513b8ab..5f20b5b97a 100644
--- a/keyboards/4by3/config.h
+++ b/keyboards/4by3/config.h
@@ -1,10 +1,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 3
-#define MATRIX_COLS 4
-
/* key matrix pins */
#define MATRIX_ROW_PINS { D1, D0, D4 }
#define MATRIX_COL_PINS { C6, D7, E6, B4 }
diff --git a/keyboards/4pplet/aekiso60/rev_a/config.h b/keyboards/4pplet/aekiso60/rev_a/config.h
index aaac4f6b70..d9f0e2e63c 100644
--- a/keyboards/4pplet/aekiso60/rev_a/config.h
+++ b/keyboards/4pplet/aekiso60/rev_a/config.h
@@ -1,9 +1,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
// ROWS: Top to bottom, COLS: Left to right
#define MATRIX_ROW_PINS {C2,D0,B0,C7,C5}
#define MATRIX_COL_PINS {C4,C6,B7,B6,B5,B4,B3,B2,B1,D6,D5,D4,D2,D1}
diff --git a/keyboards/4pplet/aekiso60/rev_b/config.h b/keyboards/4pplet/aekiso60/rev_b/config.h
index f6e636c526..e3800ad576 100644
--- a/keyboards/4pplet/aekiso60/rev_b/config.h
+++ b/keyboards/4pplet/aekiso60/rev_b/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
// ROWS: Top to bottom, COLS: Left to right
#define MATRIX_ROW_PINS {B15,A9,B7,A1,A2}
diff --git a/keyboards/4pplet/bootleg/rev_a/config.h b/keyboards/4pplet/bootleg/rev_a/config.h
index 5dfc0a3a98..5ce36a22bd 100644
--- a/keyboards/4pplet/bootleg/rev_a/config.h
+++ b/keyboards/4pplet/bootleg/rev_a/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
// ROWS: Top to bottom, COLS: Left to right
#define MATRIX_ROW_PINS {D0,C2,C4,D4,D2}
#define MATRIX_COL_PINS {C5,C6,C7,B7,B6,B5,B4,B3,B2,B1,B0,D6,D5,D3,D1}
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/config.h b/keyboards/4pplet/eagle_viper_rep/rev_a/config.h
index 86eeeeb5c8..a10e1255ec 100644
--- a/keyboards/4pplet/eagle_viper_rep/rev_a/config.h
+++ b/keyboards/4pplet/eagle_viper_rep/rev_a/config.h
@@ -16,9 +16,6 @@ along with this program. If not, see .
*/
#pragma once
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 7
-
#define MATRIX_COL_PINS { A0, B1, B0, A4, B5, B4, B3 }
#define MATRIX_ROW_PINS { A2, A1, B8, A10, C15, A15, B7, B6, C14, C13}
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/config.h b/keyboards/4pplet/eagle_viper_rep/rev_b/config.h
index ba94c0c5d3..8c3bb820a4 100644
--- a/keyboards/4pplet/eagle_viper_rep/rev_b/config.h
+++ b/keyboards/4pplet/eagle_viper_rep/rev_b/config.h
@@ -16,9 +16,6 @@ along with this program. If not, see .
*/
#pragma once
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 7
-
#define MATRIX_COL_PINS { A0, A3, A4, A7, B5, B4, B3 }
#define MATRIX_ROW_PINS { A2, A1, B8, A10, C15, A15, B7, B6, C14, C13}
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/4pplet/perk60_iso/rev_a/config.h b/keyboards/4pplet/perk60_iso/rev_a/config.h
index d272dd3003..2764861e97 100644
--- a/keyboards/4pplet/perk60_iso/rev_a/config.h
+++ b/keyboards/4pplet/perk60_iso/rev_a/config.h
@@ -16,9 +16,6 @@ along with this program. If not, see .
*/
#pragma once
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 7
-
#define MATRIX_COL_PINS { A1, B12, B14, A2, A0, A3, A4}
#define MATRIX_ROW_PINS { C14, C13, B5, B4, B8, A15, B3, B9, A5, A7}
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/4pplet/steezy60/rev_a/config.h b/keyboards/4pplet/steezy60/rev_a/config.h
index 692b823655..0f2e475460 100644
--- a/keyboards/4pplet/steezy60/rev_a/config.h
+++ b/keyboards/4pplet/steezy60/rev_a/config.h
@@ -1,9 +1,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
// ROWS: Top to bottom, COLS: Left to right
#define MATRIX_ROW_PINS {C2,D0,B0,C7,C5}
#define MATRIX_COL_PINS {C4,C6,B7,B6,B5,B4,B3,B2,B1,D6,D5,D4,D2,D1}
diff --git a/keyboards/4pplet/waffling60/rev_a/config.h b/keyboards/4pplet/waffling60/rev_a/config.h
index c9755f329a..302d40911e 100644
--- a/keyboards/4pplet/waffling60/rev_a/config.h
+++ b/keyboards/4pplet/waffling60/rev_a/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 11
// ROWS: Top to bottom, COLS: Left to right
#define MATRIX_ROW_PINS {D4,D1,C2,C4,C7,B2}
diff --git a/keyboards/4pplet/waffling60/rev_b/config.h b/keyboards/4pplet/waffling60/rev_b/config.h
index 2306c51075..de947eda06 100644
--- a/keyboards/4pplet/waffling60/rev_b/config.h
+++ b/keyboards/4pplet/waffling60/rev_b/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
// ROWS: Top to bottom, COLS: Left to right
#define MATRIX_ROW_PINS {C2,D0,B0,D6,D5}
diff --git a/keyboards/4pplet/waffling60/rev_c/config.h b/keyboards/4pplet/waffling60/rev_c/config.h
index 3d69a8748b..aca43c8c83 100644
--- a/keyboards/4pplet/waffling60/rev_c/config.h
+++ b/keyboards/4pplet/waffling60/rev_c/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
// ROWS: Top to bottom, COLS: Left to right
#define MATRIX_ROW_PINS {C2,D0,B0,D6,D5}
diff --git a/keyboards/4pplet/waffling60/rev_d/config.h b/keyboards/4pplet/waffling60/rev_d/config.h
index 65fedadffc..0d9ec62665 100644
--- a/keyboards/4pplet/waffling60/rev_d/config.h
+++ b/keyboards/4pplet/waffling60/rev_d/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
// ROWS: Top to bottom, COLS: Left to right
#define MATRIX_ROW_PINS {B14,A9,B6,B5,B4}
diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/config.h b/keyboards/4pplet/waffling60/rev_d_ansi/config.h
index 2cdf024029..255ba2f2d5 100644
--- a/keyboards/4pplet/waffling60/rev_d_ansi/config.h
+++ b/keyboards/4pplet/waffling60/rev_d_ansi/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
// ROWS: Top to bottom, COLS: Left to right
#define MATRIX_ROW_PINS {B14,A9,B6,B5,B4}
diff --git a/keyboards/4pplet/waffling60/rev_d_iso/config.h b/keyboards/4pplet/waffling60/rev_d_iso/config.h
index c367b2e73e..06c34408f3 100644
--- a/keyboards/4pplet/waffling60/rev_d_iso/config.h
+++ b/keyboards/4pplet/waffling60/rev_d_iso/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
// ROWS: Top to bottom, COLS: Left to right
#define MATRIX_ROW_PINS {B14,A9,B6,B5,B4}
diff --git a/keyboards/4pplet/waffling80/rev_a/config.h b/keyboards/4pplet/waffling80/rev_a/config.h
index 48e96b6c1b..cc729dc505 100644
--- a/keyboards/4pplet/waffling80/rev_a/config.h
+++ b/keyboards/4pplet/waffling80/rev_a/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 12
-#define MATRIX_COLS 8
-
// ROWS: Top to bottom, COLS: Left to right
#define MATRIX_ROW_PINS {C4,C5,B4,B3,B1,B0,D6,D5,D3,D4,D1,D2}
#define MATRIX_COL_PINS {C6,C7,B7,B6,B5,B2,D0,C2}
diff --git a/keyboards/4pplet/waffling80/rev_b/config.h b/keyboards/4pplet/waffling80/rev_b/config.h
index 899716599d..c065fac544 100644
--- a/keyboards/4pplet/waffling80/rev_b/config.h
+++ b/keyboards/4pplet/waffling80/rev_b/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 12
-#define MATRIX_COLS 8
-
// ROWS: Top to bottom, COLS: Left to right
#define MATRIX_ROW_PINS {B13,B12,A5,A4,A2,A1,F0,C15,C13,C14,F1,A0}
#define MATRIX_COL_PINS {B2,B1,B0,A7,A6,A3,B9,B8}
diff --git a/keyboards/4pplet/yakiimo/rev_a/config.h b/keyboards/4pplet/yakiimo/rev_a/config.h
index 60716bbd7a..959bd92622 100644
--- a/keyboards/4pplet/yakiimo/rev_a/config.h
+++ b/keyboards/4pplet/yakiimo/rev_a/config.h
@@ -16,9 +16,6 @@ along with this program. If not, see .
*/
#pragma once
-#define MATRIX_ROWS 12
-#define MATRIX_COLS 9
-
#define MATRIX_COL_PINS { B0, A5, A4, A3, A2, A1, A0, C15, A8 }
#define MATRIX_ROW_PINS { B10, B1, C13, C14, B14, B12, B9, B8, B5, B4, A15, B3 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/7c8/framework/config.h b/keyboards/7c8/framework/config.h
index 4519e6391c..3cc7d44f1b 100644
--- a/keyboards/7c8/framework/config.h
+++ b/keyboards/7c8/framework/config.h
@@ -16,9 +16,6 @@
#pragma once
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 6
-
#define MATRIX_ROW_PINS { B0, B1, D7, B2, D6, B3, D5, B4, D4, B5 }
#define MATRIX_COL_PINS { C0, C1, C2, C3, C4, C5 }
#define ENCODERS_PAD_A { D0 }
diff --git a/keyboards/9key/config.h b/keyboards/9key/config.h
index 896b08757e..8f721392c8 100644
--- a/keyboards/9key/config.h
+++ b/keyboards/9key/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 3
-#define MATRIX_COLS 3
-
/* 9Key PCB default pin-out */
#define MATRIX_ROW_PINS { D1, D0, D4 }
#define MATRIX_COL_PINS { F4, F5, F6 }
diff --git a/keyboards/abacus/config.h b/keyboards/abacus/config.h
index 44d1e97e9a..0fff005257 100644
--- a/keyboards/abacus/config.h
+++ b/keyboards/abacus/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/abstract/ellipse/rev1/config.h b/keyboards/abstract/ellipse/rev1/config.h
index 9861ebcabb..61a157c01e 100644
--- a/keyboards/abstract/ellipse/rev1/config.h
+++ b/keyboards/abstract/ellipse/rev1/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 3
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/acekeyboard/titan60/config.h b/keyboards/acekeyboard/titan60/config.h
index 77a8aef60b..a8a51591d4 100644
--- a/keyboards/acekeyboard/titan60/config.h
+++ b/keyboards/acekeyboard/titan60/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/acheron/apollo/87h/delta/config.h b/keyboards/acheron/apollo/87h/delta/config.h
index 5874b50665..490c13c2e9 100644
--- a/keyboards/acheron/apollo/87h/delta/config.h
+++ b/keyboards/acheron/apollo/87h/delta/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 17
-
// C0 , C1 , C2 , C3 , C4 , C5 , C6 , C7 , C8 , C9 , C10, C11, C12, C13, C14, C15, C16 }
#define MATRIX_COL_PINS { C8 , C9 , A8 , A10, C7 , C6 , B14, B12, B10, B1 , C5 , C4 , A7 , B0 , C11, A3 , B4 }
// R0 , R1 , R2 , R3 , R4 , R5
diff --git a/keyboards/acheron/apollo/87h/gamma/config.h b/keyboards/acheron/apollo/87h/gamma/config.h
index db57281877..07da517e24 100644
--- a/keyboards/acheron/apollo/87h/gamma/config.h
+++ b/keyboards/acheron/apollo/87h/gamma/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 16
-
// C0 , C1 , C2 , C3 , C4 , C5 , C6 , C7 , C8 , C9 , C10, C11, C12, C13, C14, C15 }
#define MATRIX_COL_PINS { B3 , A15, A10, A8 , B14, B12, B10, B1 , B0 , A7 , A4 , A5 , A6 , C15, A0 , A1 }
// R0 , R1 , R2 , R3 , R4 , R5
diff --git a/keyboards/acheron/apollo/87htsc/config.h b/keyboards/acheron/apollo/87htsc/config.h
index 226deba17d..8b61b285fd 100644
--- a/keyboards/acheron/apollo/87htsc/config.h
+++ b/keyboards/acheron/apollo/87htsc/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 17
-
// C0 , C1 , C2 , C3 , C4 , C5 , C6 , C7 , C8 , C9 , C10, C11, C12, C13, C14, C15, C16 }
#define MATRIX_COL_PINS { C8 , C9 , A8 , A10, C7 , C6 , B14, B12, B10, B1 , C5 , C4 , A7 , B0 , C11, A3 , B4 }
// R0 , R1 , R2 , R3 , R4 , R5
diff --git a/keyboards/acheron/apollo/88htsc/config.h b/keyboards/acheron/apollo/88htsc/config.h
index 5874b50665..490c13c2e9 100644
--- a/keyboards/acheron/apollo/88htsc/config.h
+++ b/keyboards/acheron/apollo/88htsc/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 17
-
// C0 , C1 , C2 , C3 , C4 , C5 , C6 , C7 , C8 , C9 , C10, C11, C12, C13, C14, C15, C16 }
#define MATRIX_COL_PINS { C8 , C9 , A8 , A10, C7 , C6 , B14, B12, B10, B1 , C5 , C4 , A7 , B0 , C11, A3 , B4 }
// R0 , R1 , R2 , R3 , R4 , R5
diff --git a/keyboards/acheron/arctic/config.h b/keyboards/acheron/arctic/config.h
index 8e087114f1..0187e823fc 100644
--- a/keyboards/acheron/arctic/config.h
+++ b/keyboards/acheron/arctic/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
#define MATRIX_COL_PINS { B0, A5, A4, A3, A2, A1, A0, F1, F0, C15, C14, C13, B9, B8}
#define MATRIX_ROW_PINS { B7, B6, A6, A7, B1}
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/acheron/athena/alpha/config.h b/keyboards/acheron/athena/alpha/config.h
index 2fdf4551a8..08526ea943 100644
--- a/keyboards/acheron/athena/alpha/config.h
+++ b/keyboards/acheron/athena/alpha/config.h
@@ -18,9 +18,6 @@ along with this program. If not, see .
#pragma once
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 17
-
#define MATRIX_COL_PINS { A8 , B14, B12, B10, B1 , B0 , A5 , A4 , A3 , A2 , A1 , A0 , C15, A7 , B4 , B3 , A15 }
#define MATRIX_ROW_PINS { B9 , C13, B8 , B5 , A14 , C14 }
diff --git a/keyboards/acheron/athena/beta/config.h b/keyboards/acheron/athena/beta/config.h
index 65c39754c3..8be04b3fa1 100644
--- a/keyboards/acheron/athena/beta/config.h
+++ b/keyboards/acheron/athena/beta/config.h
@@ -18,9 +18,6 @@ along with this program. If not, see .
#pragma once
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 17
-
#define MATRIX_COL_PINS { C7 , C6 , B14, B12, B10, B1 , C4 , A7 , A6 , A5 , A4 , A3 , A2 , C5 , A10, A8 , C9 }
#define MATRIX_ROW_PINS { C11, C12, C10, A15, C0 , A1 }
diff --git a/keyboards/acheron/austin/config.h b/keyboards/acheron/austin/config.h
index 9de87c263e..323d7b3c83 100644
--- a/keyboards/acheron/austin/config.h
+++ b/keyboards/acheron/austin/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 19
-
#define MATRIX_COL_PINS { B10, B11, B12, B13, B14, B15, A8, A9, A10, A5, A15, B3, B4, B5, B8, A3, C15, C14, F1 }
#define MATRIX_ROW_PINS { C13, A4, A7, B0, B1, B2 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/acheron/elongate/beta/config.h b/keyboards/acheron/elongate/beta/config.h
index ea72c59000..a3b19e7fe6 100644
--- a/keyboards/acheron/elongate/beta/config.h
+++ b/keyboards/acheron/elongate/beta/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 13
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/acheron/elongate/delta/config.h b/keyboards/acheron/elongate/delta/config.h
index 0b875dc2f6..2be4dba3e3 100755
--- a/keyboards/acheron/elongate/delta/config.h
+++ b/keyboards/acheron/elongate/delta/config.h
@@ -18,9 +18,6 @@ along with this program. If not, see .
#pragma once
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
#define MATRIX_COL_PINS { A10, A9, A8, B14, B12, B11, B10, B2, B1, A7, A5, B9, B8, B7, B6 }
#define MATRIX_ROW_PINS { B3, A15, B0, B4, B5 }
diff --git a/keyboards/acheron/keebspcb/config.h b/keyboards/acheron/keebspcb/config.h
index 21a05fc181..1a8eab8b80 100644
--- a/keyboards/acheron/keebspcb/config.h
+++ b/keyboards/acheron/keebspcb/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 13
-
#define MATRIX_COL_PINS { B12, A1, A0, F1, F0, C15, C14, C13, B9, B8, B7, B6, B5}
#define MATRIX_ROW_PINS { B4, B3, A2, A3, A4}
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/acheron/lasgweloth/config.h b/keyboards/acheron/lasgweloth/config.h
index 59a44a9b9b..e41924d0c6 100644
--- a/keyboards/acheron/lasgweloth/config.h
+++ b/keyboards/acheron/lasgweloth/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
#define MATRIX_COL_PINS { B12, A2 , A1 , A0 , F1 , F0 , C15, C14, C13, A7 , A6 , A5 , A4 , B7}
#define MATRIX_ROW_PINS { B9 , B8 , A3 , B0 , B1 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/acheron/shark/alpha/config.h b/keyboards/acheron/shark/alpha/config.h
index 139b21b0b9..cadd2d825d 100644
--- a/keyboards/acheron/shark/alpha/config.h
+++ b/keyboards/acheron/shark/alpha/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
/* encoder pads */
#define ENCODERS_PAD_A { B6 }
#define ENCODERS_PAD_B { B7 }
diff --git a/keyboards/acheron/shark/beta/config.h b/keyboards/acheron/shark/beta/config.h
index 7c56f2d258..aab3c78077 100644
--- a/keyboards/acheron/shark/beta/config.h
+++ b/keyboards/acheron/shark/beta/config.h
@@ -18,9 +18,6 @@ along with this program. If not, see .
#pragma once
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
#define MATRIX_COL_PINS { A5 , A10, C13, B9 , B8 , B5 , B4 , B3 , A15, A0 , A1 , A2 }
#define MATRIX_ROW_PINS { A8 , B14, A4 , A3 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ada/ada1800mini/config.h b/keyboards/ada/ada1800mini/config.h
index 2c4298c82c..54da0bdad4 100644
--- a/keyboards/ada/ada1800mini/config.h
+++ b/keyboards/ada/ada1800mini/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/ada/infinity81/config.h b/keyboards/ada/infinity81/config.h
index 237d6cafeb..d8fc5bf226 100644
--- a/keyboards/ada/infinity81/config.h
+++ b/keyboards/ada/infinity81/config.h
@@ -4,10 +4,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 15
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/adelheid/config.h b/keyboards/adelheid/config.h
index 3fcb74af8e..78145a9a0c 100644
--- a/keyboards/adelheid/config.h
+++ b/keyboards/adelheid/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 7
-#define MATRIX_COLS 15
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/adkb96/rev1/config.h b/keyboards/adkb96/rev1/config.h
index 08edaacb62..49ed9c255b 100644
--- a/keyboards/adkb96/rev1/config.h
+++ b/keyboards/adkb96/rev1/config.h
@@ -16,11 +16,6 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 12
-#define MATRIX_COLS 8
-
// wiring of each half
#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5 }
#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4 }
diff --git a/keyboards/adm42/config.h b/keyboards/adm42/config.h
index 5c1a5b2c7c..03749906e8 100644
--- a/keyboards/adm42/config.h
+++ b/keyboards/adm42/config.h
@@ -17,9 +17,6 @@
#pragma once
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
#define DIODE_DIRECTION ROW2COL
#define TAP_CODE_DELAY 1
diff --git a/keyboards/adpenrose/akemipad/config.h b/keyboards/adpenrose/akemipad/config.h
index f690191620..41156ecf3d 100644
--- a/keyboards/adpenrose/akemipad/config.h
+++ b/keyboards/adpenrose/akemipad/config.h
@@ -4,10 +4,6 @@
#pragma once
-/* Key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 5
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/adpenrose/kintsugi/config.h b/keyboards/adpenrose/kintsugi/config.h
index 8871366659..c4007613e9 100644
--- a/keyboards/adpenrose/kintsugi/config.h
+++ b/keyboards/adpenrose/kintsugi/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 7
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/adpenrose/obi/config.h b/keyboards/adpenrose/obi/config.h
index 96b609fb59..c577a4a727 100644
--- a/keyboards/adpenrose/obi/config.h
+++ b/keyboards/adpenrose/obi/config.h
@@ -4,10 +4,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 14
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/adpenrose/shisaku/config.h b/keyboards/adpenrose/shisaku/config.h
index f60f034d18..47555b5190 100644
--- a/keyboards/adpenrose/shisaku/config.h
+++ b/keyboards/adpenrose/shisaku/config.h
@@ -4,10 +4,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 7
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/aeboards/aegis/config.h b/keyboards/aeboards/aegis/config.h
index df83c82366..edaef2f7b9 100644
--- a/keyboards/aeboards/aegis/config.h
+++ b/keyboards/aeboards/aegis/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 12
-#define MATRIX_COLS 9
-
/* key matrix pins */
#define MATRIX_ROW_PINS { F5, F6, E6, F7, D1, D0, D6, D4, B4, D7, B6, B5 }
#define MATRIX_COL_PINS { C7, C6, B7, D2, D3, B3, B2, B1, B0 }
diff --git a/keyboards/aeboards/constellation/rev1/config.h b/keyboards/aeboards/constellation/rev1/config.h
index f3c9650b0f..83eb6e90d3 100755
--- a/keyboards/aeboards/constellation/rev1/config.h
+++ b/keyboards/aeboards/constellation/rev1/config.h
@@ -18,10 +18,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/* key matrix pins */
#define MATRIX_ROW_PINS { B0, B1, F0, F1, F4 }
#define MATRIX_COL_PINS { E6, D5, B2, B3, D3, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
diff --git a/keyboards/aeboards/constellation/rev2/config.h b/keyboards/aeboards/constellation/rev2/config.h
index cb9fe17e05..faaedf495d 100755
--- a/keyboards/aeboards/constellation/rev2/config.h
+++ b/keyboards/aeboards/constellation/rev2/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/* key matrix pins */
#define MATRIX_ROW_PINS { B15, A14, A2, B13, B14 }
#define MATRIX_COL_PINS { B12, A1, H0, C15, C14, B11, B10, B2, B1, B0, A7, A6, A5, A4, A3 }
diff --git a/keyboards/aeboards/constellation/rev3/config.h b/keyboards/aeboards/constellation/rev3/config.h
index f3c9650b0f..83eb6e90d3 100755
--- a/keyboards/aeboards/constellation/rev3/config.h
+++ b/keyboards/aeboards/constellation/rev3/config.h
@@ -18,10 +18,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/* key matrix pins */
#define MATRIX_ROW_PINS { B0, B1, F0, F1, F4 }
#define MATRIX_COL_PINS { E6, D5, B2, B3, D3, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
diff --git a/keyboards/afternoonlabs/breeze/rev0/config.h b/keyboards/afternoonlabs/breeze/rev0/config.h
index fffb1a89f3..810b4aad37 100644
--- a/keyboards/afternoonlabs/breeze/rev0/config.h
+++ b/keyboards/afternoonlabs/breeze/rev0/config.h
@@ -16,11 +16,6 @@
#pragma once
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 9
-
// wiring of each half
#define MATRIX_ROW_PINS \
{ F4, F5, F6, F7, B1 }
diff --git a/keyboards/afternoonlabs/breeze/rev1/config.h b/keyboards/afternoonlabs/breeze/rev1/config.h
index 3ce5f8eff8..19d1cea8d9 100644
--- a/keyboards/afternoonlabs/breeze/rev1/config.h
+++ b/keyboards/afternoonlabs/breeze/rev1/config.h
@@ -16,11 +16,6 @@
#pragma once
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 9
-
// wiring of each half
#define MATRIX_ROW_PINS \
{ F4, F5, F6, F7, B1 }
diff --git a/keyboards/afternoonlabs/gust/rev1/config.h b/keyboards/afternoonlabs/gust/rev1/config.h
index 4c442bafe0..db2839cfc9 100644
--- a/keyboards/afternoonlabs/gust/rev1/config.h
+++ b/keyboards/afternoonlabs/gust/rev1/config.h
@@ -16,11 +16,6 @@
#pragma once
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 3
-#define MATRIX_COLS 3
-
// wiring of each half
#define MATRIX_ROW_PINS { F5, F4, D0 }
#define MATRIX_COL_PINS { D1, D2, D3 }
diff --git a/keyboards/afternoonlabs/oceanbreeze/rev1/config.h b/keyboards/afternoonlabs/oceanbreeze/rev1/config.h
index 3a3bf56ccb..f0b7fa6b8d 100644
--- a/keyboards/afternoonlabs/oceanbreeze/rev1/config.h
+++ b/keyboards/afternoonlabs/oceanbreeze/rev1/config.h
@@ -16,11 +16,6 @@
#pragma once
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 12
-#define MATRIX_COLS 9
-
// wiring of each half
#define MATRIX_ROW_PINS \
{ F4, F5, F6, F7, B1, B6 }
diff --git a/keyboards/afternoonlabs/southern_breeze/rev1/config.h b/keyboards/afternoonlabs/southern_breeze/rev1/config.h
index 3ce5f8eff8..19d1cea8d9 100644
--- a/keyboards/afternoonlabs/southern_breeze/rev1/config.h
+++ b/keyboards/afternoonlabs/southern_breeze/rev1/config.h
@@ -16,11 +16,6 @@
#pragma once
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 9
-
// wiring of each half
#define MATRIX_ROW_PINS \
{ F4, F5, F6, F7, B1 }
diff --git a/keyboards/afternoonlabs/summer_breeze/rev1/config.h b/keyboards/afternoonlabs/summer_breeze/rev1/config.h
index 3ce5f8eff8..19d1cea8d9 100644
--- a/keyboards/afternoonlabs/summer_breeze/rev1/config.h
+++ b/keyboards/afternoonlabs/summer_breeze/rev1/config.h
@@ -16,11 +16,6 @@
#pragma once
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 9
-
// wiring of each half
#define MATRIX_ROW_PINS \
{ F4, F5, F6, F7, B1 }
diff --git a/keyboards/ai03/andromeda/config.h b/keyboards/ai03/andromeda/config.h
index b36e85531e..1fb163a652 100644
--- a/keyboards/ai03/andromeda/config.h
+++ b/keyboards/ai03/andromeda/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see .
#pragma once
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 17
-
#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B2, B1, B0, A7, A6, B5, B8, B9 }
#define MATRIX_ROW_PINS { B4, B3, A15, A3, A4, A5 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ai03/equinox/config.h b/keyboards/ai03/equinox/config.h
index 4b76bf8b26..f838baddd6 100644
--- a/keyboards/ai03/equinox/config.h
+++ b/keyboards/ai03/equinox/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/ai03/jp60/config.h b/keyboards/ai03/jp60/config.h
index fbacf6890a..76e81dc2aa 100644
--- a/keyboards/ai03/jp60/config.h
+++ b/keyboards/ai03/jp60/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/ai03/lunar/config.h b/keyboards/ai03/lunar/config.h
index b0634a610e..10c8ab70ab 100644
--- a/keyboards/ai03/lunar/config.h
+++ b/keyboards/ai03/lunar/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/ai03/orbit/config.h b/keyboards/ai03/orbit/config.h
index 3d96f09c79..531232b92a 100644
--- a/keyboards/ai03/orbit/config.h
+++ b/keyboards/ai03/orbit/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 10 // Double rows for split keyboards. Orbit has 5, so define 10
-#define MATRIX_COLS 7
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/ai03/orbit_x/config.h b/keyboards/ai03/orbit_x/config.h
index ce5bf88b86..31fc8515e9 100644
--- a/keyboards/ai03/orbit_x/config.h
+++ b/keyboards/ai03/orbit_x/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 8 // Double the rows for split
-#define MATRIX_COLS 6
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/ai03/polaris/config.h b/keyboards/ai03/polaris/config.h
index 06c2be69c3..9c360a190f 100644
--- a/keyboards/ai03/polaris/config.h
+++ b/keyboards/ai03/polaris/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/ai03/quasar/config.h b/keyboards/ai03/quasar/config.h
index f80ecd9863..04765c0788 100644
--- a/keyboards/ai03/quasar/config.h
+++ b/keyboards/ai03/quasar/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 16
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/ai03/soyuz/config.h b/keyboards/ai03/soyuz/config.h
index 71ab43c8bb..027bc03faa 100644
--- a/keyboards/ai03/soyuz/config.h
+++ b/keyboards/ai03/soyuz/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 4
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/ai03/vega/config.h b/keyboards/ai03/vega/config.h
index e125b623af..b2798481d4 100644
--- a/keyboards/ai03/vega/config.h
+++ b/keyboards/ai03/vega/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
#define MATRIX_COL_PINS { B5, A3, A9, A8, B15, B14, B13, B12, B11, B10, B2, B1, B0, A7, A6 }
#define MATRIX_ROW_PINS { A1, A2, B3, A15, A10 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ai03/voyager60_alps/config.h b/keyboards/ai03/voyager60_alps/config.h
index 6d6626784b..30b7481688 100644
--- a/keyboards/ai03/voyager60_alps/config.h
+++ b/keyboards/ai03/voyager60_alps/config.h
@@ -15,9 +15,6 @@ along with this program. If not, see .
#pragma once
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
#define MATRIX_ROW_PINS { B1, B2, B3, F0, F1 }
#define MATRIX_COL_PINS { F4, F7, F5, F6, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3}
diff --git a/keyboards/akb/eb46/config.h b/keyboards/akb/eb46/config.h
index 5b906d9d7f..3fa5884805 100644
--- a/keyboards/akb/eb46/config.h
+++ b/keyboards/akb/eb46/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 13
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/akb/raine/config.h b/keyboards/akb/raine/config.h
index de40b006af..1f717ab436 100644
--- a/keyboards/akb/raine/config.h
+++ b/keyboards/akb/raine/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 16
-
/* key matrix pins */
#define MATRIX_ROW_PINS \
{ E6, C6, F7, B2, B0 }
diff --git a/keyboards/akegata_denki/device_one/config.h b/keyboards/akegata_denki/device_one/config.h
index 8f7ed20d14..dc1e1cded3 100644
--- a/keyboards/akegata_denki/device_one/config.h
+++ b/keyboards/akegata_denki/device_one/config.h
@@ -1,9 +1,6 @@
#pragma once
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
#define MATRIX_ROW_PINS { B1, B0, A9, A8, A0 }
#define MATRIX_COL_PINS { A2, A3, A4, A5, A6, A7, A1, A10, A15, B3, B4, B5, B6, B7, B8}
diff --git a/keyboards/alas/config.h b/keyboards/alas/config.h
old mode 100755
new mode 100644
diff --git a/keyboards/aleblazer/zodiark/config.h b/keyboards/aleblazer/zodiark/config.h
index 1fe119ad1b..e56f0e907b 100644
--- a/keyboards/aleblazer/zodiark/config.h
+++ b/keyboards/aleblazer/zodiark/config.h
@@ -20,9 +20,6 @@ along with this program. If not, see .
#define SOFT_SERIAL_PIN D3
#define SELECT_SOFT_SERIAL_SPEED 1
-/* key matrix size */
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 7
#define DIODE_DIRECTION COL2ROW
#define ENCODERS_PAD_A { D2 }
diff --git a/keyboards/alf/dc60/config.h b/keyboards/alf/dc60/config.h
index 2bb959c37c..4ae0863425 100644
--- a/keyboards/alf/dc60/config.h
+++ b/keyboards/alf/dc60/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/alf/x11/config.h b/keyboards/alf/x11/config.h
index aec8cb1270..84da2e7ce9 100644
--- a/keyboards/alf/x11/config.h
+++ b/keyboards/alf/x11/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 7
-#define MATRIX_COLS 13
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/alf/x2/config.h b/keyboards/alf/x2/config.h
index 980007dadf..1ce6375d8e 100644
--- a/keyboards/alf/x2/config.h
+++ b/keyboards/alf/x2/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/* key matrix pins */
#define MATRIX_ROW_PINS \
{ D0, D1, D2, D3, D5 }
diff --git a/keyboards/alfredslab/swift65/hotswap/config.h b/keyboards/alfredslab/swift65/hotswap/config.h
index 953cf3b7b4..585855ebe9 100644
--- a/keyboards/alfredslab/swift65/hotswap/config.h
+++ b/keyboards/alfredslab/swift65/hotswap/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/alfredslab/swift65/solder/config.h b/keyboards/alfredslab/swift65/solder/config.h
index ce440645a3..aa2502a0a1 100644
--- a/keyboards/alfredslab/swift65/solder/config.h
+++ b/keyboards/alfredslab/swift65/solder/config.h
@@ -18,10 +18,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 16
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/aliceh66/pianoforte/config.h b/keyboards/aliceh66/pianoforte/config.h
index 518df68aeb..40d071201a 100644
--- a/keyboards/aliceh66/pianoforte/config.h
+++ b/keyboards/aliceh66/pianoforte/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-
-#define MATRIX_ROWS 12
-#define MATRIX_COLS 9
-
#define MATRIX_COL_PINS { D4, D6, D7, B4, B5, F1, F0, E6, B6 }
#define MATRIX_ROW_PINS { D1, D0, D3, D2, D5, B0, C6, C7, F6, F7, F5, F4 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/aliceh66/pianoforte_hs/config.h b/keyboards/aliceh66/pianoforte_hs/config.h
index ab4b1e7ced..7aa6ea4e4b 100644
--- a/keyboards/aliceh66/pianoforte_hs/config.h
+++ b/keyboards/aliceh66/pianoforte_hs/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-
-#define MATRIX_ROWS 12
-#define MATRIX_COLS 9
-
#define MATRIX_COL_PINS { D6, D7, B4, B5, B6, F6, F5, E6, D4 }
#define MATRIX_ROW_PINS { D2, D1, D3, D0, D5, B0, F0, F1, F7, F4, C7, C6 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/alpha/config.h b/keyboards/alpha/config.h
index 21483c4e4e..483b12d1bb 100755
--- a/keyboards/alpha/config.h
+++ b/keyboards/alpha/config.h
@@ -1,10 +1,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 3
-#define MATRIX_COLS 10
-
/* key matrix pins */
#define MATRIX_ROW_PINS { D4, B4, B5 }
#define MATRIX_COL_PINS { D7, E6, C6, B6, B2, B3, B1, F7, F6, F5 }
diff --git a/keyboards/alpine65/config.h b/keyboards/alpine65/config.h
index 5535eac12c..61af018700 100644
--- a/keyboards/alpine65/config.h
+++ b/keyboards/alpine65/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
#define MATRIX_COL_PINS { B9 , B8 , B7 , B6 , B5 , B4 , B3 , A15, A9 , A8 , B14, B12, A10, A0 , A1 }
#define MATRIX_ROW_PINS { C14, C15, C13, A2 , A3 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/alps64/config.h b/keyboards/alps64/config.h
index 41b7cd753e..aff4064bb4 100644
--- a/keyboards/alps64/config.h
+++ b/keyboards/alps64/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 8
-
#define MATRIX_COL_PINS { B0, B1, B2, B3, B4, B5, B6, B7 }
#define MATRIX_ROW_PINS { D0, D1, D2, D3, D4, D5, D6, C2 }
diff --git a/keyboards/alt34/rev1/config.h b/keyboards/alt34/rev1/config.h
index 8c4964a404..60e4a857cf 100644
--- a/keyboards/alt34/rev1/config.h
+++ b/keyboards/alt34/rev1/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 5
-
// wiring of each half
#define MATRIX_ROW_PINS { D7, E6, B4, B5 }
#define MATRIX_COL_PINS { B6, B2, B3, B1, F7 }
diff --git a/keyboards/amag23/config.h b/keyboards/amag23/config.h
index 7d84d3f704..82e82fc469 100644
--- a/keyboards/amag23/config.h
+++ b/keyboards/amag23/config.h
@@ -16,10 +16,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 6
-
#define MATRIX_ROW_PINS { A0, A1, A2, A3 }
#define MATRIX_COL_PINS { B0, B1, B2, B3, B4, B5 }
diff --git a/keyboards/amjkeyboard/amj40/config.h b/keyboards/amjkeyboard/amj40/config.h
index 6e05148ee4..01e94f7651 100755
--- a/keyboards/amjkeyboard/amj40/config.h
+++ b/keyboards/amjkeyboard/amj40/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
// ROWS: Top to bottom, COLS: Left to right
#define MATRIX_ROW_PINS { F4, F5, F6, F7}
diff --git a/keyboards/amjkeyboard/amj60/config.h b/keyboards/amjkeyboard/amj60/config.h
index 8328574f36..825edef631 100644
--- a/keyboards/amjkeyboard/amj60/config.h
+++ b/keyboards/amjkeyboard/amj60/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/amjkeyboard/amj66/config.h b/keyboards/amjkeyboard/amj66/config.h
index 5c0cb614f4..a0dd902c65 100644
--- a/keyboards/amjkeyboard/amj66/config.h
+++ b/keyboards/amjkeyboard/amj66/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* Key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 16
-
/* Keyboard Matrix Assignments */
#define MATRIX_ROW_PINS { F7, F6, F5, F4, F1 }
#define MATRIX_COL_PINS { F0, B3, B2, B1, B0, B7, D0, D1, D2, D3, D5, D6, D7, B4, B5, B6 }
diff --git a/keyboards/amjkeyboard/amj84/config.h b/keyboards/amjkeyboard/amj84/config.h
index 17e0748712..04b231e0d4 100644
--- a/keyboards/amjkeyboard/amj84/config.h
+++ b/keyboards/amjkeyboard/amj84/config.h
@@ -4,10 +4,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 15
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/amjkeyboard/amjpad/config.h b/keyboards/amjkeyboard/amjpad/config.h
index 211bf74160..46f38e6dbb 100644
--- a/keyboards/amjkeyboard/amjpad/config.h
+++ b/keyboards/amjkeyboard/amjpad/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 4
-
// ROWS: Top to bottom, COLS: Left to right
#define MATRIX_ROW_PINS { F7, F6, F5, F4, D5, D0 }
diff --git a/keyboards/ano/config.h b/keyboards/ano/config.h
index d112f4f285..be3a49fe33 100644
--- a/keyboards/ano/config.h
+++ b/keyboards/ano/config.h
@@ -16,10 +16,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 18
-
#define MATRIX_ROW_PINS { A4, B14, B15, B9, B10, B11 }
#define MATRIX_COL_PINS { B0, B1, B2, B3, B4, B5, B6, B7, A5, A6, A7, A8, A15, A2, A1, A0, B8, B13 }
diff --git a/keyboards/anomalykb/a65i/config.h b/keyboards/anomalykb/a65i/config.h
index 7cf3cee6f9..4e13b2edd9 100644
--- a/keyboards/anomalykb/a65i/config.h
+++ b/keyboards/anomalykb/a65i/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 16
-
#define MATRIX_ROW_PINS { B3, B2, B1, B0, B5 }
#define MATRIX_COL_PINS { D7, D6, D4, B4, B6, E6, F1, B7, C6, C7, D5, D3, D2, F0, D1, D0 }
diff --git a/keyboards/aos/tkl/config.h b/keyboards/aos/tkl/config.h
index 4ec06ca6dc..466eff89af 100644
--- a/keyboards/aos/tkl/config.h
+++ b/keyboards/aos/tkl/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 17
-
#define MATRIX_ROW_PINS { D3, D2, B7, F1, C7, D5 }
#define MATRIX_COL_PINS { B0, B1, B2, B3, F4, F5, F6, F7, B6, B5, D7, B4, D6, F0, D1, C6, D4 }
diff --git a/keyboards/aozora/config.h b/keyboards/aozora/config.h
index 01a55a9797..dc68828e0f 100644
--- a/keyboards/aozora/config.h
+++ b/keyboards/aozora/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 17
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/aplyard/aplx6/rev1/config.h b/keyboards/aplyard/aplx6/rev1/config.h
index 8a32a8ae37..cd4a58eec5 100644
--- a/keyboards/aplyard/aplx6/rev1/config.h
+++ b/keyboards/aplyard/aplx6/rev1/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 3
-
/* pin-out */
#define MATRIX_ROW_PINS { E6, B3 }
#define MATRIX_COL_PINS { F7, B6, F4 }
diff --git a/keyboards/aplyard/aplx6/rev2/config.h b/keyboards/aplyard/aplx6/rev2/config.h
index 649e72e847..1e109c7001 100644
--- a/keyboards/aplyard/aplx6/rev2/config.h
+++ b/keyboards/aplyard/aplx6/rev2/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 3
-
/* 9Key PCB default pin-out */
#define MATRIX_ROW_PINS { B4, B5 }
#define MATRIX_COL_PINS { C6, D7, E6 }
diff --git a/keyboards/arabica37/rev1/config.h b/keyboards/arabica37/rev1/config.h
index 49c2f0d254..dd7287d9c2 100644
--- a/keyboards/arabica37/rev1/config.h
+++ b/keyboards/arabica37/rev1/config.h
@@ -20,10 +20,6 @@ along with this program. If not, see .
#define SOFT_SERIAL_PIN D2
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 7
#define MATRIX_ROW_PINS { D4, C6, D7, E6 }
// wiring of each half
diff --git a/keyboards/ares/config.h b/keyboards/ares/config.h
index 7c624433cf..0108719627 100644
--- a/keyboards/ares/config.h
+++ b/keyboards/ares/config.h
@@ -20,9 +20,6 @@ along with this program. If not, see .
#define RGBLED_NUM 16
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 }
#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
diff --git a/keyboards/arisu/config.h b/keyboards/arisu/config.h
index 6ad74f302a..5001da5590 100644
--- a/keyboards/arisu/config.h
+++ b/keyboards/arisu/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/ash1800/config.h b/keyboards/ash1800/config.h
index 3591967a8f..c48bc4ec6a 100644
--- a/keyboards/ash1800/config.h
+++ b/keyboards/ash1800/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 12
-#define MATRIX_COLS 10
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/ash_xiix/config.h b/keyboards/ash_xiix/config.h
index 9d0c2dbae9..e21327b99c 100644
--- a/keyboards/ash_xiix/config.h
+++ b/keyboards/ash_xiix/config.h
@@ -15,10 +15,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 12
-#define MATRIX_COLS 10
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/ashpil/modelm_usbc/config.h b/keyboards/ashpil/modelm_usbc/config.h
index 97c826900c..00c5f5626b 100644
--- a/keyboards/ashpil/modelm_usbc/config.h
+++ b/keyboards/ashpil/modelm_usbc/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 16
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/at_at/660m/config.h b/keyboards/at_at/660m/config.h
index 621a94e3fe..bf47051193 100644
--- a/keyboards/at_at/660m/config.h
+++ b/keyboards/at_at/660m/config.h
@@ -23,10 +23,6 @@ along with this program. If not, see .
/* LSE clock */
#define STM32_LSECLK 32768
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 16
-
#define MATRIX_COL_PINS { B15, B14, B13, B12, B11, B10, B2, B1, B9, B8, B7, B6, B5, B3, B4, B0 }
#define MATRIX_ROW_PINS { A3, A4, A5, A0, A1 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/atlantis/ak81_ve/config.h b/keyboards/atlantis/ak81_ve/config.h
index 21afa1e616..4a7898350d 100644
--- a/keyboards/atlantis/ak81_ve/config.h
+++ b/keyboards/atlantis/ak81_ve/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* Key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 15
-
/* Key matrix pins */
#define MATRIX_ROW_PINS { F1, F7, F6, F5, F4, D5 }
#define MATRIX_COL_PINS { F0, C7, C6, B6, B5, B4, D7, D6, B2, B7, D3, D2, D1, D0, B3 }
diff --git a/keyboards/atlas_65/config.h b/keyboards/atlas_65/config.h
index 5d7baee944..78beebcc65 100644
--- a/keyboards/atlas_65/config.h
+++ b/keyboards/atlas_65/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/atomic/config.h b/keyboards/atomic/config.h
index a545d16a99..103fa611cb 100644
--- a/keyboards/atomic/config.h
+++ b/keyboards/atomic/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/atreus/config.h b/keyboards/atreus/config.h
index 66bbbd11a8..c30966d9d2 100644
--- a/keyboards/atreus/config.h
+++ b/keyboards/atreus/config.h
@@ -16,11 +16,6 @@
#pragma once
-
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 11
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/atreus62/config.h b/keyboards/atreus62/config.h
index 51c168c6bd..b497998196 100644
--- a/keyboards/atreus62/config.h
+++ b/keyboards/atreus62/config.h
@@ -18,11 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 13
-
// wiring of each half
#define MATRIX_ROW_PINS { D2, D3, D1, D0, D4 }
#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, B5, B4, E6, D7, C6 }
diff --git a/keyboards/atreyu/rev1/config.h b/keyboards/atreyu/rev1/config.h
index da94244f77..67a4d1d05d 100644
--- a/keyboards/atreyu/rev1/config.h
+++ b/keyboards/atreyu/rev1/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 6
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/atreyu/rev2/config.h b/keyboards/atreyu/rev2/config.h
index ffffdaabd0..baaef0800c 100644
--- a/keyboards/atreyu/rev2/config.h
+++ b/keyboards/atreyu/rev2/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 6
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/atset/at1/config.h b/keyboards/atset/at1/config.h
index eef66013e8..11b4549d46 100644
--- a/keyboards/atset/at1/config.h
+++ b/keyboards/atset/at1/config.h
@@ -16,10 +16,6 @@
#pragma once
-/* Key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 1
-
#define MATRIX_ROW_PINS { D2 }
#define MATRIX_COL_PINS { B6 }
diff --git a/keyboards/atset/at12/config.h b/keyboards/atset/at12/config.h
index 8607713ee1..77ace78035 100644
--- a/keyboards/atset/at12/config.h
+++ b/keyboards/atset/at12/config.h
@@ -16,10 +16,6 @@
#pragma once
-/* Key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 3
-
#define MATRIX_ROW_PINS { D3, D2, D1, D0 }
#define MATRIX_COL_PINS { B6, B5, B4 }
diff --git a/keyboards/atset/at16/config.h b/keyboards/atset/at16/config.h
index d50f776439..6db5e0ead5 100644
--- a/keyboards/atset/at16/config.h
+++ b/keyboards/atset/at16/config.h
@@ -16,10 +16,6 @@
#pragma once
-/* Key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 4
-
#define MATRIX_ROW_PINS { D3, D2, D1, D0 }
#define MATRIX_COL_PINS { B6, B5, B4, B2 }
diff --git a/keyboards/atset/at3/config.h b/keyboards/atset/at3/config.h
index f8b33e0190..b9d7f7c641 100644
--- a/keyboards/atset/at3/config.h
+++ b/keyboards/atset/at3/config.h
@@ -16,10 +16,6 @@
#pragma once
-/* Key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 3
-
#define MATRIX_ROW_PINS { D2 }
#define MATRIX_COL_PINS { B6, B5, B4 }
diff --git a/keyboards/atset/at6/config.h b/keyboards/atset/at6/config.h
index 0384ebd4a5..522ad5fec3 100644
--- a/keyboards/atset/at6/config.h
+++ b/keyboards/atset/at6/config.h
@@ -16,10 +16,6 @@
#pragma once
-/* Key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 3
-
#define MATRIX_ROW_PINS { D2, D1 }
#define MATRIX_COL_PINS { B6, B5, B4 }
diff --git a/keyboards/atset/at9/config.h b/keyboards/atset/at9/config.h
index f2aa39f862..cc0fa4cbc8 100644
--- a/keyboards/atset/at9/config.h
+++ b/keyboards/atset/at9/config.h
@@ -16,10 +16,6 @@
#pragma once
-/* Key matrix size */
-#define MATRIX_ROWS 3
-#define MATRIX_COLS 3
-
#define MATRIX_ROW_PINS { D2, D1, D0 }
#define MATRIX_COL_PINS { B6, B5, B4 }
diff --git a/keyboards/atxkb/1894/config.h b/keyboards/atxkb/1894/config.h
index 5bf2ebdf05..b3f56e7c24 100644
--- a/keyboards/atxkb/1894/config.h
+++ b/keyboards/atxkb/1894/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/aurora65/config.h b/keyboards/aurora65/config.h
index 9de3235362..7b3f4608ea 100644
--- a/keyboards/aurora65/config.h
+++ b/keyboards/aurora65/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
#define MATRIX_ROW_PINS { B3, B4, B5, A8, A4 }
#define MATRIX_COL_PINS { A13, A10, A9, A14, A15, B8, B9, B2, B1, B0, A0, A1, A2, A3, A5 }
diff --git a/keyboards/avalanche/v1/config.h b/keyboards/avalanche/v1/config.h
index e641a20f93..28fbc09060 100644
--- a/keyboards/avalanche/v1/config.h
+++ b/keyboards/avalanche/v1/config.h
@@ -3,9 +3,6 @@
#pragma once
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 8
-
#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 }
diff --git a/keyboards/avalanche/v2/config.h b/keyboards/avalanche/v2/config.h
index 16b26d8ffc..85dcc6e99d 100644
--- a/keyboards/avalanche/v2/config.h
+++ b/keyboards/avalanche/v2/config.h
@@ -3,9 +3,6 @@
#pragma once
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 7
-
#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
diff --git a/keyboards/avalanche/v3/config.h b/keyboards/avalanche/v3/config.h
index 4c4e05ecf4..0e2a67de74 100644
--- a/keyboards/avalanche/v3/config.h
+++ b/keyboards/avalanche/v3/config.h
@@ -3,9 +3,6 @@
#pragma once
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 7
-
#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
diff --git a/keyboards/avalanche/v4/config.h b/keyboards/avalanche/v4/config.h
index c83c90c0ba..baefe7202c 100644
--- a/keyboards/avalanche/v4/config.h
+++ b/keyboards/avalanche/v4/config.h
@@ -3,9 +3,6 @@
#pragma once
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 7
-
#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
diff --git a/keyboards/aves60/config.h b/keyboards/aves60/config.h
index 0c77d06408..f8a64364ad 100644
--- a/keyboards/aves60/config.h
+++ b/keyboards/aves60/config.h
@@ -4,10 +4,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/aves65/config.h b/keyboards/aves65/config.h
index 6b1bdbbc10..015bb55e51 100644
--- a/keyboards/aves65/config.h
+++ b/keyboards/aves65/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
// ROWS: Top to bottom, COLS: Left to right
#define MATRIX_ROW_PINS {D4,D6,D7,B4,E6}
diff --git a/keyboards/axolstudio/foundation_gamma/config.h b/keyboards/axolstudio/foundation_gamma/config.h
index d2f399b305..c6cbb045b3 100644
--- a/keyboards/axolstudio/foundation_gamma/config.h
+++ b/keyboards/axolstudio/foundation_gamma/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 17
-
/* Keyboard Matrix Assignments */
#define MATRIX_ROW_PINS { B2, B1, B0, F7, F6, F5 }
#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0, B3, F4, F1, F0 }
diff --git a/keyboards/axolstudio/helpo/config.h b/keyboards/axolstudio/helpo/config.h
index a0d54adc3a..549e53672c 100644
--- a/keyboards/axolstudio/helpo/config.h
+++ b/keyboards/axolstudio/helpo/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 5
-
/* Keyboard Matrix Assignments */
#define MATRIX_ROW_PINS { A2, A3, A4, A5 }
diff --git a/keyboards/axolstudio/yeti/hotswap/config.h b/keyboards/axolstudio/yeti/hotswap/config.h
index 86db816bc7..61f18a8b3a 100644
--- a/keyboards/axolstudio/yeti/hotswap/config.h
+++ b/keyboards/axolstudio/yeti/hotswap/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/* Keyboard Matrix Assignments */
#define MATRIX_ROW_PINS { E6, C6, B4, B5, B6 }
diff --git a/keyboards/axolstudio/yeti/soldered/config.h b/keyboards/axolstudio/yeti/soldered/config.h
index 7c29cefdee..0e31a7113d 100644
--- a/keyboards/axolstudio/yeti/soldered/config.h
+++ b/keyboards/axolstudio/yeti/soldered/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 16
-
/* Keyboard Matrix Assignments */
#define MATRIX_ROW_PINS { C7, C6, B6, B5, B4 }
diff --git a/keyboards/aya/config.h b/keyboards/aya/config.h
index e83fd4f50e..56e966ce0f 100644
--- a/keyboards/aya/config.h
+++ b/keyboards/aya/config.h
@@ -17,9 +17,6 @@
#pragma once
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 7
-
#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
#define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/b_sides/rev41lp/config.h b/keyboards/b_sides/rev41lp/config.h
index f561fcae83..f5905efdd4 100644
--- a/keyboards/b_sides/rev41lp/config.h
+++ b/keyboards/b_sides/rev41lp/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 7
-#define MATRIX_COLS 6
-
#define MATRIX_ROW_PINS { F4, B2, F5, B3, F6, B1, F7 }
#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
diff --git a/keyboards/bacca70/config.h b/keyboards/bacca70/config.h
index 0809668375..a093c267a9 100644
--- a/keyboards/bacca70/config.h
+++ b/keyboards/bacca70/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 12
-#define MATRIX_COLS 8
-
// 0 1 2 3 4 5 6 7 8 9 A B
#define MATRIX_ROW_PINS { A3, A4, A5, A6, A7, B0, B1, B2, B10, B11, A9, A10 }
#define MATRIX_COL_PINS { A0, A1, A2, B12, B13, B14, B15, A8 }
diff --git a/keyboards/baguette/config.h b/keyboards/baguette/config.h
index 39ff536e22..a0f3eebe0c 100644
--- a/keyboards/baguette/config.h
+++ b/keyboards/baguette/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 16
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/bandominedoni/config.h b/keyboards/bandominedoni/config.h
index a67161f81d..3cc664dd7b 100644
--- a/keyboards/bandominedoni/config.h
+++ b/keyboards/bandominedoni/config.h
@@ -16,10 +16,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 12
-#define MATRIX_COLS 7
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/bantam44/config.h b/keyboards/bantam44/config.h
index 273ad5f545..ef010865db 100644
--- a/keyboards/bantam44/config.h
+++ b/keyboards/bantam44/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
// Planck PCB default pin-out
// Change this to how you wired your keyboard
// COLS: Left to right, ROWS: Top to bottom
diff --git a/keyboards/barracuda/config.h b/keyboards/barracuda/config.h
index 8b1727ab58..5e8a798be6 100644
--- a/keyboards/barracuda/config.h
+++ b/keyboards/barracuda/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 6
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/basekeys/slice/rev1/config.h b/keyboards/basekeys/slice/rev1/config.h
index 75fa36f7e3..8e52cd96d0 100644
--- a/keyboards/basekeys/slice/rev1/config.h
+++ b/keyboards/basekeys/slice/rev1/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 9
-
// wiring of each half
#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, B5 }
diff --git a/keyboards/basekeys/slice/rev1_rgb/config.h b/keyboards/basekeys/slice/rev1_rgb/config.h
index 0a2c300567..517ca97aeb 100644
--- a/keyboards/basekeys/slice/rev1_rgb/config.h
+++ b/keyboards/basekeys/slice/rev1_rgb/config.h
@@ -16,10 +16,6 @@ along with this program. If not, see .
*/
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 9
-
// wiring of each half
#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, B5 }
diff --git a/keyboards/basekeys/trifecta/config.h b/keyboards/basekeys/trifecta/config.h
index 71504c7b3a..e21dcdd3fe 100644
--- a/keyboards/basekeys/trifecta/config.h
+++ b/keyboards/basekeys/trifecta/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 8
-
/* key matrix pins */
#define MATRIX_ROW_PINS { B0, B7, F7, B1, B6, C6, C7, B5, F6, D2 }
diff --git a/keyboards/basketweave/config.h b/keyboards/basketweave/config.h
index e8a33d04d6..dca609a170 100644
--- a/keyboards/basketweave/config.h
+++ b/keyboards/basketweave/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
#define MATRIX_ROW_PINS { A6, C6, C7, A7, A5 }
#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, B0, B1, B2, D5, D6, C5, C4, C3, C2, C1 }
diff --git a/keyboards/bastardkb/charybdis/3x5/config.h b/keyboards/bastardkb/charybdis/3x5/config.h
index e25064a197..a74239f706 100644
--- a/keyboards/bastardkb/charybdis/3x5/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/config.h
@@ -18,10 +18,6 @@
#pragma once
-/* Key matrix configuration. */
-#define MATRIX_ROWS 8 // Rows are doubled-up.
-#define MATRIX_COLS 5
-
#define DIODE_DIRECTION ROW2COL
/* Trackball angle adjustment. */
diff --git a/keyboards/bastardkb/charybdis/3x6/config.h b/keyboards/bastardkb/charybdis/3x6/config.h
index b759af6560..19a2fb56f5 100644
--- a/keyboards/bastardkb/charybdis/3x6/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/config.h
@@ -18,10 +18,6 @@
#pragma once
-/* Key matrix configuration. */
-#define MATRIX_ROWS 8 // Rows are doubled-up.
-#define MATRIX_COLS 6
-
#define DIODE_DIRECTION ROW2COL
/* Trackball angle adjustment. */
diff --git a/keyboards/bastardkb/charybdis/4x6/config.h b/keyboards/bastardkb/charybdis/4x6/config.h
index 53757a643a..21887dca07 100644
--- a/keyboards/bastardkb/charybdis/4x6/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/config.h
@@ -18,10 +18,6 @@
#pragma once
-/* Key matrix configuration. */
-#define MATRIX_ROWS 10 // Rows are doubled-up.
-#define MATRIX_COLS 6
-
#define DIODE_DIRECTION ROW2COL
/* Trackball angle adjustment. */
diff --git a/keyboards/bastardkb/dilemma/config.h b/keyboards/bastardkb/dilemma/config.h
index 7043855290..3ea785525c 100644
--- a/keyboards/bastardkb/dilemma/config.h
+++ b/keyboards/bastardkb/dilemma/config.h
@@ -19,11 +19,6 @@
#pragma once
-/* Key matrix configuration. */
-
-#define MATRIX_ROWS 8 // Rows are doubled-up.
-#define MATRIX_COLS 5
-
#define DIODE_DIRECTION ROW2COL
/* Pointing device configuration. */
diff --git a/keyboards/bastardkb/scylla/config.h b/keyboards/bastardkb/scylla/config.h
index 83ed60345e..0f41dca37e 100644
--- a/keyboards/bastardkb/scylla/config.h
+++ b/keyboards/bastardkb/scylla/config.h
@@ -19,10 +19,6 @@
#pragma once
-/* Key matrix configuration. */
-#define MATRIX_ROWS 10 // Rows are doubled-up.
-#define MATRIX_COLS 6
-
#define DIODE_DIRECTION ROW2COL
/* RGB settings. */
diff --git a/keyboards/bastardkb/skeletyl/config.h b/keyboards/bastardkb/skeletyl/config.h
index c221eb24c5..c1e0e0aa19 100644
--- a/keyboards/bastardkb/skeletyl/config.h
+++ b/keyboards/bastardkb/skeletyl/config.h
@@ -19,10 +19,6 @@
#pragma once
-/* Key matrix configuration. */
-#define MATRIX_ROWS 8 // Rows are doubled-up.
-#define MATRIX_COLS 5
-
#define DIODE_DIRECTION ROW2COL
/* RGB settings. */
diff --git a/keyboards/bastardkb/tbk/config.h b/keyboards/bastardkb/tbk/config.h
index 6f0c6d3783..cc0b06744e 100644
--- a/keyboards/bastardkb/tbk/config.h
+++ b/keyboards/bastardkb/tbk/config.h
@@ -17,8 +17,6 @@
#pragma once
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 6
#define DIODE_DIRECTION ROW2COL
#define MATRIX_ROW_PINS { D7, B5, F7, F6, B6 }
#define MATRIX_COL_PINS { B4, E6, C6, B1, B3, B2 }
diff --git a/keyboards/bastardkb/tbkmini/config.h b/keyboards/bastardkb/tbkmini/config.h
index 007a765574..9c2e0f8327 100644
--- a/keyboards/bastardkb/tbkmini/config.h
+++ b/keyboards/bastardkb/tbkmini/config.h
@@ -19,10 +19,6 @@
#pragma once
-/* Key matrix configuration. */
-#define MATRIX_ROWS 8 // Rows are doubled-up.
-#define MATRIX_COLS 6
-
#define DIODE_DIRECTION ROW2COL
/* RGB settings. */
diff --git a/keyboards/bbrfkr/dynamis/config.h b/keyboards/bbrfkr/dynamis/config.h
index 045f20119c..516f749ff6 100644
--- a/keyboards/bbrfkr/dynamis/config.h
+++ b/keyboards/bbrfkr/dynamis/config.h
@@ -17,9 +17,6 @@
#pragma once
-/* key matrix */
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 7
#define MATRIX_ROW_PINS { B6, B4, D6, D5, D1, C6, B5, D7, D4, D0 }
#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7 }
diff --git a/keyboards/bear_face/config.h b/keyboards/bear_face/config.h
index c5099e793c..b80baa8040 100644
--- a/keyboards/bear_face/config.h
+++ b/keyboards/bear_face/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 15
-
/* bear_face matrix pinout */
#define MATRIX_ROW_PINS { F5, F6, F4, F1, B0, B6 }
#define MATRIX_COL_PINS { B5, C7, C6, F0, E6, B7, D0, D1, D2, D3, D5, D4, D6, D7, B4 }
diff --git a/keyboards/beatervan/config.h b/keyboards/beatervan/config.h
index c4cf2be0f0..0040b35e07 100644
--- a/keyboards/beatervan/config.h
+++ b/keyboards/beatervan/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/bemeier/bmek/config.h b/keyboards/bemeier/bmek/config.h
index 39895e706b..564d5f24a2 100755
--- a/keyboards/bemeier/bmek/config.h
+++ b/keyboards/bemeier/bmek/config.h
@@ -19,10 +19,6 @@
#define DYNAMIC_KEYMAP_LAYER_COUNT 5
#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 20
-/* Keyboard Matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
#define DIODE_DIRECTION COL2ROW
#define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/bfake/config.h b/keyboards/bfake/config.h
index 72fe48339c..95bf88598d 100644
--- a/keyboards/bfake/config.h
+++ b/keyboards/bfake/config.h
@@ -20,9 +20,6 @@ along with this program. If not, see .
#define RGBLED_NUM 16
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 11
-
#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 }
#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5 }
diff --git a/keyboards/biacco42/ergo42/rev1/config.h b/keyboards/biacco42/ergo42/rev1/config.h
index 7915325c84..1521608c66 100644
--- a/keyboards/biacco42/ergo42/rev1/config.h
+++ b/keyboards/biacco42/ergo42/rev1/config.h
@@ -20,11 +20,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 7
-
// wiring of each half
#define MATRIX_ROW_PINS { D7, E6, B4, B5 }
#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
diff --git a/keyboards/biacco42/meishi/config.h b/keyboards/biacco42/meishi/config.h
index 9d01458fe2..d01a9f389a 100644
--- a/keyboards/biacco42/meishi/config.h
+++ b/keyboards/biacco42/meishi/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 4
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/biacco42/meishi2/config.h b/keyboards/biacco42/meishi2/config.h
index dea286dade..c7614c0dbd 100644
--- a/keyboards/biacco42/meishi2/config.h
+++ b/keyboards/biacco42/meishi2/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 2
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/binepad/bn003/config.h b/keyboards/binepad/bn003/config.h
index 1daeca6596..997b75a4af 100644
--- a/keyboards/binepad/bn003/config.h
+++ b/keyboards/binepad/bn003/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* Key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 3
-
#define MATRIX_ROW_PINS { C6 }
#define MATRIX_COL_PINS { B4, B5, B6 }
diff --git a/keyboards/binepad/bn009/config.h b/keyboards/binepad/bn009/config.h
index 37800ef106..3f233e1488 100644
--- a/keyboards/binepad/bn009/config.h
+++ b/keyboards/binepad/bn009/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* Key matrix size */
-#define MATRIX_ROWS 3
-#define MATRIX_COLS 3
-
#define MATRIX_ROW_PINS { D2, D1, D0 }
#define MATRIX_COL_PINS { B6, B5, B4 }
diff --git a/keyboards/bioi/f60/config.h b/keyboards/bioi/f60/config.h
index 17b8ceaf1b..3cfee0a389 100644
--- a/keyboards/bioi/f60/config.h
+++ b/keyboards/bioi/f60/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
/* Keyboard Matrix Assignments */
#define MATRIX_ROW_PINS { B0, E6, F1, F5, F4 }
#define MATRIX_COL_PINS { F6, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D0, D1 }
diff --git a/keyboards/bioi/g60/config.h b/keyboards/bioi/g60/config.h
index 2df0ee3961..f6bffcf14f 100644
--- a/keyboards/bioi/g60/config.h
+++ b/keyboards/bioi/g60/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/bioi/g60ble/config.h b/keyboards/bioi/g60ble/config.h
index 98547ca141..e642b04c7c 100644
--- a/keyboards/bioi/g60ble/config.h
+++ b/keyboards/bioi/g60ble/config.h
@@ -1,10 +1,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
/* key matrix pins */
#define MATRIX_ROW_PINS \
{ E6, B0, F1, F5, F4 }
diff --git a/keyboards/bioi/morgan65/config.h b/keyboards/bioi/morgan65/config.h
index 8409f49b21..1fb1d149c0 100644
--- a/keyboards/bioi/morgan65/config.h
+++ b/keyboards/bioi/morgan65/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/bioi/s65/config.h b/keyboards/bioi/s65/config.h
index 31ce38a2bc..4a98749258 100644
--- a/keyboards/bioi/s65/config.h
+++ b/keyboards/bioi/s65/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 16
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/blackplum/config.h b/keyboards/blackplum/config.h
index f1299d0184..aedf2b5544 100644
--- a/keyboards/blackplum/config.h
+++ b/keyboards/blackplum/config.h
@@ -1,10 +1,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 9
-#define MATRIX_COLS 8
-
/* key matrix pins */
#define MATRIX_ROW_PINS { C6, B6, B4, B5, D6, D7, D5, D3, D4 }
#define MATRIX_COL_PINS { D0, D1, D2, F7, F6, F5, F4, F1 }
diff --git a/keyboards/blank/blank01/config.h b/keyboards/blank/blank01/config.h
index 63ad3ac7cd..d5c752d7f5 100644
--- a/keyboards/blank/blank01/config.h
+++ b/keyboards/blank/blank01/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/blank_tehnologii/manibus/config.h b/keyboards/blank_tehnologii/manibus/config.h
index 867d6e49bb..92ad66e8d7 100644
--- a/keyboards/blank_tehnologii/manibus/config.h
+++ b/keyboards/blank_tehnologii/manibus/config.h
@@ -19,10 +19,6 @@
#define EE_HANDS
-/* key matrix size */
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 7
-
/* define pins */
#define MATRIX_ROW_PINS { F6, F5, F4, B6, D3 }
#define MATRIX_COL_PINS { B5, B4, D7, D6, F0, F1, C6 }
diff --git a/keyboards/blaster75/config.h b/keyboards/blaster75/config.h
index 006464da90..f6d8d07de8 100644
--- a/keyboards/blaster75/config.h
+++ b/keyboards/blaster75/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* Matrix Size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 15
-
/* Matrix Pinouts */
// 0 1 2 3 4 5 6 7 8 9 A B C D E
#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, F7 }
diff --git a/keyboards/blockey/config.h b/keyboards/blockey/config.h
index f2c2485d8f..ecc29f6399 100644
--- a/keyboards/blockey/config.h
+++ b/keyboards/blockey/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 7
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/bluebell/swoop/config.h b/keyboards/bluebell/swoop/config.h
index 1ae85fc3d3..22c16b4092 100644
--- a/keyboards/bluebell/swoop/config.h
+++ b/keyboards/bluebell/swoop/config.h
@@ -15,11 +15,6 @@
*/
#pragma once
-
-// key matrix size (rows are doubled)
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 5
-
// wiring of each half
#define MATRIX_ROW_PINS { D4, C6, D7, E6 }
#define MATRIX_COL_PINS { B1, F7, F6, F5, F4 }
diff --git a/keyboards/boardrun/bizarre/config.h b/keyboards/boardrun/bizarre/config.h
index 54179cbea9..0d8bdde6dc 100644
--- a/keyboards/boardrun/bizarre/config.h
+++ b/keyboards/boardrun/bizarre/config.h
@@ -16,10 +16,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 17
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/boardrun/classic/config.h b/keyboards/boardrun/classic/config.h
index b750b55447..b2cd5ab73c 100644
--- a/keyboards/boardrun/classic/config.h
+++ b/keyboards/boardrun/classic/config.h
@@ -16,10 +16,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 17
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/boardwalk/config.h b/keyboards/boardwalk/config.h
index a15cd9ae47..38cdc18fce 100644
--- a/keyboards/boardwalk/config.h
+++ b/keyboards/boardwalk/config.h
@@ -16,10 +16,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/bobpad/config.h b/keyboards/bobpad/config.h
index f24ef916bd..587a0a0d5d 100644
--- a/keyboards/bobpad/config.h
+++ b/keyboards/bobpad/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 3
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/bolsa/bolsalice/config.h b/keyboards/bolsa/bolsalice/config.h
index 37bafc3ab5..8d95b371bd 100644
--- a/keyboards/bolsa/bolsalice/config.h
+++ b/keyboards/bolsa/bolsalice/config.h
@@ -17,11 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
-
#define MATRIX_ROW_PINS { B2, B3, C7, C6, B5 }
#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, B4, D7, D6, D4, D5, D3, D2, D1 }
diff --git a/keyboards/bolsa/damapad/config.h b/keyboards/bolsa/damapad/config.h
index ce7d8b49bb..444f0de0e7 100644
--- a/keyboards/bolsa/damapad/config.h
+++ b/keyboards/bolsa/damapad/config.h
@@ -19,10 +19,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 3
-#define MATRIX_COLS 6
-
/* key matrix pins */
#define MATRIX_ROW_PINS { E6, F7, C7 }
#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, B7 }
diff --git a/keyboards/bop/config.h b/keyboards/bop/config.h
index 9cf94a582d..211e7f4f76 100644
--- a/keyboards/bop/config.h
+++ b/keyboards/bop/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 20
-
/* key matrix pins */
#define MATRIX_ROW_PINS { B7, D0, D1, D2, D3, D4 }
#define MATRIX_COL_PINS { D5, C5, B0, B1, B2, B3, B4, B5, B6, E7, E6, F0, F7, F6, F5, F4, F3, F2, F1, C6 }
diff --git a/keyboards/boston/config.h b/keyboards/boston/config.h
index 4f8bd2688e..f73bb45d3d 100644
--- a/keyboards/boston/config.h
+++ b/keyboards/boston/config.h
@@ -16,10 +16,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 7
-#define MATRIX_COLS 19
-
#define MATRIX_COL_PINS \
{ B10, B11, B12, B13, B14, B15, A8, A9, A10, A15, B3, B4, B7, B8, B9, C14, C15, F0, A3 }
#define MATRIX_ROW_PINS \
diff --git a/keyboards/boston_meetup/2019/config.h b/keyboards/boston_meetup/2019/config.h
index 80f903b123..624d8fd1d0 100644
--- a/keyboards/boston_meetup/2019/config.h
+++ b/keyboards/boston_meetup/2019/config.h
@@ -1,11 +1,5 @@
#pragma once
-#undef MATRIX_ROWS
-#undef MATRIX_COLS
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 4
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/box75/config.h b/keyboards/box75/config.h
index b6516840ee..d7b265f4e3 100644
--- a/keyboards/box75/config.h
+++ b/keyboards/box75/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 15
-
#define MATRIX_COL_PINS { B11, B10, B2 , B1, B0, A7 , A6, A5, A4, A3, A8, B15, B14, B13, A15 }
#define MATRIX_ROW_PINS { A10, A9 , B12, A2, A1, A0 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/bpiphany/four_banger/config.h b/keyboards/bpiphany/four_banger/config.h
index 5ac596a98a..63a1f97726 100644
--- a/keyboards/bpiphany/four_banger/config.h
+++ b/keyboards/bpiphany/four_banger/config.h
@@ -1,10 +1,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 2
-
/* key matrix pins */
#define MATRIX_ROW_PINS { B2, B6 }
#define MATRIX_COL_PINS { B5, B4 }
diff --git a/keyboards/bt66tech/bt66tech60/config.h b/keyboards/bt66tech/bt66tech60/config.h
index 20aebdde16..e3337ccd33 100644
--- a/keyboards/bt66tech/bt66tech60/config.h
+++ b/keyboards/bt66tech/bt66tech60/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
#define MATRIX_COL_PINS { B9, B8, B7, B6, B5, B4, B3, B11, A15, A10, A9, B14, B13, B12 }
#define MATRIX_ROW_PINS { B10, B1, B0, A7, A6 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/bthlabs/geekpad/config.h b/keyboards/bthlabs/geekpad/config.h
index fe11479903..e610685f99 100644
--- a/keyboards/bthlabs/geekpad/config.h
+++ b/keyboards/bthlabs/geekpad/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 3
-#define MATRIX_COLS 3
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/buildakb/potato65/config.h b/keyboards/buildakb/potato65/config.h
index 966d4e11b1..3d1926093c 100644
--- a/keyboards/buildakb/potato65/config.h
+++ b/keyboards/buildakb/potato65/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 16
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/buildakb/potato65hs/config.h b/keyboards/buildakb/potato65hs/config.h
index 4acdf9f55a..cfd82ac3b6 100644
--- a/keyboards/buildakb/potato65hs/config.h
+++ b/keyboards/buildakb/potato65hs/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/* key matrix pins */
#define MATRIX_ROW_PINS { F5, F4, F6, F0, D2 }
#define MATRIX_COL_PINS { D3, D4, D6, D7, B4, B5, B6, F1, B0, B1, B2, B3, B7, D0, D1 }
diff --git a/keyboards/buildakb/potato65s/config.h b/keyboards/buildakb/potato65s/config.h
index 64af402d10..629fa34c2b 100644
--- a/keyboards/buildakb/potato65s/config.h
+++ b/keyboards/buildakb/potato65s/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/* key matrix pins */
#define MATRIX_ROW_PINS { F5, F4, F6, F0, D2 }
#define MATRIX_COL_PINS { D3, D4, D6, D7, B4, B5, B6, F1, B0, B1, B2, B3, B7, D0, D1 }
diff --git a/keyboards/buzzard/rev1/config.h b/keyboards/buzzard/rev1/config.h
index 19397e023b..a4c6fa6b7a 100644
--- a/keyboards/buzzard/rev1/config.h
+++ b/keyboards/buzzard/rev1/config.h
@@ -3,11 +3,6 @@
#pragma once
-/* key matrix size */
-/* Rows are doubled up */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 6
-
// wiring
#define MATRIX_ROW_PINS \
{ F4, F5, F6, F7 }
diff --git a/keyboards/cablecardesigns/cypher/rev6/config.h b/keyboards/cablecardesigns/cypher/rev6/config.h
index 7aa3e878af..1b8b2d671b 100644
--- a/keyboards/cablecardesigns/cypher/rev6/config.h
+++ b/keyboards/cablecardesigns/cypher/rev6/config.h
@@ -3,10 +3,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 10
-
#define MATRIX_ROW_PINS { B0, F1, F5, F6, F7, D1, F4, D4, C6, C7 }
#define MATRIX_COL_PINS { D6, D7, B4, B5, B6, B7, B3, B2, B1, F0 }
diff --git a/keyboards/caffeinated/serpent65/config.h b/keyboards/caffeinated/serpent65/config.h
index 4ea094fcf1..cd974173a1 100644
--- a/keyboards/caffeinated/serpent65/config.h
+++ b/keyboards/caffeinated/serpent65/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 8
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/canary/canary60rgb/v1/config.h b/keyboards/canary/canary60rgb/v1/config.h
index c2962f5a70..757db92403 100644
--- a/keyboards/canary/canary60rgb/v1/config.h
+++ b/keyboards/canary/canary60rgb/v1/config.h
@@ -15,10 +15,6 @@
*/
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/cannonkeys/adelie/config.h b/keyboards/cannonkeys/adelie/config.h
index 49a86f8265..e5f6cbedab 100644
--- a/keyboards/cannonkeys/adelie/config.h
+++ b/keyboards/cannonkeys/adelie/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 15
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/cannonkeys/aella/config.h b/keyboards/cannonkeys/aella/config.h
index c4b1a17322..a03a1f3fb8 100644
--- a/keyboards/cannonkeys/aella/config.h
+++ b/keyboards/cannonkeys/aella/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 16
-
#define MATRIX_COL_PINS { A5, B0, B1, B2, B10, A9, C13, B9, B8, B7, B6, B5, B4, B3, A15, A14 }
#define MATRIX_ROW_PINS { A13, B12, B11, B14, A8, A7 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cannonkeys/an_c/config.h b/keyboards/cannonkeys/an_c/config.h
index e8adc86618..29a5bac173 100644
--- a/keyboards/cannonkeys/an_c/config.h
+++ b/keyboards/cannonkeys/an_c/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
#define MATRIX_COL_PINS { B11, B10, B2, A9, A15, B3, B4, B5, B6, B7, B8, B9, C13, C14, C15 }
#define MATRIX_ROW_PINS { B1, B0, A7, A5, A4 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cannonkeys/atlas/config.h b/keyboards/cannonkeys/atlas/config.h
index b1b3992be2..9689ba3d22 100644
--- a/keyboards/cannonkeys/atlas/config.h
+++ b/keyboards/cannonkeys/atlas/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 12
-
#define MATRIX_COL_PINS { A2, A1, A0, F1, F0, C15, C14, C13, B9, A15, A10, A9 }
#define MATRIX_ROW_PINS { A8, B14, B12, B4, B3 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cannonkeys/atlas_alps/config.h b/keyboards/cannonkeys/atlas_alps/config.h
index 5504f63a5e..9adbb67a2f 100644
--- a/keyboards/cannonkeys/atlas_alps/config.h
+++ b/keyboards/cannonkeys/atlas_alps/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 12
-
/* key matrix pins */
#define MATRIX_ROW_PINS { B5, B4, D1, D7, D6 }
#define MATRIX_COL_PINS { B6, C6, D2, E6, C7, B3, F7, F6, F5, F4, F1, F0 }
diff --git a/keyboards/cannonkeys/balance/config.h b/keyboards/cannonkeys/balance/config.h
index fba90c0628..5ba99322ff 100644
--- a/keyboards/cannonkeys/balance/config.h
+++ b/keyboards/cannonkeys/balance/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 20
-
#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A5, A4, A3, A2, A1, F1, C15, B3, C14, C13, B9, B8, B7 }
#define MATRIX_ROW_PINS { B4, A15, A14, A0, F0 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cannonkeys/brutalv2_65/config.h b/keyboards/cannonkeys/brutalv2_65/config.h
index 57c691d1d6..14b14879d6 100644
--- a/keyboards/cannonkeys/brutalv2_65/config.h
+++ b/keyboards/cannonkeys/brutalv2_65/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
#define MATRIX_COL_PINS { C13, C15, B13, B12, B11, B10, B2, B1, B0, A7, A6, A5, A4, A3, A2 }
#define MATRIX_ROW_PINS { C14, A1, B14, B15, A8 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cannonkeys/chimera65/config.h b/keyboards/cannonkeys/chimera65/config.h
index 45a4341995..7aeb5ba9de 100644
--- a/keyboards/cannonkeys/chimera65/config.h
+++ b/keyboards/cannonkeys/chimera65/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 16
-
#define MATRIX_COL_PINS { B11, B10, B2, B1, A5, A4, A3, A2, A1, F0, C15, C14, A9, A8, A10, B3 }
#define MATRIX_ROW_PINS { A13, A14, A15, C13, B8 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cannonkeys/cloudline/config.h b/keyboards/cannonkeys/cloudline/config.h
index a81791b0d6..ae709af94e 100644
--- a/keyboards/cannonkeys/cloudline/config.h
+++ b/keyboards/cannonkeys/cloudline/config.h
@@ -3,9 +3,6 @@
#pragma once
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 18
-
#define MATRIX_COL_PINS { B1, B2, B10, B11, B12, B14, A8, A9, A10, A3, B0, A2, A1, A7, A0, B4, B6, B7 }
#define MATRIX_ROW_PINS { A15, B3, B5, A4, A5, F1 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cannonkeys/crin/config.h b/keyboards/cannonkeys/crin/config.h
index 2843df3da7..25ca597254 100644
--- a/keyboards/cannonkeys/crin/config.h
+++ b/keyboards/cannonkeys/crin/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see .
#pragma once
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 18
-
#define MATRIX_COL_PINS { B0, C15, C14, A7, A5, C13, A4, A2, A1, A0, B9, B8, B7, A3, B6, B4, B3, A15 }
#define MATRIX_ROW_PINS { B11, B10, B2, F0, B5 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cannonkeys/db60/config.h b/keyboards/cannonkeys/db60/config.h
index f7bb3026ea..4389cf070c 100644
--- a/keyboards/cannonkeys/db60/config.h
+++ b/keyboards/cannonkeys/db60/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see .
#pragma once
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
#define MATRIX_COL_PINS { B11, B10, B2, A9, A15, B3, B4, B5, B6, B7, B8, B9, C13, C14, C15 }
#define MATRIX_ROW_PINS { B1, B0, A7, A5, A4 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cannonkeys/devastatingtkl/config.h b/keyboards/cannonkeys/devastatingtkl/config.h
index 69886a4d47..c607ecceee 100644
--- a/keyboards/cannonkeys/devastatingtkl/config.h
+++ b/keyboards/cannonkeys/devastatingtkl/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see .
#pragma once
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 18
-
#define MATRIX_COL_PINS { B1, B2, B10, B11, B12, B14, A8, A9, A10, A3, B0, A2, A1, A7, A0, B4, B6, B7 }
#define MATRIX_ROW_PINS { A15, B3, B5, A4, A5, F1 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cannonkeys/gentoo/config.h b/keyboards/cannonkeys/gentoo/config.h
index 57c691d1d6..14b14879d6 100644
--- a/keyboards/cannonkeys/gentoo/config.h
+++ b/keyboards/cannonkeys/gentoo/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
#define MATRIX_COL_PINS { C13, C15, B13, B12, B11, B10, B2, B1, B0, A7, A6, A5, A4, A3, A2 }
#define MATRIX_ROW_PINS { C14, A1, B14, B15, A8 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cannonkeys/gentoo_hs/config.h b/keyboards/cannonkeys/gentoo_hs/config.h
index 18509fede6..8c83fe3fc6 100644
--- a/keyboards/cannonkeys/gentoo_hs/config.h
+++ b/keyboards/cannonkeys/gentoo_hs/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
#define MATRIX_COL_PINS { A8, C13, B9, B8, B7, B6, B5, B4, B3, A7, A5, A4, A3, A2, A1 }
#define MATRIX_ROW_PINS { A14, A15, A0, B1, B0 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cannonkeys/hoodrowg/config.h b/keyboards/cannonkeys/hoodrowg/config.h
index 690f136945..103faf39f9 100644
--- a/keyboards/cannonkeys/hoodrowg/config.h
+++ b/keyboards/cannonkeys/hoodrowg/config.h
@@ -18,9 +18,6 @@ along with this program. If not, see .
#pragma once
-#define MATRIX_ROWS 12
-#define MATRIX_COLS 9
-
#define MATRIX_COL_PINS { B5, B4, D7, F5, F6, F7, F4, D2, D0 }
#define MATRIX_ROW_PINS { E6, B7, B0, B1, F1, F0, C6, C7, D4, D6, D5, D3 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cannonkeys/instant60/config.h b/keyboards/cannonkeys/instant60/config.h
index abdbe8d192..ad872dd356 100644
--- a/keyboards/cannonkeys/instant60/config.h
+++ b/keyboards/cannonkeys/instant60/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
#define MATRIX_COL_PINS { B2, B10, B11, A9, A15, B3, B4, B5, B6, B7, B8, B9, C13, C14, C15 }
#define MATRIX_ROW_PINS { B1, B0, A7, A5, A4 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cannonkeys/instant65/config.h b/keyboards/cannonkeys/instant65/config.h
index 1c3ec2d086..2e309fd556 100644
--- a/keyboards/cannonkeys/instant65/config.h
+++ b/keyboards/cannonkeys/instant65/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
#define MATRIX_COL_PINS { A8, C13, B9, B8, B7, B6, B5, B4, B3, A7, A5, A4, A3, A2, A1 }
#define MATRIX_ROW_PINS { A14, A15, A0, B1, B0 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cannonkeys/iron165/config.h b/keyboards/cannonkeys/iron165/config.h
index f8a526d70c..596e0af2b6 100644
--- a/keyboards/cannonkeys/iron165/config.h
+++ b/keyboards/cannonkeys/iron165/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 16
-
#define MATRIX_COL_PINS { A5, B10, A3, A2, B0, A8, C13, B9, B8, B7, B6, B5, B4, B3, A15, A14 }
#define MATRIX_ROW_PINS { B12, B13, B14, B15, A1 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cannonkeys/malicious_ergo/config.h b/keyboards/cannonkeys/malicious_ergo/config.h
index 8e18a9bb94..af16d09993 100644
--- a/keyboards/cannonkeys/malicious_ergo/config.h
+++ b/keyboards/cannonkeys/malicious_ergo/config.h
@@ -19,10 +19,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 17
-
#define MATRIX_COL_PINS { B1, B0, A7, A1, A5, A4, A3, A10, B9, B8, B7, B6, B5, B4, B3, A15, A14 }
#define MATRIX_ROW_PINS { B2, B10, B11, A2, A0 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cannonkeys/nearfield/config.h b/keyboards/cannonkeys/nearfield/config.h
index 4335c00020..5c989ba3f3 100755
--- a/keyboards/cannonkeys/nearfield/config.h
+++ b/keyboards/cannonkeys/nearfield/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 16
-
/* key matrix pins */
#define MATRIX_ROW_PINS { B4, D2, D4, D6, D7 }
#define MATRIX_COL_PINS { D3, D5, C6, C7, B6, B5, B7, F0, F1, F4, F5, F6, F7, B3, B2, D1 }
diff --git a/keyboards/cannonkeys/obliterated75/config.h b/keyboards/cannonkeys/obliterated75/config.h
index e0b0c68e47..8d91b9bf93 100644
--- a/keyboards/cannonkeys/obliterated75/config.h
+++ b/keyboards/cannonkeys/obliterated75/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 16
-
#define MATRIX_COL_PINS { A5, B10, A3, A2, B0, A9, C13, B9, B8, B7, B6, B5, B4, B3, A15, A14 }
#define MATRIX_ROW_PINS { A13, B12, B11, B14, A8, A1 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cannonkeys/onyx/config.h b/keyboards/cannonkeys/onyx/config.h
index 1b459b43e5..8c6da90c9b 100644
--- a/keyboards/cannonkeys/onyx/config.h
+++ b/keyboards/cannonkeys/onyx/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see .
#pragma once
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 19
-
#define MATRIX_COL_PINS { B1, B0, C15, C14, A7, A5, C13, A4, A2, A1, A0, B9, B8, B7, A3, B6, B4, B3, A15 }
#define MATRIX_ROW_PINS { B11, B10, B2, F0, B5 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cannonkeys/ortho48/config.h b/keyboards/cannonkeys/ortho48/config.h
index df2377ff95..1046847cc2 100644
--- a/keyboards/cannonkeys/ortho48/config.h
+++ b/keyboards/cannonkeys/ortho48/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
#define MATRIX_COL_PINS { B11, B10, B1, B0, A7, A6, A5, B14, A15, A0, C15, C14}
#define MATRIX_ROW_PINS { B12, C13, A2, A1 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cannonkeys/ortho60/config.h b/keyboards/cannonkeys/ortho60/config.h
index fb7cec1c48..7a7d5c2ed6 100644
--- a/keyboards/cannonkeys/ortho60/config.h
+++ b/keyboards/cannonkeys/ortho60/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 12
-
#define MATRIX_COL_PINS { B11, B10, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0 }
#define MATRIX_ROW_PINS { B3, B4, B5, B6, B7 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cannonkeys/ortho75/config.h b/keyboards/cannonkeys/ortho75/config.h
index 89069d3331..8216cd99d2 100644
--- a/keyboards/cannonkeys/ortho75/config.h
+++ b/keyboards/cannonkeys/ortho75/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
#define MATRIX_COL_PINS { B11, B10, B1, B0, A7, A6, A5, B14, A15, A0, C15, C14, B7, B6, B5 }
#define MATRIX_ROW_PINS { B12, C13, A2, A1, A3 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cannonkeys/practice60/config.h b/keyboards/cannonkeys/practice60/config.h
index ac12e1cc70..a383b614db 100644
--- a/keyboards/cannonkeys/practice60/config.h
+++ b/keyboards/cannonkeys/practice60/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
#define MATRIX_COL_PINS { B11, B10, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0, C15, C14 }
#define MATRIX_ROW_PINS { B3, B4, B5, B6, B7 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cannonkeys/practice65/config.h b/keyboards/cannonkeys/practice65/config.h
index b8186235cf..7fe680e483 100644
--- a/keyboards/cannonkeys/practice65/config.h
+++ b/keyboards/cannonkeys/practice65/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 16
-
#define MATRIX_COL_PINS { B8, B0, A0, B5, B10, B9, A6, B12, A7, A5, A4, A3, A2, A1, B13, B14 }
#define MATRIX_ROW_PINS { B4, B11, B1, B7, B6 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cannonkeys/rekt1800/config.h b/keyboards/cannonkeys/rekt1800/config.h
index 2fbea5f461..617989fc48 100644
--- a/keyboards/cannonkeys/rekt1800/config.h
+++ b/keyboards/cannonkeys/rekt1800/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 19
-
#define MATRIX_COL_PINS { B12, A14, A15, B3, B4, B5, B6, B7, B8, B9, A7, B0, B1, B2, B10, A3, A4, A5, C15 }
#define MATRIX_ROW_PINS { C13, C14, A0, A1, A2, B11 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cannonkeys/sagittarius/config.h b/keyboards/cannonkeys/sagittarius/config.h
index 846742d758..3ba3ddc64f 100644
--- a/keyboards/cannonkeys/sagittarius/config.h
+++ b/keyboards/cannonkeys/sagittarius/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 16
-
#define MATRIX_COL_PINS { A7, A5, A4, A3, A2, A1, A0, B5, A13, B2, B1, B0, B9, B8, B7, B6 }
#define MATRIX_ROW_PINS { B10, B14, A8, A9, A10, C13, C14, C15, F0, F1 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cannonkeys/satisfaction75/config.h b/keyboards/cannonkeys/satisfaction75/config.h
index 924bd6ccb9..8c2446682a 100644
--- a/keyboards/cannonkeys/satisfaction75/config.h
+++ b/keyboards/cannonkeys/satisfaction75/config.h
@@ -23,10 +23,6 @@ along with this program. If not, see .
/* LSE clock */
#define STM32_LSECLK 32768
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 16
-
#define MATRIX_COL_PINS { B1, B2, B10, B11, B12, B13, B14, A8, A9, A10, B0, A7, A5, B5, A15, A1 }
#define MATRIX_ROW_PINS { B3, B4, A0, A2, A4, A3 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cannonkeys/savage65/config.h b/keyboards/cannonkeys/savage65/config.h
index f6069e5ed2..b5b655cb4d 100644
--- a/keyboards/cannonkeys/savage65/config.h
+++ b/keyboards/cannonkeys/savage65/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 16
-
#define MATRIX_COL_PINS { A5, B10, A3, A2, B0, A9, C13, B9, B8, B7, B6, B5, B4, B3, A15, A14 }
#define MATRIX_ROW_PINS { B12, B11, B14, A8, A1 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cannonkeys/tmov2/config.h b/keyboards/cannonkeys/tmov2/config.h
index 25e0a0aab9..7a12ac5844 100644
--- a/keyboards/cannonkeys/tmov2/config.h
+++ b/keyboards/cannonkeys/tmov2/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 16
-
#define MATRIX_COL_PINS { B14, A14, B1, C13, C14, C15, F0, F1, B9, B8, B7, B6, B5, B4, B3, A15 }
#define MATRIX_ROW_PINS { A10, A9, A8, B12 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cannonkeys/tsukuyomi/config.h b/keyboards/cannonkeys/tsukuyomi/config.h
index 66aee6a4a9..97d2ac6c02 100644
--- a/keyboards/cannonkeys/tsukuyomi/config.h
+++ b/keyboards/cannonkeys/tsukuyomi/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 17
-
#define MATRIX_COL_PINS { A7, A5, B10, A3, A2, B0, A9, C13, B9, B8, B7, B6, B5, B4, B3, A15, A14 }
#define MATRIX_ROW_PINS { B12, B11, B14, A8, A1 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cannonkeys/vicious40/config.h b/keyboards/cannonkeys/vicious40/config.h
index 9147461e98..f937ce7c67 100644
--- a/keyboards/cannonkeys/vicious40/config.h
+++ b/keyboards/cannonkeys/vicious40/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
#define MATRIX_COL_PINS { B0, A7, A5, B1, B2, B10, B11, A9, B6, B7, B8, B9 }
#define MATRIX_ROW_PINS { A15, B3, B4, B5 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/capsunlocked/cu24/config.h b/keyboards/capsunlocked/cu24/config.h
index 5d25beb5ee..7576a85d51 100644
--- a/keyboards/capsunlocked/cu24/config.h
+++ b/keyboards/capsunlocked/cu24/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 4
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/capsunlocked/cu65/config.h b/keyboards/capsunlocked/cu65/config.h
index 442620c3b6..fd829724fc 100644
--- a/keyboards/capsunlocked/cu65/config.h
+++ b/keyboards/capsunlocked/cu65/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 16
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/capsunlocked/cu7/config.h b/keyboards/capsunlocked/cu7/config.h
index ab2cca6bcd..93db7814f2 100644
--- a/keyboards/capsunlocked/cu7/config.h
+++ b/keyboards/capsunlocked/cu7/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 3
-#define MATRIX_COLS 3
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/capsunlocked/cu75/config.h b/keyboards/capsunlocked/cu75/config.h
index 98f6e6c338..f8cf3f0ffa 100644
--- a/keyboards/capsunlocked/cu75/config.h
+++ b/keyboards/capsunlocked/cu75/config.h
@@ -19,8 +19,6 @@ along with this program. If not, see .
#define DIODE_DIRECTION COL2ROW
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 16
#define MATRIX_ROW_PINS {F1, B7, B3, D2, D3, B2}
#define MATRIX_COL_PINS {F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, B1, B0, F0}
diff --git a/keyboards/capsunlocked/cu80/v1/config.h b/keyboards/capsunlocked/cu80/v1/config.h
index 48f22e1bb4..d604623f6e 100644
--- a/keyboards/capsunlocked/cu80/v1/config.h
+++ b/keyboards/capsunlocked/cu80/v1/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 17
-
#define MATRIX_ROW_PINS { B1, B5, B4, F7, D7, D6 }
#define MATRIX_COL_PINS { F6, F5, F4, F1, F0, C7, C6, B6, B0, E6, B7, B3, B2, D2, D3, D5, D4}
diff --git a/keyboards/carbo65/config.h b/keyboards/carbo65/config.h
index ae0953a2e0..af627558fe 100644
--- a/keyboards/carbo65/config.h
+++ b/keyboards/carbo65/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
#define MATRIX_ROW_PINS { A2, B9, B8, B5, B4 }
#define MATRIX_COL_PINS { A1, B1, B0, A7, A6, A5, A4, A3, B2, B10, B11, B12, B13, B14, B15 }
diff --git a/keyboards/catch22/config.h b/keyboards/catch22/config.h
index ff309ad033..91bf0b5d95 100644
--- a/keyboards/catch22/config.h
+++ b/keyboards/catch22/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 5
-
/* key matrix pins */
#define MATRIX_ROW_PINS { B6, B2, B3, B1, F7 }
#define MATRIX_COL_PINS { B5, B4, E6, D7, C6 }
diff --git a/keyboards/cest73/tkm/config.h b/keyboards/cest73/tkm/config.h
index 37c920b2eb..5deae07fc6 100644
--- a/keyboards/cest73/tkm/config.h
+++ b/keyboards/cest73/tkm/config.h
@@ -16,10 +16,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 11
-#define MATRIX_COLS 10
-
/* matrix sz handy ruler: 1 2 3 4 5 6 7 8 9 10 11 12 */
/* key matrix pins */
/* row handy ruler: r0 r1 r2 r3 r4 r5 r6 r7 r8 r9 r10 */
diff --git a/keyboards/chalice/config.h b/keyboards/chalice/config.h
index 4dd8af45fd..a71d46d6b5 100644
--- a/keyboards/chalice/config.h
+++ b/keyboards/chalice/config.h
@@ -18,10 +18,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 7
-
#define MATRIX_ROW_PINS {F4, D1, D0, F5, D4, F6, B4, B5, B2, B6}
#define MATRIX_COL_PINS {F7, C6, B1, D2, E6, B3, D7}
diff --git a/keyboards/chaos65/config.h b/keyboards/chaos65/config.h
index ceafb24068..713238dfa6 100644
--- a/keyboards/chaos65/config.h
+++ b/keyboards/chaos65/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/* Keyboard Matrix Assignments */
#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
#define MATRIX_COL_PINS { B0, B1, B2, B3, D4, D6, D7, B4, B5, B6, C6, F7, F6, F5, F4 }
diff --git a/keyboards/charue/charon/config.h b/keyboards/charue/charon/config.h
index f1ed6698d7..1140991c95 100644
--- a/keyboards/charue/charon/config.h
+++ b/keyboards/charue/charon/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/* Keyboard Matrix Assignments */
#define MATRIX_ROW_PINS { B0, B1, B2, B3, C7 }
#define MATRIX_COL_PINS { D3, D5, B4, D7, D6, D4, F7, F6, F5, F4, F1, F0, B5, B6, C6 }
diff --git a/keyboards/charue/sunsetter/config.h b/keyboards/charue/sunsetter/config.h
index 9ebefba948..1219eac27c 100644
--- a/keyboards/charue/sunsetter/config.h
+++ b/keyboards/charue/sunsetter/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 18
-
#define MATRIX_COL_PINS { B13, B12, B1, B0, A7, A6, A5, A4, A3, B9, B8, B7, B6, B5, B4, F0, B3, A15 }
#define MATRIX_ROW_PINS { A8, B14, B11, B10, B2 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/charue/sunsetter_r2/config.h b/keyboards/charue/sunsetter_r2/config.h
index f49d709415..b3a3ab3f9b 100644
--- a/keyboards/charue/sunsetter_r2/config.h
+++ b/keyboards/charue/sunsetter_r2/config.h
@@ -4,10 +4,6 @@
#pragma once
-/* Key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 17
-
/* Keyboard Matrix Assignment s*/
#define MATRIX_ROW_PINS { B3, B2, F4, F5, F6 }
#define MATRIX_COL_PINS { F0, F1, F7, B1, D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7 }
diff --git a/keyboards/chavdai40/rev1/config.h b/keyboards/chavdai40/rev1/config.h
index d7059b491c..9918802434 100644
--- a/keyboards/chavdai40/rev1/config.h
+++ b/keyboards/chavdai40/rev1/config.h
@@ -23,11 +23,6 @@
/* usb power settings */
#define USB_MAX_POWER_CONSUMPTION 100
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 13
-
-
#define MATRIX_ROW_PINS { A0, A15, B5, B6 }
#define MATRIX_COL_PINS { B8, B4, B3, B2, B1, B0, A7, A6, A5, A4, A3, A2, A1 }
diff --git a/keyboards/chavdai40/rev2/config.h b/keyboards/chavdai40/rev2/config.h
index febe45d4b2..c6f7884275 100644
--- a/keyboards/chavdai40/rev2/config.h
+++ b/keyboards/chavdai40/rev2/config.h
@@ -23,11 +23,6 @@
/* usb power settings */
#define USB_MAX_POWER_CONSUMPTION 100
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 13
-
-
#define MATRIX_ROW_PINS { A0, A15, B5, B6 }
#define MATRIX_COL_PINS { B7, B4, B3, A8, B1, B0, A7, A6, A5, A4, A3, A2, A1 }
diff --git a/keyboards/checkerboards/axon40/config.h b/keyboards/checkerboards/axon40/config.h
index 73c9d63c3a..aca5940c63 100644
--- a/keyboards/checkerboards/axon40/config.h
+++ b/keyboards/checkerboards/axon40/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
/* key matrix pins */
#define MATRIX_ROW_PINS { D2, D3, D1, D5 }
#define MATRIX_COL_PINS { C7, B7, D4, D6, F0, F1, C6, B6, B5, B4, E6, B0 }
diff --git a/keyboards/checkerboards/candybar_ortho/config.h b/keyboards/checkerboards/candybar_ortho/config.h
index 3d835e2c8d..966e9c79a5 100644
--- a/keyboards/checkerboards/candybar_ortho/config.h
+++ b/keyboards/checkerboards/candybar_ortho/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 9
-
/* key matrix pins */
#define MATRIX_ROW_PINS { B4, D4, D7, D6, B5, B6, C7, C6 }
#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D0, D1, D2 }
diff --git a/keyboards/checkerboards/g_idb60/config.h b/keyboards/checkerboards/g_idb60/config.h
index 9b3d9c59f9..78a8f5ed63 100644
--- a/keyboards/checkerboards/g_idb60/config.h
+++ b/keyboards/checkerboards/g_idb60/config.h
@@ -18,10 +18,6 @@ Copyright 2021 Nathan Spears
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
/* key matrix pins */
#define MATRIX_ROW_PINS { D6, D7, B4, B5, F7 }
#define MATRIX_COL_PINS { B6, C6, C7, D4, F6, F0, B0, F1, F4, F5, D1, D0, D3, D5 }
diff --git a/keyboards/checkerboards/nop60/config.h b/keyboards/checkerboards/nop60/config.h
index 857f5eb4cc..88440d4a37 100644
--- a/keyboards/checkerboards/nop60/config.h
+++ b/keyboards/checkerboards/nop60/config.h
@@ -18,10 +18,6 @@ Copyright 2021 Nathan Spears
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
/* key matrix pins */
#define MATRIX_ROW_PINS { F0, F1, E6, B7, C6 }
#define MATRIX_COL_PINS { F6, F5, F4, D0, D7, D3, D4, D5, D6, F7, C7, B4, B6, B5 }
diff --git a/keyboards/checkerboards/phoenix45_ortho/config.h b/keyboards/checkerboards/phoenix45_ortho/config.h
index 6a90f579de..3f1b16129a 100644
--- a/keyboards/checkerboards/phoenix45_ortho/config.h
+++ b/keyboards/checkerboards/phoenix45_ortho/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 13
-
/* key matrix pins */
#define MATRIX_ROW_PINS { D2, D1, D0, C4 }
#define MATRIX_COL_PINS { D3, C2, C5, B0, D6, D5, D4, B4, B5, B6, B7, C7, C6 }
diff --git a/keyboards/checkerboards/plexus75/config.h b/keyboards/checkerboards/plexus75/config.h
index eff8a25530..0d8e9404e2 100644
--- a/keyboards/checkerboards/plexus75/config.h
+++ b/keyboards/checkerboards/plexus75/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
-
#define MATRIX_ROW_PINS { D2, B3, B1, F1, F0 }
#define MATRIX_COL_PINS { B2, B0, D1, F7, F6, F5, F4, D4, D6, D7, B4, B5, B6, C6, C7 }
diff --git a/keyboards/checkerboards/plexus75_he/config.h b/keyboards/checkerboards/plexus75_he/config.h
index b852180f62..f8ccc0e356 100644
--- a/keyboards/checkerboards/plexus75_he/config.h
+++ b/keyboards/checkerboards/plexus75_he/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 8
-
/* key matrix pins */
#define MATRIX_ROW_PINS { C2, D0, D1, D2, D6, B0, B3, B2, C6, B1 }
#define MATRIX_COL_PINS { C4, C5, D3, C7, B7, B6, B5, B4 }
diff --git a/keyboards/checkerboards/pursuit40/config.h b/keyboards/checkerboards/pursuit40/config.h
index d72ccb692e..cec9db65e9 100644
--- a/keyboards/checkerboards/pursuit40/config.h
+++ b/keyboards/checkerboards/pursuit40/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
/* key matrix pins */
#define MATRIX_ROW_PINS { D2, D1, F4, F5 }
#define MATRIX_COL_PINS { F1, E6, B7, D5, D4, D6, D7, B4, B5, B6, C6, C7 }
diff --git a/keyboards/checkerboards/quark/config.h b/keyboards/checkerboards/quark/config.h
index a950fb606f..c064c8569a 100644
--- a/keyboards/checkerboards/quark/config.h
+++ b/keyboards/checkerboards/quark/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 12
-
/* key matrix pins */
#define MATRIX_ROW_PINS { C5, C4, C6, C7, B7 }
#define MATRIX_COL_PINS { B4, B5, B6, B3, C2, B2, D6, D2, D3, D4, D5, B1 }
diff --git a/keyboards/checkerboards/quark_lp/config.h b/keyboards/checkerboards/quark_lp/config.h
index 242395181b..89fc05ed71 100644
--- a/keyboards/checkerboards/quark_lp/config.h
+++ b/keyboards/checkerboards/quark_lp/config.h
@@ -16,10 +16,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
/* key matrix pins */
#define MATRIX_ROW_PINS { C5, C4, C6, C7 }
#define MATRIX_COL_PINS { B6, B5, B4, B3, B0, D6, D5, D4, D3, D2, D1, D0 }
diff --git a/keyboards/checkerboards/quark_plus/config.h b/keyboards/checkerboards/quark_plus/config.h
index e5a4d587e2..5e0e46df3e 100644
--- a/keyboards/checkerboards/quark_plus/config.h
+++ b/keyboards/checkerboards/quark_plus/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 6
-
/* key matrix pins */
#define MATRIX_ROW_PINS { B4, B1, C2, D0, D6, B0, B6, B5 }
#define MATRIX_COL_PINS { C6, D1, D5, D4, D3, D2 }
diff --git a/keyboards/checkerboards/quark_squared/config.h b/keyboards/checkerboards/quark_squared/config.h
index 490e6ebbce..1715a1101b 100644
--- a/keyboards/checkerboards/quark_squared/config.h
+++ b/keyboards/checkerboards/quark_squared/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 12
-
/* key matrix pins */
#define MATRIX_ROW_PINS { C5, C4, C6, C7, B7 }
#define MATRIX_COL_PINS { B4, B5, B6, B3, C2, B2, D6, D2, D3, D4, D5, B1 }
diff --git a/keyboards/checkerboards/snop60/config.h b/keyboards/checkerboards/snop60/config.h
index 3118f467c3..82bb59d838 100644
--- a/keyboards/checkerboards/snop60/config.h
+++ b/keyboards/checkerboards/snop60/config.h
@@ -18,10 +18,6 @@ Copyright 2022 Nathan Spears
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
/* key matrix pins */
#define MATRIX_ROW_PINS { B7, D0, D6, B4, B5 }
#define MATRIX_COL_PINS { B6, C6, C7, D5, F7, F6, F5, F4, F1, F0, B0, E6, D4, D7 }
diff --git a/keyboards/checkerboards/ud40_ortho_alt/config.h b/keyboards/checkerboards/ud40_ortho_alt/config.h
index 91de00ddb7..76fe9ae327 100644
--- a/keyboards/checkerboards/ud40_ortho_alt/config.h
+++ b/keyboards/checkerboards/ud40_ortho_alt/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
/* key matrix pins */
#define MATRIX_ROW_PINS { E6, F0, F1, F4 }
#define MATRIX_COL_PINS { B2, B1, F7, D6, D7, B4, B5, B6, C6, C7, F5, F6 }
diff --git a/keyboards/cherrybstudio/cb1800/config.h b/keyboards/cherrybstudio/cb1800/config.h
index b4baf11ff7..cc6d24ebc1 100644
--- a/keyboards/cherrybstudio/cb1800/config.h
+++ b/keyboards/cherrybstudio/cb1800/config.h
@@ -14,10 +14,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 11
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/cherrybstudio/cb65/config.h b/keyboards/cherrybstudio/cb65/config.h
index daf3cd4fc6..6bf9dba1e5 100644
--- a/keyboards/cherrybstudio/cb65/config.h
+++ b/keyboards/cherrybstudio/cb65/config.h
@@ -14,10 +14,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 9
-#define MATRIX_COLS 8
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/cherrybstudio/cb87/config.h b/keyboards/cherrybstudio/cb87/config.h
index bbbe5311cd..cf9b6cbf58 100644
--- a/keyboards/cherrybstudio/cb87/config.h
+++ b/keyboards/cherrybstudio/cb87/config.h
@@ -14,10 +14,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 9
-#define MATRIX_COLS 10
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/cherrybstudio/cb87rgb/config.h b/keyboards/cherrybstudio/cb87rgb/config.h
index b1648f2b8d..eedd4de339 100644
--- a/keyboards/cherrybstudio/cb87rgb/config.h
+++ b/keyboards/cherrybstudio/cb87rgb/config.h
@@ -14,10 +14,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 10
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/cherrybstudio/cb87v2/config.h b/keyboards/cherrybstudio/cb87v2/config.h
index c85ce35a37..e7d8a2088f 100644
--- a/keyboards/cherrybstudio/cb87v2/config.h
+++ b/keyboards/cherrybstudio/cb87v2/config.h
@@ -14,10 +14,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 10
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/cheshire/curiosity/config.h b/keyboards/cheshire/curiosity/config.h
index 210df9cb80..8c60236697 100644
--- a/keyboards/cheshire/curiosity/config.h
+++ b/keyboards/cheshire/curiosity/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 16
-
#define MATRIX_ROW_PINS { B13, B14, A4, A2, A1 }
#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A5, B9, B8, B7, B6, B5, B4, B3, A15 }
diff --git a/keyboards/chickenman/ciel/config.h b/keyboards/chickenman/ciel/config.h
index dd2781e2cd..c2cae71086 100644
--- a/keyboards/chickenman/ciel/config.h
+++ b/keyboards/chickenman/ciel/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/chlx/merro60/config.h b/keyboards/chlx/merro60/config.h
index 8e2afc560e..f9f0068b16 100644
--- a/keyboards/chlx/merro60/config.h
+++ b/keyboards/chlx/merro60/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/chlx/str_merro60/config.h b/keyboards/chlx/str_merro60/config.h
index 236466c4fc..731309b6fa 100644
--- a/keyboards/chlx/str_merro60/config.h
+++ b/keyboards/chlx/str_merro60/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 7
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/chocofly/v1/config.h b/keyboards/chocofly/v1/config.h
index 053ca61362..aa7e280ce4 100644
--- a/keyboards/chocofly/v1/config.h
+++ b/keyboards/chocofly/v1/config.h
@@ -3,9 +3,6 @@
#pragma once
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 8
-
#define MATRIX_ROW_PINS { D1, D0, D4, C6, D7, E6, B4, B5 }
#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 }
diff --git a/keyboards/chocv/config.h b/keyboards/chocv/config.h
index c735d1871e..5d61c7d4d7 100644
--- a/keyboards/chocv/config.h
+++ b/keyboards/chocv/config.h
@@ -17,11 +17,6 @@
#pragma once
- /* key matrix size */
- #define MATRIX_ROWS 4
- #define MATRIX_COLS 10
-
-
#define MATRIX_ROW_PINS { F4, F5, D1, D0 }
#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, C6, D7, E6, B4, B5}
diff --git a/keyboards/cipulot/kallos/config.h b/keyboards/cipulot/kallos/config.h
index a5128b9ede..66140bc3ed 100644
--- a/keyboards/cipulot/kallos/config.h
+++ b/keyboards/cipulot/kallos/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 15
-
/* Keyboard Matrix Assignments */
#define MATRIX_ROW_PINS \
{ B3, B2, F0, C7, F4, F1 }
diff --git a/keyboards/cipulot/kawayo/config.h b/keyboards/cipulot/kawayo/config.h
index bb2152466a..1a9b80ee58 100644
--- a/keyboards/cipulot/kawayo/config.h
+++ b/keyboards/cipulot/kawayo/config.h
@@ -16,10 +16,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
#define MATRIX_ROW_PINS \
{ B1, B12, C13, A7, B0 }
#define MATRIX_COL_PINS \
diff --git a/keyboards/ck60i/config.h b/keyboards/ck60i/config.h
index ad2a7dee05..3a515f0e8e 100644
--- a/keyboards/ck60i/config.h
+++ b/keyboards/ck60i/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
#define MATRIX_COL_PINS { B12, A2 , A1 , A0 , F1 , F0 , B11, B10, B2 , B1 , B0 , A7 , C15, C14}
#define MATRIX_ROW_PINS { B9 , C13, A3 , B14, A8}
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ckeys/handwire_101/config.h b/keyboards/ckeys/handwire_101/config.h
index 3170959841..791c68f739 100755
--- a/keyboards/ckeys/handwire_101/config.h
+++ b/keyboards/ckeys/handwire_101/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 4
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/ckeys/nakey/config.h b/keyboards/ckeys/nakey/config.h
index e08fd8d222..e8c0aaebbe 100644
--- a/keyboards/ckeys/nakey/config.h
+++ b/keyboards/ckeys/nakey/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 4
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/ckeys/obelus/config.h b/keyboards/ckeys/obelus/config.h
index 3064f0147c..692646d083 100644
--- a/keyboards/ckeys/obelus/config.h
+++ b/keyboards/ckeys/obelus/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 4
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/ckeys/thedora/config.h b/keyboards/ckeys/thedora/config.h
index 323b6ae365..787b4dcc19 100755
--- a/keyboards/ckeys/thedora/config.h
+++ b/keyboards/ckeys/thedora/config.h
@@ -21,10 +21,6 @@
#define ENCODERS_PAD_B { B15 }
#define ENCODER_RESOLUTION 4
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 6
-
#define MATRIX_ROW_PINS { A2, A1, A0, B8 }
#define MATRIX_COL_PINS { B5, B4, B3, B2, B1, B0 }
diff --git a/keyboards/ckeys/washington/config.h b/keyboards/ckeys/washington/config.h
index 7e85ac2544..789513bfe1 100644
--- a/keyboards/ckeys/washington/config.h
+++ b/keyboards/ckeys/washington/config.h
@@ -16,10 +16,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 3
-#define MATRIX_COLS 3
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/clawsome/bookerboard/config.h b/keyboards/clawsome/bookerboard/config.h
index ab402b813b..60c531b89f 100644
--- a/keyboards/clawsome/bookerboard/config.h
+++ b/keyboards/clawsome/bookerboard/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 3
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/clawsome/coupe/config.h b/keyboards/clawsome/coupe/config.h
index d0f117fdd5..bad945e802 100644
--- a/keyboards/clawsome/coupe/config.h
+++ b/keyboards/clawsome/coupe/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 7
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/clawsome/doodle/config.h b/keyboards/clawsome/doodle/config.h
index c8270d8d75..7dcdcc03a8 100644
--- a/keyboards/clawsome/doodle/config.h
+++ b/keyboards/clawsome/doodle/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 3
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/clawsome/fightpad/config.h b/keyboards/clawsome/fightpad/config.h
index 525de65dd4..a62845a6af 100644
--- a/keyboards/clawsome/fightpad/config.h
+++ b/keyboards/clawsome/fightpad/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 7
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/clawsome/gamebuddy/v1_0/config.h b/keyboards/clawsome/gamebuddy/v1_0/config.h
index fd1a65e2d4..bf867467f2 100644
--- a/keyboards/clawsome/gamebuddy/v1_0/config.h
+++ b/keyboards/clawsome/gamebuddy/v1_0/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 7
-
#define MATRIX_ROW_PINS { D1, D0, E6, B3, B2 }
#define MATRIX_COL_PINS { F5, F6, F7, B1, C6, D7, B6 }
diff --git a/keyboards/clawsome/gamebuddy/v1_m/config.h b/keyboards/clawsome/gamebuddy/v1_m/config.h
index 16d7aa426c..5c2f368800 100644
--- a/keyboards/clawsome/gamebuddy/v1_m/config.h
+++ b/keyboards/clawsome/gamebuddy/v1_m/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 7
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/clawsome/hatchback/config.h b/keyboards/clawsome/hatchback/config.h
index 13cd97ba08..0c0cd52041 100644
--- a/keyboards/clawsome/hatchback/config.h
+++ b/keyboards/clawsome/hatchback/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 12
-#define MATRIX_COLS 10
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/clawsome/luggage_rack/config.h b/keyboards/clawsome/luggage_rack/config.h
index dbd5108dd8..b6df355827 100644
--- a/keyboards/clawsome/luggage_rack/config.h
+++ b/keyboards/clawsome/luggage_rack/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 9
-#define MATRIX_COLS 3
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/clawsome/numeros/config.h b/keyboards/clawsome/numeros/config.h
index 5aae05f532..a1ee98579f 100644
--- a/keyboards/clawsome/numeros/config.h
+++ b/keyboards/clawsome/numeros/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 4
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/clawsome/roadster/config.h b/keyboards/clawsome/roadster/config.h
index 34e9cc8469..30294c7cfb 100644
--- a/keyboards/clawsome/roadster/config.h
+++ b/keyboards/clawsome/roadster/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/clawsome/sedan/config.h b/keyboards/clawsome/sedan/config.h
index d5be6e7320..b7fe854916 100644
--- a/keyboards/clawsome/sedan/config.h
+++ b/keyboards/clawsome/sedan/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/clawsome/sidekick/config.h b/keyboards/clawsome/sidekick/config.h
index b10e5835c4..be550c7a71 100644
--- a/keyboards/clawsome/sidekick/config.h
+++ b/keyboards/clawsome/sidekick/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 7
-
#define MATRIX_ROW_PINS { D0, C6, B2, B6, B5 }
#define MATRIX_COL_PINS { F6, F5, B1, B3, E6, D7, D4 }
diff --git a/keyboards/clawsome/suv/config.h b/keyboards/clawsome/suv/config.h
index 50204cdfb1..915ec1cf5b 100644
--- a/keyboards/clawsome/suv/config.h
+++ b/keyboards/clawsome/suv/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 12
-#define MATRIX_COLS 11
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/clickety_split/leeloo/rev1/config.h b/keyboards/clickety_split/leeloo/rev1/config.h
index cb80debf74..ef638caa35 100644
--- a/keyboards/clickety_split/leeloo/rev1/config.h
+++ b/keyboards/clickety_split/leeloo/rev1/config.h
@@ -18,11 +18,6 @@
#pragma once
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 6
-
// wiring of each half
#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
diff --git a/keyboards/cmm_studio/fuji65/config.h b/keyboards/cmm_studio/fuji65/config.h
index f5228f9c4c..3e0f08ab9a 100644
--- a/keyboards/cmm_studio/fuji65/config.h
+++ b/keyboards/cmm_studio/fuji65/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/cmm_studio/saka68/hotswap/config.h b/keyboards/cmm_studio/saka68/hotswap/config.h
index 34d912e69d..b8a29be0de 100644
--- a/keyboards/cmm_studio/saka68/hotswap/config.h
+++ b/keyboards/cmm_studio/saka68/hotswap/config.h
@@ -19,10 +19,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 16
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/cmm_studio/saka68/solder/config.h b/keyboards/cmm_studio/saka68/solder/config.h
index 557d564279..76960df064 100644
--- a/keyboards/cmm_studio/saka68/solder/config.h
+++ b/keyboards/cmm_studio/saka68/solder/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 17
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/coarse/cordillera/config.h b/keyboards/coarse/cordillera/config.h
index f648e5f15f..fe9c5f76df 100644
--- a/keyboards/coarse/cordillera/config.h
+++ b/keyboards/coarse/cordillera/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 16
-
#define MATRIX_ROW_PINS { A13, B9, F1, A10, A9 }
#define MATRIX_COL_PINS { B15, B14, B13, B12, B11, B10, B2, B1, B8, B7, B6, B5, B4, B3, A15, A14 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/coarse/ixora/config.h b/keyboards/coarse/ixora/config.h
index 4223dc987f..1d10a99696 100644
--- a/keyboards/coarse/ixora/config.h
+++ b/keyboards/coarse/ixora/config.h
@@ -1,10 +1,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 6
-
#define MATRIX_ROW_PINS { A0 }
#define MATRIX_COL_PINS { B4, A15, B3, A1, B6, B5 }
diff --git a/keyboards/coarse/vinta/config.h b/keyboards/coarse/vinta/config.h
index 772616cd07..629f4b9b16 100644
--- a/keyboards/coarse/vinta/config.h
+++ b/keyboards/coarse/vinta/config.h
@@ -1,10 +1,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 16
-
#define MATRIX_ROW_PINS { A10, A9, B0, A7, A6 }
#define MATRIX_COL_PINS { A5, A4, A3, A2, A1, A0, F1, F0, B7, B6, B5, B4, B3, A15, A14, A13 }
diff --git a/keyboards/compound/config.h b/keyboards/compound/config.h
index 140d83e099..1024eb01f3 100644
--- a/keyboards/compound/config.h
+++ b/keyboards/compound/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
// ROWS: Top to bottom, COLS: Left to right
#define MATRIX_ROW_PINS {B0,B7,D0,D1,D2}
diff --git a/keyboards/contender/config.h b/keyboards/contender/config.h
index ff1297c2a5..e81b8a2094 100644
--- a/keyboards/contender/config.h
+++ b/keyboards/contender/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 5
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/contra/config.h b/keyboards/contra/config.h
index d04b4aa545..36a3485b95 100755
--- a/keyboards/contra/config.h
+++ b/keyboards/contra/config.h
@@ -1,10 +1,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
/* key matrix pins */
#define MATRIX_ROW_PINS { F6, B3, B2, B6 }
#define MATRIX_COL_PINS { F4, F5, B5, B4, E6, D7, C6, D4, D0, D1, D2, D3 }
diff --git a/keyboards/converter/a1200/miss1200/config.h b/keyboards/converter/a1200/miss1200/config.h
index 9b29c09704..07e8b9ac93 100644
--- a/keyboards/converter/a1200/miss1200/config.h
+++ b/keyboards/converter/a1200/miss1200/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 16
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/converter/a1200/mistress1200/config.h b/keyboards/converter/a1200/mistress1200/config.h
index bbf4d1c313..6b2204ec43 100644
--- a/keyboards/converter/a1200/mistress1200/config.h
+++ b/keyboards/converter/a1200/mistress1200/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 16
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/converter/a1200/teensy2pp/config.h b/keyboards/converter/a1200/teensy2pp/config.h
index 5c4d67aa4f..c859413d18 100644
--- a/keyboards/converter/a1200/teensy2pp/config.h
+++ b/keyboards/converter/a1200/teensy2pp/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 16
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/converter/modelm101/config.h b/keyboards/converter/modelm101/config.h
index 9934c288e8..00d991fcc8 100644
--- a/keyboards/converter/modelm101/config.h
+++ b/keyboards/converter/modelm101/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 16
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/converter/modelm101_teensy2/config.h b/keyboards/converter/modelm101_teensy2/config.h
index 3c6733b42b..7e0e627bd9 100644
--- a/keyboards/converter/modelm101_teensy2/config.h
+++ b/keyboards/converter/modelm101_teensy2/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 16
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/converter/modelm_ssk/config.h b/keyboards/converter/modelm_ssk/config.h
index 5826710ba1..f38e3db3dd 100644
--- a/keyboards/converter/modelm_ssk/config.h
+++ b/keyboards/converter/modelm_ssk/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 16
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/converter/numeric_keypad_iie/config.h b/keyboards/converter/numeric_keypad_iie/config.h
index 6d17690ede..81671354fd 100644
--- a/keyboards/converter/numeric_keypad_iie/config.h
+++ b/keyboards/converter/numeric_keypad_iie/config.h
@@ -82,8 +82,6 @@ http://wiki.apple2.org/index.php?title=Pinouts#Apple_.2F.2Fe_Numeric_Keypad_conn
*/
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 6
#define MATRIX_ROW_PINS { B0, B2, D2, D3 }
#define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/converter/periboard_512/config.h b/keyboards/converter/periboard_512/config.h
index 86493340e4..422a07b341 100644
--- a/keyboards/converter/periboard_512/config.h
+++ b/keyboards/converter/periboard_512/config.h
@@ -16,8 +16,4 @@
#pragma once
-
-/* matrix properties */
-#define MATRIX_COLS 19
-#define MATRIX_ROWS 8
#define MATRIX_HAS_GHOST
diff --git a/keyboards/cool836a/config.h b/keyboards/cool836a/config.h
index 09714bd069..1010646969 100644
--- a/keyboards/cool836a/config.h
+++ b/keyboards/cool836a/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 6
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/copenhagen_click/click_pad_v1/config.h b/keyboards/copenhagen_click/click_pad_v1/config.h
index 8e63cfbb43..40fd903c42 100755
--- a/keyboards/copenhagen_click/click_pad_v1/config.h
+++ b/keyboards/copenhagen_click/click_pad_v1/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 1
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/coseyfannitutti/discipad/config.h b/keyboards/coseyfannitutti/discipad/config.h
index 8bc141beef..0f304c68b5 100644
--- a/keyboards/coseyfannitutti/discipad/config.h
+++ b/keyboards/coseyfannitutti/discipad/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 4
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/coseyfannitutti/discipline/config.h b/keyboards/coseyfannitutti/discipline/config.h
index 101f8808b7..e91656f198 100644
--- a/keyboards/coseyfannitutti/discipline/config.h
+++ b/keyboards/coseyfannitutti/discipline/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/coseyfannitutti/mullet/config.h b/keyboards/coseyfannitutti/mullet/config.h
index 20195045e0..5ee6b135fc 100644
--- a/keyboards/coseyfannitutti/mullet/config.h
+++ b/keyboards/coseyfannitutti/mullet/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/coseyfannitutti/mulletpad/config.h b/keyboards/coseyfannitutti/mulletpad/config.h
index 81feea7761..6cd992c919 100644
--- a/keyboards/coseyfannitutti/mulletpad/config.h
+++ b/keyboards/coseyfannitutti/mulletpad/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 4
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/coseyfannitutti/mysterium/config.h b/keyboards/coseyfannitutti/mysterium/config.h
index cd01b54cce..2c9c5629cf 100644
--- a/keyboards/coseyfannitutti/mysterium/config.h
+++ b/keyboards/coseyfannitutti/mysterium/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 18
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/coseyfannitutti/romeo/config.h b/keyboards/coseyfannitutti/romeo/config.h
index 477fe034a5..ea75f82f4b 100644
--- a/keyboards/coseyfannitutti/romeo/config.h
+++ b/keyboards/coseyfannitutti/romeo/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/cosmo65/config.h b/keyboards/cosmo65/config.h
index 94b60a4931..b8131f5d7d 100644
--- a/keyboards/cosmo65/config.h
+++ b/keyboards/cosmo65/config.h
@@ -28,10 +28,6 @@ along with this program. If not, see http://www.gnu.org/licenses/.
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
/* keyboard matrix assignments */
#define MATRIX_ROW_PINS { D5, D0, F0, F5, F4 }
#define MATRIX_COL_PINS { E6, D4, D6, D7, B4, B5, B6, C6, C7, D1, D2, D3, F1, F6 }
diff --git a/keyboards/cozykeys/bloomer/config.h b/keyboards/cozykeys/bloomer/config.h
index 8bfe27b5e1..3e13941d50 100644
--- a/keyboards/cozykeys/bloomer/config.h
+++ b/keyboards/cozykeys/bloomer/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-// Key matrix size
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 15
-
// Enable RGB backlight
#ifdef RGBLIGHT_ENABLE
#define RGB_DI_PIN D7
diff --git a/keyboards/cozykeys/speedo/v2/config.h b/keyboards/cozykeys/speedo/v2/config.h
index 5c37fdbdd0..6752b3934a 100644
--- a/keyboards/cozykeys/speedo/v2/config.h
+++ b/keyboards/cozykeys/speedo/v2/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-// Key matrix size
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
// Keyboard Matrix Assignments
#define MATRIX_ROW_PINS { D1, D2, D3, C6, C7 }
#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, B6, B5, D0, B7, B3, B2, B1, B0 }
diff --git a/keyboards/cozykeys/speedo/v3/config.h b/keyboards/cozykeys/speedo/v3/config.h
index 6cd36ba916..885b09d0ba 100644
--- a/keyboards/cozykeys/speedo/v3/config.h
+++ b/keyboards/cozykeys/speedo/v3/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-// Key matrix size
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
// Keyboard Matrix Assignments
#define MATRIX_ROW_PINS { F0, F1, C7, D5, B7 }
#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B6, B2, E6, D7, C6, D4, D0, D1 }
diff --git a/keyboards/craftwalk/config.h b/keyboards/craftwalk/config.h
index ee6771d1a4..fdf42006ff 100644
--- a/keyboards/craftwalk/config.h
+++ b/keyboards/craftwalk/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 3
-#define MATRIX_COLS 7
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/crawlpad/config.h b/keyboards/crawlpad/config.h
index 072a1be180..f0c5263403 100755
--- a/keyboards/crawlpad/config.h
+++ b/keyboards/crawlpad/config.h
@@ -1,10 +1,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 4
-
/* key matrix pins */
#define MATRIX_ROW_PINS { F0, F1, F4, F5 }
#define MATRIX_COL_PINS { D4, D5, D6, D7 }
diff --git a/keyboards/crazy_keyboard_68/config.h b/keyboards/crazy_keyboard_68/config.h
index 28184bebc3..15f68b19b2 100644
--- a/keyboards/crazy_keyboard_68/config.h
+++ b/keyboards/crazy_keyboard_68/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/crbn/config.h b/keyboards/crbn/config.h
index 3a90929925..d33e3e1f78 100644
--- a/keyboards/crbn/config.h
+++ b/keyboards/crbn/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
/* key matrix pins */
#define MATRIX_ROW_PINS { B3, B1, F7, F6 }
#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5, B6, B2 }
diff --git a/keyboards/creatkeebs/glacier/config.h b/keyboards/creatkeebs/glacier/config.h
index d36a02529a..68655d9d8f 100644
--- a/keyboards/creatkeebs/glacier/config.h
+++ b/keyboards/creatkeebs/glacier/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 17
-
/* key matrix pins */
#define MATRIX_ROW_PINS { F0, F1, F4, E6, F5, D0 }
#define MATRIX_COL_PINS { D4, D6, D7, B4, B5, F6, B0, B6, C6, C7, B1, B2, B3, B7, D3, D2, D1 }
diff --git a/keyboards/creatkeebs/thera/config.h b/keyboards/creatkeebs/thera/config.h
index 97821f966d..3a17d73f17 100644
--- a/keyboards/creatkeebs/thera/config.h
+++ b/keyboards/creatkeebs/thera/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 15
-
/* key matrix pins */
#define MATRIX_ROW_PINS { B2, B1, B0, E6, B3, B7 }
#define MATRIX_COL_PINS { D0, D1, D2, D3, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5 }
diff --git a/keyboards/crimsonkeyboards/resume1800/config.h b/keyboards/crimsonkeyboards/resume1800/config.h
index cd84feccf3..35b0326ec6 100644
--- a/keyboards/crimsonkeyboards/resume1800/config.h
+++ b/keyboards/crimsonkeyboards/resume1800/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 20
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/crin/config.h b/keyboards/crin/config.h
index 9ba71134e0..880213cc11 100644
--- a/keyboards/crin/config.h
+++ b/keyboards/crin/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see .
#pragma once
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 17
-
#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A5, A4, A3, B9, B8, B7, B6, B5, B4, B3 }
#define MATRIX_ROW_PINS { A9, A8, B15, B14, B13 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/crkbd/config.h b/keyboards/crkbd/config.h
index 10dd7b809b..709cf4acb0 100644
--- a/keyboards/crkbd/config.h
+++ b/keyboards/crkbd/config.h
@@ -19,10 +19,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 6
#define MATRIX_ROW_PINS \
{ D4, C6, D7, E6 }
diff --git a/keyboards/custommk/genesis/rev1/config.h b/keyboards/custommk/genesis/rev1/config.h
index 52ac6cf1f5..5f6113bc68 100644
--- a/keyboards/custommk/genesis/rev1/config.h
+++ b/keyboards/custommk/genesis/rev1/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 4
-
/* key matrix pins */
#define MATRIX_ROW_PINS { F0, C7, C6, B6, B5 }
#define MATRIX_COL_PINS { F4, F5, D7, B4 }
diff --git a/keyboards/custommk/genesis/rev2/config.h b/keyboards/custommk/genesis/rev2/config.h
index 8dfc01f4c7..f034eab579 100644
--- a/keyboards/custommk/genesis/rev2/config.h
+++ b/keyboards/custommk/genesis/rev2/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 4
-
/* key matrix pins */
#define MATRIX_ROW_PINS { F0, C7, C6, B6, B5, B0}
#define MATRIX_COL_PINS { F4, F5, D7, B4 }
diff --git a/keyboards/cutie_club/borsdorf/config.h b/keyboards/cutie_club/borsdorf/config.h
index 8e607e77ce..655ac6ece1 100644
--- a/keyboards/cutie_club/borsdorf/config.h
+++ b/keyboards/cutie_club/borsdorf/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/*
* Keyboard Matrix Assignments
*/
diff --git a/keyboards/cutie_club/giant_macro_pad/config.h b/keyboards/cutie_club/giant_macro_pad/config.h
index ff14a4a94d..c78221d4c8 100755
--- a/keyboards/cutie_club/giant_macro_pad/config.h
+++ b/keyboards/cutie_club/giant_macro_pad/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 20
-#define MATRIX_COLS 20
-
/*
* Keyboard Matrix Assignments
*/
diff --git a/keyboards/cutie_club/keebcats/denis/config.h b/keyboards/cutie_club/keebcats/denis/config.h
index 3583561346..7e46d166b7 100644
--- a/keyboards/cutie_club/keebcats/denis/config.h
+++ b/keyboards/cutie_club/keebcats/denis/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/*
* Keyboard Matrix Assignments
*/
diff --git a/keyboards/cutie_club/keebcats/dougal/config.h b/keyboards/cutie_club/keebcats/dougal/config.h
index d3f08e94b3..d2f4b19e87 100644
--- a/keyboards/cutie_club/keebcats/dougal/config.h
+++ b/keyboards/cutie_club/keebcats/dougal/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 16
-
/*
* Keyboard Matrix Assignments
*/
diff --git a/keyboards/cutie_club/novus/config.h b/keyboards/cutie_club/novus/config.h
index 3b6cc1e640..001aeb5375 100644
--- a/keyboards/cutie_club/novus/config.h
+++ b/keyboards/cutie_club/novus/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/cutie_club/wraith/config.h b/keyboards/cutie_club/wraith/config.h
index 16dd6a0027..e7a7104856 100644
--- a/keyboards/cutie_club/wraith/config.h
+++ b/keyboards/cutie_club/wraith/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 12
-#define MATRIX_COLS 8
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/cx60/config.h b/keyboards/cx60/config.h
index 12af2277e9..5aaca2af88 100644
--- a/keyboards/cx60/config.h
+++ b/keyboards/cx60/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
/* Keyboard Matrix Assignments */
#define MATRIX_ROW_PINS { F1, F4, F5, F6, E6 }
#define MATRIX_COL_PINS { C7, C6, F7, F0, B4, D7, D6, B0, B1, B2, B3, D2, D3, D5 }
diff --git a/keyboards/dailycraft/bat43/config.h b/keyboards/dailycraft/bat43/config.h
index 5e2c1ee9b0..55fc373ea8 100644
--- a/keyboards/dailycraft/bat43/config.h
+++ b/keyboards/dailycraft/bat43/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 6
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/dailycraft/claw44/rev1/config.h b/keyboards/dailycraft/claw44/rev1/config.h
index 5c3eabd5b6..4b7f797d43 100644
--- a/keyboards/dailycraft/claw44/rev1/config.h
+++ b/keyboards/dailycraft/claw44/rev1/config.h
@@ -18,9 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 6
#define MATRIX_ROW_PINS { D4, C6, D7, E6 }
#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/dailycraft/sandbox/rev1/config.h b/keyboards/dailycraft/sandbox/rev1/config.h
index 5d4d5c5a42..11c2825ca9 100644
--- a/keyboards/dailycraft/sandbox/rev1/config.h
+++ b/keyboards/dailycraft/sandbox/rev1/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 5
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/dailycraft/sandbox/rev2/config.h b/keyboards/dailycraft/sandbox/rev2/config.h
index fb42e45b0c..489e8560ca 100644
--- a/keyboards/dailycraft/sandbox/rev2/config.h
+++ b/keyboards/dailycraft/sandbox/rev2/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 5
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/dailycraft/wings42/rev1/config.h b/keyboards/dailycraft/wings42/rev1/config.h
index 523c853d91..54618965cc 100644
--- a/keyboards/dailycraft/wings42/rev1/config.h
+++ b/keyboards/dailycraft/wings42/rev1/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 6
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/dailycraft/wings42/rev1_extkeys/config.h b/keyboards/dailycraft/wings42/rev1_extkeys/config.h
index 72c247c5c6..c19c20b929 100644
--- a/keyboards/dailycraft/wings42/rev1_extkeys/config.h
+++ b/keyboards/dailycraft/wings42/rev1_extkeys/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 12
-#define MATRIX_COLS 8
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/dailycraft/wings42/rev2/config.h b/keyboards/dailycraft/wings42/rev2/config.h
index 499897d06c..efc78131d6 100644
--- a/keyboards/dailycraft/wings42/rev2/config.h
+++ b/keyboards/dailycraft/wings42/rev2/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 6
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/daji/seis_cinco/config.h b/keyboards/daji/seis_cinco/config.h
index 3de8df3498..02f3863e4d 100644
--- a/keyboards/daji/seis_cinco/config.h
+++ b/keyboards/daji/seis_cinco/config.h
@@ -18,10 +18,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 16
-
/*
* Keyboard Matrix Assignments
*/
diff --git a/keyboards/db/db63/config.h b/keyboards/db/db63/config.h
index 2902447d60..66a0135073 100644
--- a/keyboards/db/db63/config.h
+++ b/keyboards/db/db63/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see .
#pragma once
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 14
-
#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5 }
#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2 }
diff --git a/keyboards/delikeeb/flatbread60/config.h b/keyboards/delikeeb/flatbread60/config.h
index bd4629d79a..5de4b65388 100644
--- a/keyboards/delikeeb/flatbread60/config.h
+++ b/keyboards/delikeeb/flatbread60/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 12
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/delikeeb/vaguettelite/config.h b/keyboards/delikeeb/vaguettelite/config.h
index 6f8757744e..b430a301d7 100644
--- a/keyboards/delikeeb/vaguettelite/config.h
+++ b/keyboards/delikeeb/vaguettelite/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 12
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/delikeeb/vanana/rev1/config.h b/keyboards/delikeeb/vanana/rev1/config.h
index 820f1dff44..bf501e83ab 100644
--- a/keyboards/delikeeb/vanana/rev1/config.h
+++ b/keyboards/delikeeb/vanana/rev1/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 12
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/delikeeb/vanana/rev2/config.h b/keyboards/delikeeb/vanana/rev2/config.h
index f3eb340873..687bb7a294 100644
--- a/keyboards/delikeeb/vanana/rev2/config.h
+++ b/keyboards/delikeeb/vanana/rev2/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 10
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/delikeeb/vaneela/config.h b/keyboards/delikeeb/vaneela/config.h
index 01199e5910..510a13bb6b 100644
--- a/keyboards/delikeeb/vaneela/config.h
+++ b/keyboards/delikeeb/vaneela/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 12
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/delikeeb/vaneelaex/config.h b/keyboards/delikeeb/vaneelaex/config.h
index 7669599509..aa3f9f338c 100644
--- a/keyboards/delikeeb/vaneelaex/config.h
+++ b/keyboards/delikeeb/vaneelaex/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 12
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/delikeeb/waaffle/rev3/config.h b/keyboards/delikeeb/waaffle/rev3/config.h
index ab233a7c59..48326e7f22 100644
--- a/keyboards/delikeeb/waaffle/rev3/config.h
+++ b/keyboards/delikeeb/waaffle/rev3/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 10
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/deltapad/config.h b/keyboards/deltapad/config.h
index 200110a370..d6d4224cf0 100644
--- a/keyboards/deltapad/config.h
+++ b/keyboards/deltapad/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 4
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/deltasplit75/v2/config.h b/keyboards/deltasplit75/v2/config.h
index cba1bb6052..7ecbbd34e4 100644
--- a/keyboards/deltasplit75/v2/config.h
+++ b/keyboards/deltasplit75/v2/config.h
@@ -18,11 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 14
-#define MATRIX_COLS 8
-
// wiring of each half
#define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3, B2 }
#define MATRIX_COL_PINS { B6, B5, B4, E6, D7, C6, D4, D1}
diff --git a/keyboards/demiurge/config.h b/keyboards/demiurge/config.h
index abdb5f9fa5..2ce006c82f 100755
--- a/keyboards/demiurge/config.h
+++ b/keyboards/demiurge/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 17
-
/* key matrix pins */
#define MATRIX_ROW_PINS { F0, F4, F6, F7, C7 }
#define MATRIX_COL_PINS { E6, F5, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0, B7, B3, B2 }
diff --git a/keyboards/deng/djam/config.h b/keyboards/deng/djam/config.h
index d50a1efc03..7aab2373c6 100644
--- a/keyboards/deng/djam/config.h
+++ b/keyboards/deng/djam/config.h
@@ -16,8 +16,6 @@
#pragma once
-#define MATRIX_ROWS 3
-#define MATRIX_COLS 8
#define MATRIX_ROW_PINS { F0, F1, F4 }
#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/deng/thirty/config.h b/keyboards/deng/thirty/config.h
index 86db4bc5eb..ff51cade09 100644
--- a/keyboards/deng/thirty/config.h
+++ b/keyboards/deng/thirty/config.h
@@ -17,8 +17,6 @@
/* Matrix */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 5
#define MATRIX_ROW_PINS { B15, A5, A3, A15, B7, B8 }
#define MATRIX_COL_PINS { B13, B14, B3, A4, A6 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/dinofizz/fnrow/v1/config.h b/keyboards/dinofizz/fnrow/v1/config.h
index 008fecce02..0763c887c8 100644
--- a/keyboards/dinofizz/fnrow/v1/config.h
+++ b/keyboards/dinofizz/fnrow/v1/config.h
@@ -18,9 +18,6 @@ along with this program. If not, see .
#pragma once
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 7
-
#define MATRIX_ROW_PINS { A0, A1 }
#define MATRIX_COL_PINS {B0, B1, B3, B4, B5, B6, B7 }
diff --git a/keyboards/dk60/config.h b/keyboards/dk60/config.h
index c8a1c67006..aad4dce535 100644
--- a/keyboards/dk60/config.h
+++ b/keyboards/dk60/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 13
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/dm9records/ergoinu/config.h b/keyboards/dm9records/ergoinu/config.h
index a679167cb8..9516c339f0 100644
--- a/keyboards/dm9records/ergoinu/config.h
+++ b/keyboards/dm9records/ergoinu/config.h
@@ -28,13 +28,9 @@ along with this program. If not, see .
// #define MASTER_RIGHT
// #define EE_HANDS
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 10
#define MATRIX_ROW_PINS { F6, F7, B1, B3, B2 }
// wiring of each half
-#define MATRIX_COLS 7
#define MATRIX_COL_PINS { B4, E6, D7, C6, D4, F5, F4 }
/* COL2ROW, ROW2COL */
diff --git a/keyboards/dm9records/lain/config.h b/keyboards/dm9records/lain/config.h
index 6f199bcbaa..bf9fce0889 100644
--- a/keyboards/dm9records/lain/config.h
+++ b/keyboards/dm9records/lain/config.h
@@ -4,10 +4,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 13
-
/*
* Keyboard Matrix Assignments
*/
diff --git a/keyboards/dm9records/plaid/config.h b/keyboards/dm9records/plaid/config.h
index 9801c73e2c..e808946006 100644
--- a/keyboards/dm9records/plaid/config.h
+++ b/keyboards/dm9records/plaid/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/dm9records/tartan/config.h b/keyboards/dm9records/tartan/config.h
index 69d2d7bec9..53f1566252 100644
--- a/keyboards/dm9records/tartan/config.h
+++ b/keyboards/dm9records/tartan/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 13
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/dmqdesign/spin/config.h b/keyboards/dmqdesign/spin/config.h
index 881657a9dd..47255ed3ae 100644
--- a/keyboards/dmqdesign/spin/config.h
+++ b/keyboards/dmqdesign/spin/config.h
@@ -18,9 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 3
-#define MATRIX_COLS 5
//Matrix is 3x5 instead of 3x4, as the 3 encoders are wired into the matrix
#define MATRIX_ROW_PINS { F0, F1, F4 }
diff --git a/keyboards/do60/config.h b/keyboards/do60/config.h
index 796c5aadc8..de8ef988e4 100644
--- a/keyboards/do60/config.h
+++ b/keyboards/do60/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/doio/kb16/rev1/config.h b/keyboards/doio/kb16/rev1/config.h
index 4eaccb21d4..5f30b97812 100644
--- a/keyboards/doio/kb16/rev1/config.h
+++ b/keyboards/doio/kb16/rev1/config.h
@@ -18,10 +18,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 5
-
/* key matrix pins */
#define MATRIX_ROW_PINS { D5, D4, D3, D2 }
#define MATRIX_COL_PINS { F5, F4, F1, F0, B7 }
diff --git a/keyboards/doio/kb16/rev2/config.h b/keyboards/doio/kb16/rev2/config.h
index 371d1d7e49..29367f26e8 100644
--- a/keyboards/doio/kb16/rev2/config.h
+++ b/keyboards/doio/kb16/rev2/config.h
@@ -18,10 +18,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 5
-
/* key matrix pins */
#define MATRIX_ROW_PINS { B3, B4, B9, B8 }
#define MATRIX_COL_PINS { B14, B13, B12, B0, A7 }
diff --git a/keyboards/doio/kb30/config.h b/keyboards/doio/kb30/config.h
index d3c876fddf..42e521c18d 100644
--- a/keyboards/doio/kb30/config.h
+++ b/keyboards/doio/kb30/config.h
@@ -18,10 +18,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 7
-
#define MATRIX_ROW_PINS { B3, B4, B9, B8, A5, A6 }
#define MATRIX_COL_PINS { B14, B13, B12, B0, A7, A9, A8 }
#define DIODE_DIRECTION COL2ROW // COL2ROW or ROW2COL
diff --git a/keyboards/donutcables/budget96/config.h b/keyboards/donutcables/budget96/config.h
index 9ec30b81f5..a18aebcd58 100644
--- a/keyboards/donutcables/budget96/config.h
+++ b/keyboards/donutcables/budget96/config.h
@@ -20,9 +20,6 @@ along with this program. If not, see .
#define RGBLED_NUM 18
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 15
-
#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 }
diff --git a/keyboards/donutcables/scrabblepad/config.h b/keyboards/donutcables/scrabblepad/config.h
index eb4d25370d..dc6d1fc84a 100644
--- a/keyboards/donutcables/scrabblepad/config.h
+++ b/keyboards/donutcables/scrabblepad/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 15
-#define MATRIX_COLS 15
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/doodboard/duckboard/config.h b/keyboards/doodboard/duckboard/config.h
index 74e282275e..bce35cc22e 100644
--- a/keyboards/doodboard/duckboard/config.h
+++ b/keyboards/doodboard/duckboard/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 5
-
/* key matrix pins */
#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
#define MATRIX_COL_PINS { F7, B1, B3, B2, B6 }
diff --git a/keyboards/doodboard/duckboard_r2/config.h b/keyboards/doodboard/duckboard_r2/config.h
index 21633b8a76..dae2e08652 100644
--- a/keyboards/doodboard/duckboard_r2/config.h
+++ b/keyboards/doodboard/duckboard_r2/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 5
-
/* key matrix pins */
#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
#define MATRIX_COL_PINS { F7, B1, B3, B2, B6 }
diff --git a/keyboards/doppelganger/config.h b/keyboards/doppelganger/config.h
index 9c1b4dddc7..53cedfc87b 100644
--- a/keyboards/doppelganger/config.h
+++ b/keyboards/doppelganger/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 9
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/doro67/multi/config.h b/keyboards/doro67/multi/config.h
index 4205a8329b..e89198ead0 100644
--- a/keyboards/doro67/multi/config.h
+++ b/keyboards/doro67/multi/config.h
@@ -1,10 +1,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/doro67/regular/config.h b/keyboards/doro67/regular/config.h
index e3b127918a..b91f26f044 100644
--- a/keyboards/doro67/regular/config.h
+++ b/keyboards/doro67/regular/config.h
@@ -1,10 +1,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/doro67/rgb/config.h b/keyboards/doro67/rgb/config.h
index 284761793e..471415402a 100644
--- a/keyboards/doro67/rgb/config.h
+++ b/keyboards/doro67/rgb/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/draculad/config.h b/keyboards/draculad/config.h
index 9263c14bed..049a4cb1e1 100644
--- a/keyboards/draculad/config.h
+++ b/keyboards/draculad/config.h
@@ -18,9 +18,6 @@ along with this program. If not, see .
#pragma once
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 5
-
#define MATRIX_ROW_PINS {D4, C6, D7, E6}
#define MATRIX_COL_PINS {F4, F5,F6, F7, B1}
diff --git a/keyboards/draytronics/daisy/config.h b/keyboards/draytronics/daisy/config.h
index 67ab8af3e1..f941fa5d05 100644
--- a/keyboards/draytronics/daisy/config.h
+++ b/keyboards/draytronics/daisy/config.h
@@ -19,10 +19,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 3
-#define MATRIX_COLS 4
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/draytronics/elise/config.h b/keyboards/draytronics/elise/config.h
index 74987cd682..63619e7148 100644
--- a/keyboards/draytronics/elise/config.h
+++ b/keyboards/draytronics/elise/config.h
@@ -19,10 +19,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/draytronics/elise_v2/config.h b/keyboards/draytronics/elise_v2/config.h
index 0cf66ab226..f352f96b39 100644
--- a/keyboards/draytronics/elise_v2/config.h
+++ b/keyboards/draytronics/elise_v2/config.h
@@ -19,10 +19,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/draytronics/scarlet/config.h b/keyboards/draytronics/scarlet/config.h
index 8cd1e6d635..c10d9fe357 100644
--- a/keyboards/draytronics/scarlet/config.h
+++ b/keyboards/draytronics/scarlet/config.h
@@ -19,10 +19,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 4
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/drewkeys/iskar/config.h b/keyboards/drewkeys/iskar/config.h
index 03ef13f880..a7b3056d98 100644
--- a/keyboards/drewkeys/iskar/config.h
+++ b/keyboards/drewkeys/iskar/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 16
-
// 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
#define MATRIX_ROW_PINS { D6, D7, B4, B5, D4 }
#define MATRIX_COL_PINS { B6, C6, C7, F6, F5, F4, F7, F1, F0, E6, B7, D0, D1, D2, D3, D5 }
diff --git a/keyboards/drhigsby/bkf/config.h b/keyboards/drhigsby/bkf/config.h
index 71935b25e4..6e384d1162 100644
--- a/keyboards/drhigsby/bkf/config.h
+++ b/keyboards/drhigsby/bkf/config.h
@@ -16,10 +16,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/drhigsby/dubba175/config.h b/keyboards/drhigsby/dubba175/config.h
index a09a9ca985..5de87b2fa1 100644
--- a/keyboards/drhigsby/dubba175/config.h
+++ b/keyboards/drhigsby/dubba175/config.h
@@ -16,10 +16,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 10
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/drhigsby/ogurec/config.h b/keyboards/drhigsby/ogurec/config.h
index 27266cba94..b59942ed24 100644
--- a/keyboards/drhigsby/ogurec/config.h
+++ b/keyboards/drhigsby/ogurec/config.h
@@ -16,10 +16,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 3
-#define MATRIX_COLS 12
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/drhigsby/packrat/config.h b/keyboards/drhigsby/packrat/config.h
index ed10421fc6..d063077004 100644
--- a/keyboards/drhigsby/packrat/config.h
+++ b/keyboards/drhigsby/packrat/config.h
@@ -16,10 +16,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 11
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/dtisaac/cg108/config.h b/keyboards/dtisaac/cg108/config.h
index 3e77e09b3b..fb60cba345 100644
--- a/keyboards/dtisaac/cg108/config.h
+++ b/keyboards/dtisaac/cg108/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 11
-#define MATRIX_COLS 11
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/dtisaac/dosa40rgb/config.h b/keyboards/dtisaac/dosa40rgb/config.h
index 563a8544ac..12402c7d3f 100644
--- a/keyboards/dtisaac/dosa40rgb/config.h
+++ b/keyboards/dtisaac/dosa40rgb/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 11
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/dtisaac/dtisaac01/config.h b/keyboards/dtisaac/dtisaac01/config.h
index 2dabfec868..0c5373c175 100644
--- a/keyboards/dtisaac/dtisaac01/config.h
+++ b/keyboards/dtisaac/dtisaac01/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 12
-#define MATRIX_COLS 9
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/ducky/one2mini/1861st/config.h b/keyboards/ducky/one2mini/1861st/config.h
index 09dd0a89e2..a50ce96ac3 100644
--- a/keyboards/ducky/one2mini/1861st/config.h
+++ b/keyboards/ducky/one2mini/1861st/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/ducky/one2sf/1967st/config.h b/keyboards/ducky/one2sf/1967st/config.h
index 4852a94df0..8b29e8c3d4 100644
--- a/keyboards/ducky/one2sf/1967st/config.h
+++ b/keyboards/ducky/one2sf/1967st/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 16
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/dumbo/config.h b/keyboards/dumbo/config.h
index 649afd3695..98466f902b 100644
--- a/keyboards/dumbo/config.h
+++ b/keyboards/dumbo/config.h
@@ -15,11 +15,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-/* Rows are doubled up */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 6
-
// wiring
#define MATRIX_ROW_PINS { D4, D7, E6, B4 }
#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6}
diff --git a/keyboards/dumbpad/v0x/config.h b/keyboards/dumbpad/v0x/config.h
index 8d0076cf02..d302a078d5 100644
--- a/keyboards/dumbpad/v0x/config.h
+++ b/keyboards/dumbpad/v0x/config.h
@@ -18,8 +18,6 @@ along with this program. If not, see .
/* Column/Row IO definitions */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 5
#define MATRIX_ROW_PINS { F4, F5, F6, F7 }
#define MATRIX_COL_PINS { C6, D7, E6, B4, B5 }
diff --git a/keyboards/dumbpad/v0x_dualencoder/config.h b/keyboards/dumbpad/v0x_dualencoder/config.h
index f3259fcbfd..10e50bbb99 100644
--- a/keyboards/dumbpad/v0x_dualencoder/config.h
+++ b/keyboards/dumbpad/v0x_dualencoder/config.h
@@ -18,8 +18,6 @@ along with this program. If not, see .
/* Column/Row IO definitions - dualencoder version is true 4x4 */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 4
#define MATRIX_ROW_PINS { F4, F5, F6, F7 }
#define MATRIX_COL_PINS { D7, E6, B4, B5 }
diff --git a/keyboards/dumbpad/v0x_right/config.h b/keyboards/dumbpad/v0x_right/config.h
index 2b521a3266..5eb5ae961c 100644
--- a/keyboards/dumbpad/v0x_right/config.h
+++ b/keyboards/dumbpad/v0x_right/config.h
@@ -17,8 +17,6 @@ along with this program. If not, see .
#pragma once
/* Column/Row IO definitions */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 5
#define MATRIX_ROW_PINS { F4, F5, F6, F7 }
#define MATRIX_COL_PINS { B5, B4, E6, D7, C6 }
diff --git a/keyboards/dumbpad/v1x/config.h b/keyboards/dumbpad/v1x/config.h
index 6fcb41cff3..421d1f7a1d 100644
--- a/keyboards/dumbpad/v1x/config.h
+++ b/keyboards/dumbpad/v1x/config.h
@@ -18,8 +18,6 @@ along with this program. If not, see .
/* Column/Row IO definitions */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 5
#define MATRIX_ROW_PINS { F4, F5, F6, F7 }
#define MATRIX_COL_PINS { C6, D7, E6, B4, B5 }
diff --git a/keyboards/dumbpad/v1x_dualencoder/config.h b/keyboards/dumbpad/v1x_dualencoder/config.h
index 4ee185ec8d..9a7be81260 100644
--- a/keyboards/dumbpad/v1x_dualencoder/config.h
+++ b/keyboards/dumbpad/v1x_dualencoder/config.h
@@ -18,8 +18,6 @@ along with this program. If not, see .
/* Column/Row IO definitions */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 5
#define MATRIX_ROW_PINS { F4, F5, F6, F7 }
#define MATRIX_COL_PINS { C6, D7, E6, B4, B5 }
diff --git a/keyboards/dumbpad/v1x_oled/config.h b/keyboards/dumbpad/v1x_oled/config.h
index 76c3c7fc98..4300694b82 100644
--- a/keyboards/dumbpad/v1x_oled/config.h
+++ b/keyboards/dumbpad/v1x_oled/config.h
@@ -15,9 +15,6 @@ along with this program. If not, see .
/* Column/Row IO definitions */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 5
-
#define MATRIX_ROW_PINS { F4, F5, F6, F7 }
#define MATRIX_COL_PINS { C6, B1, B3, B2, B6 }
diff --git a/keyboards/dumbpad/v1x_right/config.h b/keyboards/dumbpad/v1x_right/config.h
index 391d8a8e53..9f6a109f84 100644
--- a/keyboards/dumbpad/v1x_right/config.h
+++ b/keyboards/dumbpad/v1x_right/config.h
@@ -18,8 +18,6 @@ along with this program. If not, see .
/* Column/Row IO definitions */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 5
#define MATRIX_ROW_PINS { F4, F5, F6, F7 }
#define MATRIX_COL_PINS { B5, B4, E6, D7, C6 }
diff --git a/keyboards/dumbpad/v3x/config.h b/keyboards/dumbpad/v3x/config.h
index de058775b6..a989bf9baf 100644
--- a/keyboards/dumbpad/v3x/config.h
+++ b/keyboards/dumbpad/v3x/config.h
@@ -17,8 +17,6 @@ along with this program. If not, see .
#pragma once
/* Column/Row IO definitions */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 5
#define MATRIX_ROW_PINS { F4, F5, F6, F7 }
#define MATRIX_COL_PINS { C6, D7, E6, B4, B5 }
diff --git a/keyboards/durgod/dgk6x/galaxy/config.h b/keyboards/durgod/dgk6x/galaxy/config.h
index a55bc2c6f8..9c2d38d6d9 100644
--- a/keyboards/durgod/dgk6x/galaxy/config.h
+++ b/keyboards/durgod/dgk6x/galaxy/config.h
@@ -18,11 +18,9 @@
/* key matrix rows */
-#define MATRIX_ROWS 6
#define MATRIX_ROW_PINS { A0, A1, A2, A3, A4, A5 }
/* key matrix columns */
-#define MATRIX_COLS 16
#define MATRIX_COL_PINS { B0, B1, B2, B10, B11, B12, B13, B14, B15, C6, C7, C8, C9, C10, C11, C12 }
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/durgod/dgk6x/hades/config.h b/keyboards/durgod/dgk6x/hades/config.h
index 1409946eca..ff390f5b2e 100644
--- a/keyboards/durgod/dgk6x/hades/config.h
+++ b/keyboards/durgod/dgk6x/hades/config.h
@@ -18,11 +18,9 @@
/* key matrix rows */
-#define MATRIX_ROWS 5
#define MATRIX_ROW_PINS { A0, A1, A2, A3, A4 }
/* key matrix columns */
-#define MATRIX_COLS 15
#define MATRIX_COL_PINS { B0, B1, B2, B10, B11, B12, B13, B14, B15, C6, C7, C8, C9, C10, C11 }
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/durgod/dgk6x/venus/config.h b/keyboards/durgod/dgk6x/venus/config.h
index 0af168fc0c..bb3c168f81 100644
--- a/keyboards/durgod/dgk6x/venus/config.h
+++ b/keyboards/durgod/dgk6x/venus/config.h
@@ -18,11 +18,9 @@
/* key matrix rows */
-#define MATRIX_ROWS 5
#define MATRIX_ROW_PINS { A0, A1, A2, A3, A4 }
/* key matrix columns */
-#define MATRIX_COLS 14
#define MATRIX_COL_PINS { B0, B1, B2, B10, B11, B12, B13, B14, B15, C6, C7, C8, C9, C10 }
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/durgod/k310/base/config.h b/keyboards/durgod/k310/base/config.h
index f2e84528f0..20885ecb29 100644
--- a/keyboards/durgod/k310/base/config.h
+++ b/keyboards/durgod/k310/base/config.h
@@ -20,10 +20,6 @@
#define WAIT_US_TIMER GPTD3
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 16
-
#define MATRIX_ROW_PINS { A0, A1, A2, A3, A4, A5, A6, A7 }
#define MATRIX_COL_PINS { C4, C5, B0, B1, B2, B10, B11, B12, B13, B14, B15, C6, C7, C10, C11, C12 }
diff --git a/keyboards/durgod/k320/base/config.h b/keyboards/durgod/k320/base/config.h
index bd9d34765f..3616ab53af 100644
--- a/keyboards/durgod/k320/base/config.h
+++ b/keyboards/durgod/k320/base/config.h
@@ -20,10 +20,6 @@
#define WAIT_US_TIMER GPTD3
-/* key matrix size */
-#define MATRIX_ROWS 7
-#define MATRIX_COLS 16
-
#define MATRIX_ROW_PINS { A0, A1, A2, A3, A4, A5, A6 }
#define MATRIX_COL_PINS { C4, C5, B0, B1, B2, B10, B11, B12, B13, B14, B15, C6, C7, C10, C11, C12 }
diff --git a/keyboards/dyz/dyz40/config.h b/keyboards/dyz/dyz40/config.h
index e01957755a..4a907fc8ec 100644
--- a/keyboards/dyz/dyz40/config.h
+++ b/keyboards/dyz/dyz40/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see .
#pragma once
-
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 13
-
#define TAP_CODE_DELAY 10 // Need this delay for some keys like VOLD/VOLU to work
#define ENCODERS_PAD_A { D1 }
#define ENCODERS_PAD_B { D0 }
diff --git a/keyboards/dz60/config.h b/keyboards/dz60/config.h
index a0e8c06306..06fea4a957 100644
--- a/keyboards/dz60/config.h
+++ b/keyboards/dz60/config.h
@@ -1,10 +1,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/dztech/bocc/config.h b/keyboards/dztech/bocc/config.h
index c282d0d65d..1f6a6d295c 100644
--- a/keyboards/dztech/bocc/config.h
+++ b/keyboards/dztech/bocc/config.h
@@ -16,10 +16,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 17
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/dztech/duo_s/config.h b/keyboards/dztech/duo_s/config.h
index 8bd5849acc..e74f584c91 100644
--- a/keyboards/dztech/duo_s/config.h
+++ b/keyboards/dztech/duo_s/config.h
@@ -17,9 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
#define MATRIX_ROW_PINS { A15, B3, B4, B5, B11 }
#define MATRIX_COL_PINS { B12, B13, B14, A8, B9, C13, C14, C15, A1, A2, A3, A4, A5, A6, A7 }
/* COL2ROW, ROW2COL*/
diff --git a/keyboards/dztech/dz60rgb/v1/config.h b/keyboards/dztech/dz60rgb/v1/config.h
index b7dc312ef5..dded682184 100644
--- a/keyboards/dztech/dz60rgb/v1/config.h
+++ b/keyboards/dztech/dz60rgb/v1/config.h
@@ -1,9 +1,5 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/dztech/dz60rgb/v2/config.h b/keyboards/dztech/dz60rgb/v2/config.h
index cbcdb440ef..9cba4b023c 100644
--- a/keyboards/dztech/dz60rgb/v2/config.h
+++ b/keyboards/dztech/dz60rgb/v2/config.h
@@ -1,9 +1,5 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/dztech/dz60rgb/v2_1/config.h b/keyboards/dztech/dz60rgb/v2_1/config.h
index 1b1721cfee..1f3dc86b62 100644
--- a/keyboards/dztech/dz60rgb/v2_1/config.h
+++ b/keyboards/dztech/dz60rgb/v2_1/config.h
@@ -16,10 +16,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/dztech/dz60rgb_ansi/v1/config.h b/keyboards/dztech/dz60rgb_ansi/v1/config.h
index 7b2d469126..2f7c1cad19 100644
--- a/keyboards/dztech/dz60rgb_ansi/v1/config.h
+++ b/keyboards/dztech/dz60rgb_ansi/v1/config.h
@@ -1,9 +1,5 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/dztech/dz60rgb_ansi/v2/config.h b/keyboards/dztech/dz60rgb_ansi/v2/config.h
index 8e593e8fe2..5b08f5994c 100644
--- a/keyboards/dztech/dz60rgb_ansi/v2/config.h
+++ b/keyboards/dztech/dz60rgb_ansi/v2/config.h
@@ -1,9 +1,5 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/dztech/dz60rgb_ansi/v2_1/config.h b/keyboards/dztech/dz60rgb_ansi/v2_1/config.h
index 9360a6cbcf..8d4766eb81 100644
--- a/keyboards/dztech/dz60rgb_ansi/v2_1/config.h
+++ b/keyboards/dztech/dz60rgb_ansi/v2_1/config.h
@@ -16,10 +16,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/dztech/dz60rgb_wkl/v1/config.h b/keyboards/dztech/dz60rgb_wkl/v1/config.h
index b300805378..0381423ee7 100644
--- a/keyboards/dztech/dz60rgb_wkl/v1/config.h
+++ b/keyboards/dztech/dz60rgb_wkl/v1/config.h
@@ -1,9 +1,5 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/dztech/dz60rgb_wkl/v2/config.h b/keyboards/dztech/dz60rgb_wkl/v2/config.h
index c1193290f7..e5f3d86e23 100644
--- a/keyboards/dztech/dz60rgb_wkl/v2/config.h
+++ b/keyboards/dztech/dz60rgb_wkl/v2/config.h
@@ -1,9 +1,5 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/dztech/dz60rgb_wkl/v2_1/config.h b/keyboards/dztech/dz60rgb_wkl/v2_1/config.h
index 0aebfe62cd..bbc52f701a 100644
--- a/keyboards/dztech/dz60rgb_wkl/v2_1/config.h
+++ b/keyboards/dztech/dz60rgb_wkl/v2_1/config.h
@@ -16,10 +16,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/dztech/dz64rgb/config.h b/keyboards/dztech/dz64rgb/config.h
index fd9d13b436..c212f41c91 100644
--- a/keyboards/dztech/dz64rgb/config.h
+++ b/keyboards/dztech/dz64rgb/config.h
@@ -16,8 +16,6 @@
#pragma once
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
#define MATRIX_ROW_PINS { F5, F4, F1, B3, B2 }
#define MATRIX_COL_PINS { C7, F7, F6, F0, B0, B1, B4, D7, D6, D4, D5, D3, D2, B7 }
diff --git a/keyboards/dztech/dz65rgb/v1/config.h b/keyboards/dztech/dz65rgb/v1/config.h
index eec189fef2..005b8096ea 100644
--- a/keyboards/dztech/dz65rgb/v1/config.h
+++ b/keyboards/dztech/dz65rgb/v1/config.h
@@ -15,10 +15,6 @@
*/
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/dztech/dz65rgb/v2/config.h b/keyboards/dztech/dz65rgb/v2/config.h
index 81b81548c5..dd993ae7a9 100644
--- a/keyboards/dztech/dz65rgb/v2/config.h
+++ b/keyboards/dztech/dz65rgb/v2/config.h
@@ -15,10 +15,6 @@
*/
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/dztech/dz65rgb/v3/config.h b/keyboards/dztech/dz65rgb/v3/config.h
index f62aeab98a..69a6f5c50f 100755
--- a/keyboards/dztech/dz65rgb/v3/config.h
+++ b/keyboards/dztech/dz65rgb/v3/config.h
@@ -17,9 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
#define MATRIX_ROW_PINS { F0, F1, F4, E6, C6 }
#define MATRIX_COL_PINS { F7, F6, F5, C7, B0, B1, B2, B3, B4, D7, D6, D4, D5, D3, D2}
diff --git a/keyboards/dztech/dz96/config.h b/keyboards/dztech/dz96/config.h
index 308452213b..55b8d12b08 100644
--- a/keyboards/dztech/dz96/config.h
+++ b/keyboards/dztech/dz96/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 13
-
/* key matrix pins */
#define MATRIX_ROW_PINS { B7, B3, E6, F0, D5, D4, D6, C7 }
#define MATRIX_COL_PINS { C6, F1, F4, F5, F6, F7, D7, B4, B5, D0, D1, D2, D3}
diff --git a/keyboards/dztech/endless80/config.h b/keyboards/dztech/endless80/config.h
index 0f523067d5..c07c913bb9 100644
--- a/keyboards/dztech/endless80/config.h
+++ b/keyboards/dztech/endless80/config.h
@@ -15,8 +15,6 @@
*/
#pragma once
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 15
#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7, B5 }
#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, C6, C7, F5, F4, F1, F0 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/e88/config.h b/keyboards/e88/config.h
index fcfa931696..832ac7b1d4 100644
--- a/keyboards/e88/config.h
+++ b/keyboards/e88/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 17
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/ealdin/quadrant/config.h b/keyboards/ealdin/quadrant/config.h
index 777d66c762..e4f37ae1c9 100644
--- a/keyboards/ealdin/quadrant/config.h
+++ b/keyboards/ealdin/quadrant/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
#define MATRIX_ROW_PINS { B2, F7, B3, B6, B1 }
#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5, B7, F6, F5, F4 }
diff --git a/keyboards/earth_rover/config.h b/keyboards/earth_rover/config.h
index 2df8be0572..7c5a907467 100644
--- a/keyboards/earth_rover/config.h
+++ b/keyboards/earth_rover/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 4
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/eason/capsule65/config.h b/keyboards/eason/capsule65/config.h
index 9b922afabb..176ccc1689 100644
--- a/keyboards/eason/capsule65/config.h
+++ b/keyboards/eason/capsule65/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 16
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/ebastler/isometria_75/rev1/config.h b/keyboards/ebastler/isometria_75/rev1/config.h
index 6b437075c3..511e233986 100644
--- a/keyboards/ebastler/isometria_75/rev1/config.h
+++ b/keyboards/ebastler/isometria_75/rev1/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 16
-
#define MATRIX_ROW_PINS { A15, B4, B5, B6, B7, B8}
#define MATRIX_COL_PINS { B12, B13, B14, B15, A8, A10, A13, A14, B9, C13, F0, F1, A0, B2, B10, B11 }
diff --git a/keyboards/eco/config.h b/keyboards/eco/config.h
index 27d8b97735..95c6a44399 100644
--- a/keyboards/eco/config.h
+++ b/keyboards/eco/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 14
-
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/edc40/config.h b/keyboards/edc40/config.h
index 97e1ea395f..01faa55149 100644
--- a/keyboards/edc40/config.h
+++ b/keyboards/edc40/config.h
@@ -16,9 +16,6 @@
#pragma once
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 11
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/edda/config.h b/keyboards/edda/config.h
index a72d231c78..3e71d942d3 100644
--- a/keyboards/edda/config.h
+++ b/keyboards/edda/config.h
@@ -14,10 +14,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 16
-
// ROWS: Top to bottom, COLS: Left to right
#define MATRIX_ROW_PINS {F1, F0, E6, B5, B4}
diff --git a/keyboards/edi/hardlight/mk1/config.h b/keyboards/edi/hardlight/mk1/config.h
index 90a2cbbe37..5d074c2e4a 100644
--- a/keyboards/edi/hardlight/mk1/config.h
+++ b/keyboards/edi/hardlight/mk1/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 8
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/edi/hardlight/mk2/config.h b/keyboards/edi/hardlight/mk2/config.h
index 4d105b4a8f..c140a7bad5 100644
--- a/keyboards/edi/hardlight/mk2/config.h
+++ b/keyboards/edi/hardlight/mk2/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 8
-
#define MATRIX_COL_PINS { B2, B6, B5, F1, F0, C15, C14, C13 }
#define MATRIX_ROW_PINS { B10, B11, A14, A15, A3, A0, A2, A1 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/edi/standaside/config.h b/keyboards/edi/standaside/config.h
index eb7422959b..df40d532f8 100644
--- a/keyboards/edi/standaside/config.h
+++ b/keyboards/edi/standaside/config.h
@@ -3,10 +3,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 8
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/eek/config.h b/keyboards/eek/config.h
index ae42e5c447..b335e5c98c 100644
--- a/keyboards/eek/config.h
+++ b/keyboards/eek/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 10
-
#define MATRIX_ROW_PINS { D7, E6, B4, B5 }
#define MATRIX_COL_PINS { D4, C6, B6, B2, B3, B1, F7, F6, F5, F4 }
diff --git a/keyboards/efreet/config.h b/keyboards/efreet/config.h
index 98aa5fb507..6bd7f05aa7 100644
--- a/keyboards/efreet/config.h
+++ b/keyboards/efreet/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 6
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/ein_60/config.h b/keyboards/ein_60/config.h
index 9f52116753..3297437ae8 100644
--- a/keyboards/ein_60/config.h
+++ b/keyboards/ein_60/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 13
-
#define MATRIX_ROW_PINS { F1, F2, F3, F4 }
#define MATRIX_COL_PINS { A3, A2, A1, A0, F6, F5, F0, E0, E1, C0, C1, C2, C3 }
diff --git a/keyboards/ekow/akira/config.h b/keyboards/ekow/akira/config.h
index be45be860c..9deabfe903 100644
--- a/keyboards/ekow/akira/config.h
+++ b/keyboards/ekow/akira/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-// key matrix size
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
// M60-A PCB default pin-out
#define MATRIX_ROW_PINS \
{ B0, B1, B2, B10, B11 }
diff --git a/keyboards/elephant42/config.h b/keyboards/elephant42/config.h
index 416a895d84..158669a9f2 100644
--- a/keyboards/elephant42/config.h
+++ b/keyboards/elephant42/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 6
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/emajesty/eiri/config.h b/keyboards/emajesty/eiri/config.h
index efde8be315..c9bb6206d3 100644
--- a/keyboards/emajesty/eiri/config.h
+++ b/keyboards/emajesty/eiri/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/emery65/config.h b/keyboards/emery65/config.h
index ae0953a2e0..af627558fe 100644
--- a/keyboards/emery65/config.h
+++ b/keyboards/emery65/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
#define MATRIX_ROW_PINS { A2, B9, B8, B5, B4 }
#define MATRIX_COL_PINS { A1, B1, B0, A7, A6, A5, A4, A3, B2, B10, B11, B12, B13, B14, B15 }
diff --git a/keyboards/emi20/config.h b/keyboards/emi20/config.h
index 3aeb3d2d0b..43ff0adf16 100644
--- a/keyboards/emi20/config.h
+++ b/keyboards/emi20/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 4
-
/* key matrix pins */
#define MATRIX_ROW_PINS { F4, F5, F6, F7, B6 }
#define MATRIX_COL_PINS { C7, C6, B5, B4 }
diff --git a/keyboards/emptystring/nqg/config.h b/keyboards/emptystring/nqg/config.h
index c37877f799..c5462f8acb 100644
--- a/keyboards/emptystring/nqg/config.h
+++ b/keyboards/emptystring/nqg/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 10
-
/* key matrix pins */
#define MATRIX_ROW_PINS {B6, B2, B3, B1}
#define MATRIX_COL_PINS {F7, F6, B5, B4, E6, D7, C6, D4, D0, D1}
diff --git a/keyboards/eniigmakeyboards/ek60/config.h b/keyboards/eniigmakeyboards/ek60/config.h
index dd113d376a..680933e762 100644
--- a/keyboards/eniigmakeyboards/ek60/config.h
+++ b/keyboards/eniigmakeyboards/ek60/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/* Keyboard Matrix Assignments */
#define MATRIX_ROW_PINS { B2, B1, B0, F0, B4 }
#define MATRIX_COL_PINS { F7, C6, F6, B6, F5, F4, B5, F1, E6, D0, D7, D5, D1, D3, D2 }
diff --git a/keyboards/eniigmakeyboards/ek65/config.h b/keyboards/eniigmakeyboards/ek65/config.h
index 032cd98e7a..3e5c41c95a 100644
--- a/keyboards/eniigmakeyboards/ek65/config.h
+++ b/keyboards/eniigmakeyboards/ek65/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 16
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/eniigmakeyboards/ek87/config.h b/keyboards/eniigmakeyboards/ek87/config.h
index b02ea4f66f..fb7d88fee0 100644
--- a/keyboards/eniigmakeyboards/ek87/config.h
+++ b/keyboards/eniigmakeyboards/ek87/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 18
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/ep/40/config.h b/keyboards/ep/40/config.h
index 3240274d26..df885b6f25 100644
--- a/keyboards/ep/40/config.h
+++ b/keyboards/ep/40/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/ep/96/config.h b/keyboards/ep/96/config.h
index 7b63d2af43..df76a35880 100644
--- a/keyboards/ep/96/config.h
+++ b/keyboards/ep/96/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 19
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/ep/comsn/hs68/config.h b/keyboards/ep/comsn/hs68/config.h
index b8e2ea8660..736fbe5370 100644
--- a/keyboards/ep/comsn/hs68/config.h
+++ b/keyboards/ep/comsn/hs68/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/ep/comsn/mollydooker/config.h b/keyboards/ep/comsn/mollydooker/config.h
index 1fe6b875cf..573ba5d32a 100644
--- a/keyboards/ep/comsn/mollydooker/config.h
+++ b/keyboards/ep/comsn/mollydooker/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 19
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/ep/comsn/tf_longeboye/config.h b/keyboards/ep/comsn/tf_longeboye/config.h
index 8dcc87d68c..655715c361 100644
--- a/keyboards/ep/comsn/tf_longeboye/config.h
+++ b/keyboards/ep/comsn/tf_longeboye/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 18
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/epoch80/config.h b/keyboards/epoch80/config.h
index 497bcae547..686130babb 100644
--- a/keyboards/epoch80/config.h
+++ b/keyboards/epoch80/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 17
-
/* Keyboard Matrix Assignments */
#define MATRIX_ROW_PINS { D1, D0, B3, B0, B2, B1 }
#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D4, D6, D2, D3, D5 }
diff --git a/keyboards/ergoslab/rev1/config.h b/keyboards/ergoslab/rev1/config.h
index ce990544b3..e9819d7a5d 100644
--- a/keyboards/ergoslab/rev1/config.h
+++ b/keyboards/ergoslab/rev1/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 6
-
// wiring of each half
#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
diff --git a/keyboards/ergotravel/rev1/config.h b/keyboards/ergotravel/rev1/config.h
index eb67dd1a8f..b77de24f9d 100644
--- a/keyboards/ergotravel/rev1/config.h
+++ b/keyboards/ergotravel/rev1/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 7
-
// wiring of each half
#define MATRIX_ROW_PINS { C6, D7, E6, B4 }
#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
diff --git a/keyboards/ericrlau/numdiscipline/rev1/config.h b/keyboards/ericrlau/numdiscipline/rev1/config.h
index 60d50c2e61..43ed9e6454 100644
--- a/keyboards/ericrlau/numdiscipline/rev1/config.h
+++ b/keyboards/ericrlau/numdiscipline/rev1/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 18
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/esca/getawayvan/config.h b/keyboards/esca/getawayvan/config.h
index f6edda85c6..5172cfab26 100644
--- a/keyboards/esca/getawayvan/config.h
+++ b/keyboards/esca/getawayvan/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A4, A13, A10, C13, C14 }
#define MATRIX_ROW_PINS { A9, A8, A3, A5 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/esca/getawayvan_f042/config.h b/keyboards/esca/getawayvan_f042/config.h
index f6edda85c6..5172cfab26 100644
--- a/keyboards/esca/getawayvan_f042/config.h
+++ b/keyboards/esca/getawayvan_f042/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A4, A13, A10, C13, C14 }
#define MATRIX_ROW_PINS { A9, A8, A3, A5 }
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/eternal_keypad/config.h b/keyboards/eternal_keypad/config.h
index a6a34abdfc..069eb056bf 100644
--- a/keyboards/eternal_keypad/config.h
+++ b/keyboards/eternal_keypad/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 8
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/eu_isolation/config.h b/keyboards/eu_isolation/config.h
index 8dfea67f43..d9a71facd8 100644
--- a/keyboards/eu_isolation/config.h
+++ b/keyboards/eu_isolation/config.h
@@ -15,10 +15,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 14
-
/* NIU Mini PCB default pin-out */
#define MATRIX_ROW_PINS { D2, D3, F1, F0 }
#define MATRIX_COL_PINS { D0, D1, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4}
diff --git a/keyboards/evancookaudio/sleepingdinosaur/config.h b/keyboards/evancookaudio/sleepingdinosaur/config.h
index f996d11d45..4f5e2d0ae8 100644
--- a/keyboards/evancookaudio/sleepingdinosaur/config.h
+++ b/keyboards/evancookaudio/sleepingdinosaur/config.h
@@ -20,10 +20,6 @@
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 6
-
/* key matrix pins */
#define MATRIX_ROW_PINS {D1, D0, D4, C6, D7}
diff --git a/keyboards/evancookaudio/tenpad/config.h b/keyboards/evancookaudio/tenpad/config.h
index 247f79c874..0d65056fb3 100644
--- a/keyboards/evancookaudio/tenpad/config.h
+++ b/keyboards/evancookaudio/tenpad/config.h
@@ -20,10 +20,6 @@
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 5
-
/* key matrix pins */
#define MATRIX_ROW_PINS {D0, D1}
diff --git a/keyboards/eve/meteor/config.h b/keyboards/eve/meteor/config.h
index cf379eef3e..f32cb0efd5 100644
--- a/keyboards/eve/meteor/config.h
+++ b/keyboards/eve/meteor/config.h
@@ -18,9 +18,6 @@ along with this program. If not, see .
#pragma once
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 15
-
// 0 1 2 3 4 5 6 7 8 9 A B C D E
#define MATRIX_ROW_PINS { B5, B0, B1, B2, B3, B4 }
#define MATRIX_COL_PINS { C2, C3, C4, C5, C6, C7, A7, A6, A5, A4, A3, A2, A1, A0, D7}
diff --git a/keyboards/evil80/config.h b/keyboards/evil80/config.h
index 62145482a4..34091bd08e 100644
--- a/keyboards/evil80/config.h
+++ b/keyboards/evil80/config.h
@@ -1,10 +1,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 16
-
/* Planck PCB default pin-out */
#define MATRIX_ROW_PINS { F1, F4, F5, F0, B3, B0 }
#define MATRIX_COL_PINS { B2, D0, D1, D2, D3, D5, D4, D6, D7, B4, B1, C6, C7, E6, F6, F7 }
diff --git a/keyboards/evolv/config.h b/keyboards/evolv/config.h
index 51d43a8e29..2a7804e1a1 100644
--- a/keyboards/evolv/config.h
+++ b/keyboards/evolv/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 16
-
#define MATRIX_COL_PINS { A6, A5, A4, A3, A2, A1, A0, C14, F0, C15, B9, B8, B7, B6, B5, B4}
#define MATRIX_ROW_PINS { B10, B11, A7, B0, B1, B2}
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/evyd13/atom47/rev2/config.h b/keyboards/evyd13/atom47/rev2/config.h
index 2f09e7d1d0..8ee6bc985c 100644
--- a/keyboards/evyd13/atom47/rev2/config.h
+++ b/keyboards/evyd13/atom47/rev2/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 13
-
// ROWS: Top to bottom, COLS: Left to right
#define MATRIX_ROW_PINS {B1,B2,B3,B7}
diff --git a/keyboards/evyd13/atom47/rev3/config.h b/keyboards/evyd13/atom47/rev3/config.h
index 69814659e6..3acdb6280b 100644
--- a/keyboards/evyd13/atom47/rev3/config.h
+++ b/keyboards/evyd13/atom47/rev3/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 13
-
// ROWS: Top to bottom, COLS: Left to right
#define MATRIX_ROW_PINS {B3,B2,B1,B0}
diff --git a/keyboards/evyd13/atom47/rev4/config.h b/keyboards/evyd13/atom47/rev4/config.h
index de068ee8c4..3caf43adb7 100644
--- a/keyboards/evyd13/atom47/rev4/config.h
+++ b/keyboards/evyd13/atom47/rev4/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 13
-
// ROWS: Top to bottom, COLS: Left to right
#define MATRIX_ROW_PINS {D0,C2,C5,C6}
diff --git a/keyboards/evyd13/atom47/rev5/config.h b/keyboards/evyd13/atom47/rev5/config.h
index e965023763..e79d7e8a87 100644
--- a/keyboards/evyd13/atom47/rev5/config.h
+++ b/keyboards/evyd13/atom47/rev5/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 13
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/evyd13/eon40/config.h b/keyboards/evyd13/eon40/config.h
index e990c53fd1..8baf97b88f 100644
--- a/keyboards/evyd13/eon40/config.h
+++ b/keyboards/evyd13/eon40/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/evyd13/eon65/config.h b/keyboards/evyd13/eon65/config.h
index 844b00b5eb..2660c3ddf2 100644
--- a/keyboards/evyd13/eon65/config.h
+++ b/keyboards/evyd13/eon65/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 16
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/evyd13/eon75/config.h b/keyboards/evyd13/eon75/config.h
index 49533c41f2..e820ff9ab9 100644
--- a/keyboards/evyd13/eon75/config.h
+++ b/keyboards/evyd13/eon75/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 12
-#define MATRIX_COLS 8
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/evyd13/eon87/config.h b/keyboards/evyd13/eon87/config.h
index 41185940a8..0007e510c5 100644
--- a/keyboards/evyd13/eon87/config.h
+++ b/keyboards/evyd13/eon87/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 17
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/evyd13/eon95/config.h b/keyboards/evyd13/eon95/config.h
index f7faefe9a5..70d07b9855 100644
--- a/keyboards/evyd13/eon95/config.h
+++ b/keyboards/evyd13/eon95/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 12
-#define MATRIX_COLS 10
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/evyd13/gh80_1800/config.h b/keyboards/evyd13/gh80_1800/config.h
index 8664c63af0..f60d43a498 100644
--- a/keyboards/evyd13/gh80_1800/config.h
+++ b/keyboards/evyd13/gh80_1800/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 11
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/evyd13/gh80_3700/config.h b/keyboards/evyd13/gh80_3700/config.h
index da9857f448..7e3a59e631 100644
--- a/keyboards/evyd13/gh80_3700/config.h
+++ b/keyboards/evyd13/gh80_3700/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 4
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/evyd13/gud70/config.h b/keyboards/evyd13/gud70/config.h
index 6db718c7d8..8482880611 100644
--- a/keyboards/evyd13/gud70/config.h
+++ b/keyboards/evyd13/gud70/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 16
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/evyd13/minitomic/config.h b/keyboards/evyd13/minitomic/config.h
index b0374d6a5f..d96d4574e0 100644
--- a/keyboards/evyd13/minitomic/config.h
+++ b/keyboards/evyd13/minitomic/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 13
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/evyd13/mx5160/config.h b/keyboards/evyd13/mx5160/config.h
index 3686b1fd60..45e5500bfa 100644
--- a/keyboards/evyd13/mx5160/config.h
+++ b/keyboards/evyd13/mx5160/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 10
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/evyd13/nt660/config.h b/keyboards/evyd13/nt660/config.h
index 1dd6c943b2..f0b3c5653f 100644
--- a/keyboards/evyd13/nt660/config.h
+++ b/keyboards/evyd13/nt660/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/evyd13/nt750/config.h b/keyboards/evyd13/nt750/config.h
index 904902c2f4..ee44ae05ef 100644
--- a/keyboards/evyd13/nt750/config.h
+++ b/keyboards/evyd13/nt750/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 17
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/evyd13/nt980/config.h b/keyboards/evyd13/nt980/config.h
index 8d06edcc23..01bce84e50 100644
--- a/keyboards/evyd13/nt980/config.h
+++ b/keyboards/evyd13/nt980/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 12
-#define MATRIX_COLS 9
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/evyd13/omrontkl/config.h b/keyboards/evyd13/omrontkl/config.h
index e632fd75cc..9246127a30 100644
--- a/keyboards/evyd13/omrontkl/config.h
+++ b/keyboards/evyd13/omrontkl/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 17
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/evyd13/plain60/config.h b/keyboards/evyd13/plain60/config.h
index 0c0ed58caf..a952eb50ab 100644
--- a/keyboards/evyd13/plain60/config.h
+++ b/keyboards/evyd13/plain60/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
// ROWS: Top to bottom, COLS: Left to right
#define MATRIX_ROW_PINS {B4,D7,D6,D4,E6}
diff --git a/keyboards/evyd13/pockettype/config.h b/keyboards/evyd13/pockettype/config.h
index 27c8bf330c..cda625870f 100644
--- a/keyboards/evyd13/pockettype/config.h
+++ b/keyboards/evyd13/pockettype/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/evyd13/quackfire/config.h b/keyboards/evyd13/quackfire/config.h
index 13cd48fc5d..8ab3d62a1e 100644
--- a/keyboards/evyd13/quackfire/config.h
+++ b/keyboards/evyd13/quackfire/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 15
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/evyd13/solheim68/config.h b/keyboards/evyd13/solheim68/config.h
index e1073cb675..29398263f8 100644
--- a/keyboards/evyd13/solheim68/config.h
+++ b/keyboards/evyd13/solheim68/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 16
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/evyd13/ta65/config.h b/keyboards/evyd13/ta65/config.h
index 507aa2b65e..12717bcde4 100644
--- a/keyboards/evyd13/ta65/config.h
+++ b/keyboards/evyd13/ta65/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 16
-
// ROWS: Top to bottom, COLS: Left to right
#define MATRIX_ROW_PINS {B4,D7,D6,D4,B3}
diff --git a/keyboards/evyd13/wonderland/config.h b/keyboards/evyd13/wonderland/config.h
index 972a0e2e5f..56a907817e 100644
--- a/keyboards/evyd13/wonderland/config.h
+++ b/keyboards/evyd13/wonderland/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
// ROWS: Top to bottom, COLS: Left to right
#define MATRIX_ROW_PINS {B0,D1,D2,D3,D5}
diff --git a/keyboards/exclusive/e65/config.h b/keyboards/exclusive/e65/config.h
index 30c350f610..7ef569f8c2 100644
--- a/keyboards/exclusive/e65/config.h
+++ b/keyboards/exclusive/e65/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 16
-
/* key matrix pins */
#define MATRIX_ROW_PINS \
{ B0, B1, B2, B3, B4 }
diff --git a/keyboards/exclusive/e6_rgb/config.h b/keyboards/exclusive/e6_rgb/config.h
index 8e92250d81..bf8b3b483a 100644
--- a/keyboards/exclusive/e6_rgb/config.h
+++ b/keyboards/exclusive/e6_rgb/config.h
@@ -5,9 +5,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
/* key matrix pins */
#define MATRIX_ROW_PINS { F1, F4, F5, F6, D6 }
#define MATRIX_COL_PINS { D7, B4, B5, B6, C6, C7, F7, F0, B0, B1, D2, D3, B3, B2 }
diff --git a/keyboards/exclusive/e6v2/le/config.h b/keyboards/exclusive/e6v2/le/config.h
index 0e28661dac..771877fbca 100644
--- a/keyboards/exclusive/e6v2/le/config.h
+++ b/keyboards/exclusive/e6v2/le/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/* QMK E6-V2 PCB default pin-out */
#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 }
#define MATRIX_COL_PINS { B5, D0, D1, D2, D3, D4, D5, D6, D7, C6, C7, F4, F5, F6, F7 }
diff --git a/keyboards/exclusive/e6v2/le_bmc/config.h b/keyboards/exclusive/e6v2/le_bmc/config.h
index 8fd78d889e..a24ecfd94a 100644
--- a/keyboards/exclusive/e6v2/le_bmc/config.h
+++ b/keyboards/exclusive/e6v2/le_bmc/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 11
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/exclusive/e6v2/oe/config.h b/keyboards/exclusive/e6v2/oe/config.h
index ec3aa69e8d..0eb97d1c78 100644
--- a/keyboards/exclusive/e6v2/oe/config.h
+++ b/keyboards/exclusive/e6v2/oe/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/* QMK E6-V2 PCB default pin-out */
#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
#define MATRIX_COL_PINS { C7, C6, B5, B4, D7, D6, D4, F6, F7, F5, F4, F1, F0, B0, B1 }
diff --git a/keyboards/exclusive/e6v2/oe_bmc/config.h b/keyboards/exclusive/e6v2/oe_bmc/config.h
index 8fd78d889e..a24ecfd94a 100644
--- a/keyboards/exclusive/e6v2/oe_bmc/config.h
+++ b/keyboards/exclusive/e6v2/oe_bmc/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 11
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/exclusive/e7v1/config.h b/keyboards/exclusive/e7v1/config.h
index 7dcf907a04..ba94a214a3 100644
--- a/keyboards/exclusive/e7v1/config.h
+++ b/keyboards/exclusive/e7v1/config.h
@@ -1,10 +1,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 16
-
/* key matrix pins */
#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5 }
#define MATRIX_COL_PINS { B6, D0, D1, D2, D3, D4, D5, D6, D7, C6, C7, F4, F5, F6, F7, F1 }
diff --git a/keyboards/exclusive/e7v1se/config.h b/keyboards/exclusive/e7v1se/config.h
index 31c27ccdb7..988a71d1c8 100644
--- a/keyboards/exclusive/e7v1se/config.h
+++ b/keyboards/exclusive/e7v1se/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 16
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/exclusive/e85/config.h b/keyboards/exclusive/e85/config.h
index de3a02e176..651b210fd6 100644
--- a/keyboards/exclusive/e85/config.h
+++ b/keyboards/exclusive/e85/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 11
-#define MATRIX_COLS 9
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/exent/config.h b/keyboards/exent/config.h
index 317714e0f7..953bbfff00 100644
--- a/keyboards/exent/config.h
+++ b/keyboards/exent/config.h
@@ -17,10 +17,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 7
-#define MATRIX_COLS 14
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/eyeohdesigns/babyv/config.h b/keyboards/eyeohdesigns/babyv/config.h
index 1781e72afd..25e1e56aeb 100644
--- a/keyboards/eyeohdesigns/babyv/config.h
+++ b/keyboards/eyeohdesigns/babyv/config.h
@@ -18,11 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
-
#define MATRIX_ROW_PINS { B5, D2, D5, D3 }
#define MATRIX_COL_PINS { D0, D1, B4, D7, D6, D4, B0, B1, B2, F0, F1, F4 }
diff --git a/keyboards/eyeohdesigns/sprh/config.h b/keyboards/eyeohdesigns/sprh/config.h
index 46b72f1255..f386c4033c 100644
--- a/keyboards/eyeohdesigns/sprh/config.h
+++ b/keyboards/eyeohdesigns/sprh/config.h
@@ -18,9 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
#define ENCODERS_PAD_A {D0}
#define ENCODERS_PAD_B {D1}
#define ENCODER_RESOLUTION 2
diff --git a/keyboards/eyeohdesigns/theboulevard/config.h b/keyboards/eyeohdesigns/theboulevard/config.h
index 9b8d41f43e..22143042a8 100644
--- a/keyboards/eyeohdesigns/theboulevard/config.h
+++ b/keyboards/eyeohdesigns/theboulevard/config.h
@@ -18,9 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 13
#define ENCODERS_PAD_A {F5}
#define ENCODERS_PAD_B {F4}
#define ENCODER_RESOLUTION 2
diff --git a/keyboards/facew/config.h b/keyboards/facew/config.h
index 72fe48339c..95bf88598d 100644
--- a/keyboards/facew/config.h
+++ b/keyboards/facew/config.h
@@ -20,9 +20,6 @@ along with this program. If not, see .
#define RGBLED_NUM 16
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 11
-
#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 }
#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5 }
diff --git a/keyboards/fallacy/config.h b/keyboards/fallacy/config.h
index 2ae073805d..fd84faa44d 100755
--- a/keyboards/fallacy/config.h
+++ b/keyboards/fallacy/config.h
@@ -16,11 +16,6 @@
#pragma once
-/* key matrix size
- */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/* key matrix pins
*/
#define MATRIX_ROW_PINS { B1, B2, B3, C6, C7 }
diff --git a/keyboards/feels/feels65/config.h b/keyboards/feels/feels65/config.h
index ebb4355e36..c102bf22e2 100644
--- a/keyboards/feels/feels65/config.h
+++ b/keyboards/feels/feels65/config.h
@@ -16,10 +16,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 16
-
/* default pinout */
#define MATRIX_ROW_PINS { D5, D3, D2, D1, D0 }
#define MATRIX_COL_PINS { B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0, E6, B0, B1, B2, B3 }
diff --git a/keyboards/feker/ik75/config.h b/keyboards/feker/ik75/config.h
index 1708d49e78..faddc42ce8 100644
--- a/keyboards/feker/ik75/config.h
+++ b/keyboards/feker/ik75/config.h
@@ -18,10 +18,6 @@
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 16
-
/* key matrix pins */
#define MATRIX_ROW_PINS { F7, F6, F5, F4, F1, F0 }
#define MATRIX_COL_PINS { E6, B0, B1, B2, B3, B7, D2, D3, D5, D4, D6, D7, B4, B5, B6, E2 }
diff --git a/keyboards/ffkeebs/puca/config.h b/keyboards/ffkeebs/puca/config.h
index 12a8ba0eee..81212585a9 100644
--- a/keyboards/ffkeebs/puca/config.h
+++ b/keyboards/ffkeebs/puca/config.h
@@ -18,8 +18,6 @@ along with this program. If not, see .
#pragma once
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 5
// 0 , 1 , 2 , 3 , 4 , 5
#define MATRIX_ROW_PINS { B4, E6, D7, B5, C6, F6}
#define MATRIX_COL_PINS { F7, B1, B3, B2, B6}
diff --git a/keyboards/ffkeebs/siris/config.h b/keyboards/ffkeebs/siris/config.h
index 2f0094d2b1..831bb7a0e6 100644
--- a/keyboards/ffkeebs/siris/config.h
+++ b/keyboards/ffkeebs/siris/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 12
-
// ROWS: Top to bottom, COLS: Left to right
#define MATRIX_ROW_PINS { B5, B4, D7, D6, D4 }
diff --git a/keyboards/fjlabs/7vhotswap/config.h b/keyboards/fjlabs/7vhotswap/config.h
index c8ec29ceb5..d4ec1bd96e 100644
--- a/keyboards/fjlabs/7vhotswap/config.h
+++ b/keyboards/fjlabs/7vhotswap/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 15
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/fjlabs/ad65/config.h b/keyboards/fjlabs/ad65/config.h
index 96974c69a5..d4f1b424d0 100644
--- a/keyboards/fjlabs/ad65/config.h
+++ b/keyboards/fjlabs/ad65/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/fjlabs/avalon/config.h b/keyboards/fjlabs/avalon/config.h
index 8749508112..fe7128047c 100644
--- a/keyboards/fjlabs/avalon/config.h
+++ b/keyboards/fjlabs/avalon/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 16
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/fjlabs/bks65/config.h b/keyboards/fjlabs/bks65/config.h
index 4bed328314..0739e5a634 100644
--- a/keyboards/fjlabs/bks65/config.h
+++ b/keyboards/fjlabs/bks65/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/fjlabs/bks65solder/config.h b/keyboards/fjlabs/bks65solder/config.h
index 4bed328314..0739e5a634 100644
--- a/keyboards/fjlabs/bks65solder/config.h
+++ b/keyboards/fjlabs/bks65solder/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/fjlabs/bolsa65/config.h b/keyboards/fjlabs/bolsa65/config.h
index 8ba0e41742..250162df4a 100644
--- a/keyboards/fjlabs/bolsa65/config.h
+++ b/keyboards/fjlabs/bolsa65/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/fjlabs/kf87/config.h b/keyboards/fjlabs/kf87/config.h
index 469cd59a70..e5b70cc14c 100644
--- a/keyboards/fjlabs/kf87/config.h
+++ b/keyboards/fjlabs/kf87/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 17
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/fjlabs/kyuu/config.h b/keyboards/fjlabs/kyuu/config.h
index 7e0c7eda7b..4c824ca7b6 100644
--- a/keyboards/fjlabs/kyuu/config.h
+++ b/keyboards/fjlabs/kyuu/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/fjlabs/ldk65/config.h b/keyboards/fjlabs/ldk65/config.h
index b1fc54293b..54fd6cf4a5 100644
--- a/keyboards/fjlabs/ldk65/config.h
+++ b/keyboards/fjlabs/ldk65/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/fjlabs/midway60/config.h b/keyboards/fjlabs/midway60/config.h
index 30178481bf..29edca2dd9 100644
--- a/keyboards/fjlabs/midway60/config.h
+++ b/keyboards/fjlabs/midway60/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/fjlabs/mk61rgbansi/config.h b/keyboards/fjlabs/mk61rgbansi/config.h
index f87711cfe8..708ad1d193 100644
--- a/keyboards/fjlabs/mk61rgbansi/config.h
+++ b/keyboards/fjlabs/mk61rgbansi/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/fjlabs/peaker/config.h b/keyboards/fjlabs/peaker/config.h
index 5e8f2bd5e7..420a435746 100644
--- a/keyboards/fjlabs/peaker/config.h
+++ b/keyboards/fjlabs/peaker/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 17
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/fjlabs/polaris/config.h b/keyboards/fjlabs/polaris/config.h
index d135de12f4..ded4e18996 100644
--- a/keyboards/fjlabs/polaris/config.h
+++ b/keyboards/fjlabs/polaris/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/fjlabs/ready100/config.h b/keyboards/fjlabs/ready100/config.h
index 5f68dae1af..6294876072 100644
--- a/keyboards/fjlabs/ready100/config.h
+++ b/keyboards/fjlabs/ready100/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/fjlabs/sinanju/config.h b/keyboards/fjlabs/sinanju/config.h
index f98831f583..56bd139ab3 100644
--- a/keyboards/fjlabs/sinanju/config.h
+++ b/keyboards/fjlabs/sinanju/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/fjlabs/sinanjuwk/config.h b/keyboards/fjlabs/sinanjuwk/config.h
index f98831f583..56bd139ab3 100644
--- a/keyboards/fjlabs/sinanjuwk/config.h
+++ b/keyboards/fjlabs/sinanjuwk/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/fjlabs/solanis/config.h b/keyboards/fjlabs/solanis/config.h
index 6db8b50ab1..6a022cc81c 100644
--- a/keyboards/fjlabs/solanis/config.h
+++ b/keyboards/fjlabs/solanis/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 17
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/fjlabs/swordfish/config.h b/keyboards/fjlabs/swordfish/config.h
index c586bd4dc2..0940cefc5e 100644
--- a/keyboards/fjlabs/swordfish/config.h
+++ b/keyboards/fjlabs/swordfish/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/fjlabs/tf60ansi/config.h b/keyboards/fjlabs/tf60ansi/config.h
index f87711cfe8..708ad1d193 100644
--- a/keyboards/fjlabs/tf60ansi/config.h
+++ b/keyboards/fjlabs/tf60ansi/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/fjlabs/tf60v2/config.h b/keyboards/fjlabs/tf60v2/config.h
index f87711cfe8..708ad1d193 100644
--- a/keyboards/fjlabs/tf60v2/config.h
+++ b/keyboards/fjlabs/tf60v2/config.h
@@ -18,10 +18,6 @@ along with this program. If not, see .
#pragma once
-