From 2da0827d4ffbcba161126d6001f370e97d0172a8 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 17 Feb 2023 16:08:25 +1100
Subject: Remove matrix size defines (#19581)

---
 keyboards/handwired/108key_trackpoint/config.h     |  3 ---
 keyboards/handwired/2x5keypad/config.h             |  4 ----
 keyboards/handwired/3dfoxc/config.h                |  4 ----
 keyboards/handwired/3dp660/config.h                |  4 ----
 keyboards/handwired/412_64/config.h                |  4 ----
 keyboards/handwired/42/config.h                    |  4 ----
 keyboards/handwired/6key/config.h                  |  4 ----
 keyboards/handwired/6macro/config.h                |  4 ----
 keyboards/handwired/aek64/config.h                 |  4 ----
 keyboards/handwired/aim65/config.h                 |  4 ----
 keyboards/handwired/amigopunk/config.h             |  4 ----
 keyboards/handwired/angel/config.h                 |  4 ----
 keyboards/handwired/aplx2/config.h                 |  4 ----
 keyboards/handwired/aranck/config.h                |  4 ----
 keyboards/handwired/arrow_pad/config.h             |  4 ----
 keyboards/handwired/atreus50/config.h              |  4 ----
 keyboards/handwired/axon/config.h                  |  4 ----
 keyboards/handwired/battleship_gamepad/config.h    |  4 ----
 keyboards/handwired/bigmac/config.h                |  4 ----
 keyboards/handwired/bolek/config.h                 |  4 ----
 .../handwired/boss566y/redragon_vara/config.h      |  4 ----
 keyboards/handwired/brain/config.h                 |  5 ----
 keyboards/handwired/bstk100/config.h               |  4 ----
 keyboards/handwired/cans12er/config.h              |  4 ----
 keyboards/handwired/carpolly/config.h              |  4 ----
 keyboards/handwired/chiron/config.h                |  3 ---
 keyboards/handwired/ck4x4/config.h                 |  4 ----
 keyboards/handwired/cmd60/config.h                 |  4 ----
 keyboards/handwired/co60/rev1/config.h             |  4 ----
 keyboards/handwired/co60/rev6/config.h             |  4 ----
 keyboards/handwired/co60/rev7/config.h             |  4 ----
 keyboards/handwired/colorlice/config.h             |  4 ----
 keyboards/handwired/concertina/64key/config.h      |  3 ---
 keyboards/handwired/consolekeyboard/18key/config.h |  4 ----
 keyboards/handwired/consolekeyboard/20key/config.h |  4 ----
 keyboards/handwired/consolekeyboard/27key/config.h |  4 ----
 keyboards/handwired/consolekeyboard/30key/config.h |  4 ----
 keyboards/handwired/croxsplit44/config.h           |  2 --
 keyboards/handwired/curiosity/config.h             |  4 ----
 keyboards/handwired/cyberstar/config.h             |  4 ----
 keyboards/handwired/d48/config.h                   |  4 ----
 keyboards/handwired/dactyl_left/config.h           |  4 ----
 keyboards/handwired/dactyl_manuform/3x5_3/config.h |  5 ----
 keyboards/handwired/dactyl_manuform/4x5/config.h   |  5 ----
 keyboards/handwired/dactyl_manuform/4x5_5/config.h |  3 ---
 keyboards/handwired/dactyl_manuform/4x6/config.h   |  5 ----
 keyboards/handwired/dactyl_manuform/4x6_5/config.h |  5 ----
 keyboards/handwired/dactyl_manuform/5x6/config.h   |  5 ----
 .../handwired/dactyl_manuform/5x6_2_5/config.h     |  4 ----
 keyboards/handwired/dactyl_manuform/5x6_5/config.h |  5 ----
 keyboards/handwired/dactyl_manuform/5x6_6/config.h |  5 ----
 keyboards/handwired/dactyl_manuform/5x7/config.h   |  5 ----
 keyboards/handwired/dactyl_manuform/6x6/config.h   | 27 ----------------------
 keyboards/handwired/dactyl_manuform/6x6_4/config.h |  5 ----
 .../handwired/dactyl_manuform/6x6_kinesis/config.h |  5 ----
 keyboards/handwired/dactyl_manuform/6x7/config.h   |  5 ----
 .../handwired/dactyl_manuform/dmote/62key/config.h |  3 ---
 keyboards/handwired/dactyl_promicro/config.h       |  5 ----
 keyboards/handwired/dactyl_rah/config.h            |  5 ----
 keyboards/handwired/daishi/config.h                |  4 ----
 keyboards/handwired/ddg_56/config.h                |  4 ----
 keyboards/handwired/eagleii/config.h               |  2 --
 keyboards/handwired/elrgo_s/config.h               |  4 ----
 keyboards/handwired/ergocheap/config.h             |  4 ----
 keyboards/handwired/evk/v1_3/config.h              |  4 ----
 keyboards/handwired/fc200rt_qmk/config.h           |  4 ----
 keyboards/handwired/fivethirteen/config.h          |  4 ----
 keyboards/handwired/floorboard/config.h            |  4 ----
 keyboards/handwired/frankie_macropad/config.h      |  4 ----
 keyboards/handwired/freoduo/config.h               |  5 ----
 keyboards/handwired/fruity60/config.h              |  4 ----
 keyboards/handwired/gamenum/config.h               |  4 ----
 keyboards/handwired/hacked_motospeed/config.h      |  4 ----
 keyboards/handwired/heisenberg/config.h            |  4 ----
 keyboards/handwired/hexon38/config.h               |  4 ----
 keyboards/handwired/hnah108/config.h               |  4 ----
 keyboards/handwired/hnah40/config.h                |  4 ----
 keyboards/handwired/hnah40rgb/config.h             |  4 ----
 keyboards/handwired/hwpm87/config.h                |  5 ----
 keyboards/handwired/ibm122m/config.h               |  4 ----
 keyboards/handwired/ibm_wheelwriter/config.h       |  4 ----
 keyboards/handwired/jn68m/config.h                 |  4 ----
 keyboards/handwired/jopr/config.h                  |  4 ----
 keyboards/handwired/jot50/config.h                 |  4 ----
 keyboards/handwired/jotanck/config.h               |  4 ----
 keyboards/handwired/jotpad16/config.h              |  4 ----
 keyboards/handwired/jtallbean/split_65/config.h    |  4 ----
 keyboards/handwired/juliet/config.h                |  4 ----
 keyboards/handwired/k8split/config.h               |  4 ----
 keyboards/handwired/k_numpad17/config.h            |  4 ----
 keyboards/handwired/kbod/config.h                  |  4 ----
 keyboards/handwired/ks63/config.h                  |  4 ----
 keyboards/handwired/lagrange/config.h              |  4 ----
 keyboards/handwired/leftynumpad/config.h           |  4 ----
 keyboards/handwired/lovelive9/config.h             |  4 ----
 keyboards/handwired/m40/5x5_macropad/config.h      |  4 ----
 keyboards/handwired/macroboard/config.h            |  4 ----
 keyboards/handwired/magicforce61/config.h          |  4 ----
 keyboards/handwired/magicforce68/config.h          |  4 ----
 keyboards/handwired/marauder/config.h              |  4 ----
 keyboards/handwired/mechboards_micropad/config.h   |  4 ----
 keyboards/handwired/meck_tkl/config.h              |  4 ----
 keyboards/handwired/minorca/config.h               |  4 ----
 keyboards/handwired/ms_sculpt_mobile/config.h      |  4 ----
 keyboards/handwired/mutepad/config.h               |  4 ----
 keyboards/handwired/myskeeb/config.h               |  5 ----
 keyboards/handwired/nicekey/config.h               |  4 ----
 keyboards/handwired/not_so_minidox/config.h        |  5 ----
 keyboards/handwired/novem/config.h                 |  4 ----
 keyboards/handwired/nozbe_macro/config.h           |  4 ----
 keyboards/handwired/numpad20/config.h              |  4 ----
 keyboards/handwired/obuwunkunubi/spaget/config.h   |  4 ----
 keyboards/handwired/oem_ansi_fullsize/config.h     |  4 ----
 keyboards/handwired/oem_iso_fullsize/config.h      |  4 ----
 keyboards/handwired/ortho5x13/config.h             |  4 ----
 keyboards/handwired/ortho5x14/config.h             |  4 ----
 keyboards/handwired/ortho_brass/config.h           |  4 ----
 keyboards/handwired/p65rgb/config.h                |  4 ----
 keyboards/handwired/pilcrow/config.h               |  4 ----
 keyboards/handwired/pill60/config.h                |  2 --
 keyboards/handwired/postageboard/mini/config.h     |  4 ----
 keyboards/handwired/postageboard/r1/config.h       |  4 ----
 keyboards/handwired/prime_exl/config.h             |  4 ----
 keyboards/handwired/prime_exl_plus/config.h        |  4 ----
 keyboards/handwired/prkl30/feather/config.h        |  4 ----
 keyboards/handwired/prkl30/promicro/config.h       |  4 ----
 keyboards/handwired/pteron/config.h                |  4 ----
 keyboards/handwired/pteron38/config.h              |  4 ----
 keyboards/handwired/pteron44/config.h              |  4 ----
 keyboards/handwired/pytest/config.h                |  4 ----
 keyboards/handwired/qc60/config.h                  |  6 -----
 keyboards/handwired/retro_refit/config.h           |  4 ----
 keyboards/handwired/riblee_f401/config.h           |  3 ---
 keyboards/handwired/riblee_f411/config.h           |  3 ---
 keyboards/handwired/rs60/config.h                  |  4 ----
 keyboards/handwired/selene/config.h                |  3 ---
 keyboards/handwired/sick68/config.h                |  4 ----
 keyboards/handwired/sick_pad/config.h              |  4 ----
 keyboards/handwired/skakunm_dactyl/config.h        |  5 ----
 keyboards/handwired/slash/config.h                 |  4 ----
 keyboards/handwired/snatchpad/config.h             |  4 ----
 keyboards/handwired/sono1/config.h                 |  4 ----
 keyboards/handwired/space_oddity/config.h          |  4 ----
 keyboards/handwired/split65/promicro/config.h      |  4 ----
 keyboards/handwired/split65/stm32/config.h         |  4 ----
 keyboards/handwired/split89/config.h               |  7 ------
 keyboards/handwired/splittest/config.h             |  5 ----
 keyboards/handwired/steamvan/rev1/config.h         |  4 ----
 .../handwired/stef9998/split_5x7/rev1/config.h     |  5 ----
 keyboards/handwired/sticc14/config.h               |  4 ----
 keyboards/handwired/swiftrax/astro65/config.h      |  4 ----
 keyboards/handwired/swiftrax/bebol/config.h        |  4 ----
 keyboards/handwired/swiftrax/beegboy/config.h      |  4 ----
 keyboards/handwired/swiftrax/cowfish/config.h      |  4 ----
 keyboards/handwired/swiftrax/digicarp65/config.h   |  4 ----
 keyboards/handwired/swiftrax/digicarpice/config.h  |  4 ----
 keyboards/handwired/swiftrax/equator/config.h      |  4 ----
 keyboards/handwired/swiftrax/glacier/config.h      |  4 ----
 keyboards/handwired/swiftrax/joypad/config.h       |  4 ----
 .../handwired/swiftrax/koalafications/config.h     |  4 ----
 keyboards/handwired/swiftrax/nodu/config.h         |  4 ----
 keyboards/handwired/swiftrax/pandamic/config.h     |  4 ----
 keyboards/handwired/swiftrax/the_galleon/config.h  |  4 ----
 keyboards/handwired/swiftrax/unsplit/config.h      |  4 ----
 keyboards/handwired/swiftrax/walter/config.h       |  4 ----
 keyboards/handwired/symmetry60/config.h            |  4 ----
 keyboards/handwired/t111/config.h                  |  4 ----
 keyboards/handwired/tennie/config.h                |  4 ----
 keyboards/handwired/terminus_mini/config.h         |  4 ----
 keyboards/handwired/trackpoint/config.h            |  3 ---
 .../handwired/tractyl_manuform/4x6_right/config.h  |  5 ----
 .../5x6_right/arduinomicro/config.h                |  5 ----
 .../handwired/tractyl_manuform/5x6_right/config.h  |  5 ----
 keyboards/handwired/traveller/config.h             |  4 ----
 keyboards/handwired/tritium_numpad/config.h        |  4 ----
 keyboards/handwired/twadlee/tp69/config.h          |  4 ----
 keyboards/handwired/twig/twig50/config.h           |  4 ----
 keyboards/handwired/unicomp_mini_m/config.h        |  4 ----
 keyboards/handwired/unk/rev1/config.h              |  7 ------
 keyboards/handwired/uthol/config.h                 |  4 ----
 keyboards/handwired/videowriter/config.h           |  4 ----
 keyboards/handwired/wabi/config.h                  |  5 ----
 keyboards/handwired/woodpad/config.h               |  4 ----
 keyboards/handwired/wulkan/config.h                |  4 ----
 keyboards/handwired/xealous/rev1/config.h          |  5 ----
 keyboards/handwired/z150/config.h                  |  4 ----
 keyboards/handwired/zergo/config.h                 |  4 ----
 187 files changed, 790 deletions(-)
 delete mode 100644 keyboards/handwired/dactyl_manuform/6x6/config.h

(limited to 'keyboards/handwired')

diff --git a/keyboards/handwired/108key_trackpoint/config.h b/keyboards/handwired/108key_trackpoint/config.h
index 5547297e57..5887401a3a 100644
--- a/keyboards/handwired/108key_trackpoint/config.h
+++ b/keyboards/handwired/108key_trackpoint/config.h
@@ -1,9 +1,6 @@
 #pragma once
 
 
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 23
-
 #ifdef PS2_DRIVER_USART
 #define PS2_CLOCK_PIN   D5
 #define PS2_DATA_PIN    D2
diff --git a/keyboards/handwired/2x5keypad/config.h b/keyboards/handwired/2x5keypad/config.h
index abe825a1f0..10e2265749 100644
--- a/keyboards/handwired/2x5keypad/config.h
+++ b/keyboards/handwired/2x5keypad/config.h
@@ -1,10 +1,6 @@
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 5
-
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B3, B2 }
 #define MATRIX_COL_PINS { D4, C6, D7, E6, B4 }
diff --git a/keyboards/handwired/3dfoxc/config.h b/keyboards/handwired/3dfoxc/config.h
index ae520c8860..9f08703b6d 100644
--- a/keyboards/handwired/3dfoxc/config.h
+++ b/keyboards/handwired/3dfoxc/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/handwired/3dp660/config.h b/keyboards/handwired/3dp660/config.h
index cdc5eb592f..c2effa2e46 100644
--- a/keyboards/handwired/3dp660/config.h
+++ b/keyboards/handwired/3dp660/config.h
@@ -20,10 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define TAPPING_TERM 400
 
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
 // ROWS: Top to bottom, COLS: Left to right
 
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 }
diff --git a/keyboards/handwired/412_64/config.h b/keyboards/handwired/412_64/config.h
index a3b234e90e..5037639719 100644
--- a/keyboards/handwired/412_64/config.h
+++ b/keyboards/handwired/412_64/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/handwired/42/config.h b/keyboards/handwired/42/config.h
index 0554e07dd9..9341a90a76 100644
--- a/keyboards/handwired/42/config.h
+++ b/keyboards/handwired/42/config.h
@@ -1,10 +1,6 @@
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/handwired/6key/config.h b/keyboards/handwired/6key/config.h
index 21bcd10f1c..31b6c8888d 100644
--- a/keyboards/handwired/6key/config.h
+++ b/keyboards/handwired/6key/config.h
@@ -17,10 +17,6 @@
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 3
-
 /* pin-out */
 #define MATRIX_ROW_PINS { B4, D0 }
 #define MATRIX_COL_PINS { D3, D2, D1 }
diff --git a/keyboards/handwired/6macro/config.h b/keyboards/handwired/6macro/config.h
index d4d0b7385c..0dc61becd3 100644
--- a/keyboards/handwired/6macro/config.h
+++ b/keyboards/handwired/6macro/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 3
-
 /* pinout - DON'T CHANGE */
 #define MATRIX_ROW_PINS { B3, B4 }
 #define MATRIX_COL_PINS { B0, B1, B2 }
diff --git a/keyboards/handwired/aek64/config.h b/keyboards/handwired/aek64/config.h
index c7a0e6c41d..886b616c35 100644
--- a/keyboards/handwired/aek64/config.h
+++ b/keyboards/handwired/aek64/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
 // Originally made for a Teensy 2++
 #define MATRIX_COL_PINS { F0, E6, E7, B0, B1, B2, B3, B4, B5, B6, D3, D0, D1, D2 }
 #define MATRIX_ROW_PINS { E0, E1, C0, C1, C2 }
diff --git a/keyboards/handwired/aim65/config.h b/keyboards/handwired/aim65/config.h
index 5ff4263ecd..84e51951a9 100644
--- a/keyboards/handwired/aim65/config.h
+++ b/keyboards/handwired/aim65/config.h
@@ -17,10 +17,6 @@
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 8
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/handwired/amigopunk/config.h b/keyboards/handwired/amigopunk/config.h
index 3a774aed64..78f8271f84 100644
--- a/keyboards/handwired/amigopunk/config.h
+++ b/keyboards/handwired/amigopunk/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 { C0, C1, C2, C3, C4, C5 }
 #define MATRIX_COL_PINS { B6, B5, B4, B3, B2, B1, B0, E7, E6, F0, F1, F2, F3, F4, F5, F6, F7 }
diff --git a/keyboards/handwired/angel/config.h b/keyboards/handwired/angel/config.h
index f7eb01e647..a138c0c2d1 100644
--- a/keyboards/handwired/angel/config.h
+++ b/keyboards/handwired/angel/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 13
-
 /*
  * Keyboard Matrix Assignments
  * COLS: AVR pins used for columns, left to right
diff --git a/keyboards/handwired/aplx2/config.h b/keyboards/handwired/aplx2/config.h
index f24d34a878..c140e5bced 100644
--- a/keyboards/handwired/aplx2/config.h
+++ b/keyboards/handwired/aplx2/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 2
-
 /* pin-out */
 #define MATRIX_ROW_PINS { D1 }
 #define MATRIX_COL_PINS { B5, D3 }
diff --git a/keyboards/handwired/aranck/config.h b/keyboards/handwired/aranck/config.h
index c4b715b859..024ad37c13 100644
--- a/keyboards/handwired/aranck/config.h
+++ b/keyboards/handwired/aranck/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/handwired/arrow_pad/config.h b/keyboards/handwired/arrow_pad/config.h
index 9908e8b535..556a96795c 100644
--- a/keyboards/handwired/arrow_pad/config.h
+++ b/keyboards/handwired/arrow_pad/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 4
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/handwired/atreus50/config.h b/keyboards/handwired/atreus50/config.h
index ee38aae10c..69a24d9038 100644
--- a/keyboards/handwired/atreus50/config.h
+++ b/keyboards/handwired/atreus50/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 13
-
 /* Planck PCB default pin-out */
 #define MATRIX_ROW_PINS { D3, D2, D1, D0 }
 #define MATRIX_COL_PINS { D4, D7, E6, B4, B5, B6, B2, B3, B1, F7, F6, F5, F4 }
diff --git a/keyboards/handwired/axon/config.h b/keyboards/handwired/axon/config.h
index 0db00331e2..a4b2c64c66 100644
--- a/keyboards/handwired/axon/config.h
+++ b/keyboards/handwired/axon/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 11
-
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D5, D6, D4, D0 }
 #define MATRIX_COL_PINS { B0, D7, B1, B2, C0, C1, C2, C3, C4, C5, D1 }
diff --git a/keyboards/handwired/battleship_gamepad/config.h b/keyboards/handwired/battleship_gamepad/config.h
index 49cb47520d..e28cd08a2a 100644
--- a/keyboards/handwired/battleship_gamepad/config.h
+++ b/keyboards/handwired/battleship_gamepad/config.h
@@ -17,10 +17,6 @@
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 8
-
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B6, B2, B3, B1, F7 }
 #define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6, B4, B5 }
diff --git a/keyboards/handwired/bigmac/config.h b/keyboards/handwired/bigmac/config.h
index 15d36c6b8b..f33849faf7 100644
--- a/keyboards/handwired/bigmac/config.h
+++ b/keyboards/handwired/bigmac/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/handwired/bolek/config.h b/keyboards/handwired/bolek/config.h
index de1a49da1c..ec81b3337a 100644
--- a/keyboards/handwired/bolek/config.h
+++ b/keyboards/handwired/bolek/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 10
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/handwired/boss566y/redragon_vara/config.h b/keyboards/handwired/boss566y/redragon_vara/config.h
index d5a22f2d2d..d7e3fbe200 100644
--- a/keyboards/handwired/boss566y/redragon_vara/config.h
+++ b/keyboards/handwired/boss566y/redragon_vara/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 12
-#define MATRIX_COLS 11
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/handwired/brain/config.h b/keyboards/handwired/brain/config.h
index a9ddcc3315..994554c982 100644
--- a/keyboards/handwired/brain/config.h
+++ b/keyboards/handwired/brain/config.h
@@ -23,11 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define SPLIT_USB_DETECT
 
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 7
-
 // wiring of each half
 
 #define MATRIX_COL_PINS \
diff --git a/keyboards/handwired/bstk100/config.h b/keyboards/handwired/bstk100/config.h
index 373f0b461b..2a14eca16a 100644
--- a/keyboards/handwired/bstk100/config.h
+++ b/keyboards/handwired/bstk100/config.h
@@ -19,10 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 5
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/handwired/cans12er/config.h b/keyboards/handwired/cans12er/config.h
index 9ad32b23fe..74a7679e0b 100644
--- a/keyboards/handwired/cans12er/config.h
+++ b/keyboards/handwired/cans12er/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 { F7, B1, B3 }
 #define MATRIX_COL_PINS { D0, D4, C6, D7 }
diff --git a/keyboards/handwired/carpolly/config.h b/keyboards/handwired/carpolly/config.h
index f92b0d2eb0..4c2410ca98 100644
--- a/keyboards/handwired/carpolly/config.h
+++ b/keyboards/handwired/carpolly/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/handwired/chiron/config.h b/keyboards/handwired/chiron/config.h
index fe1c096b5f..b5b67dceb9 100644
--- a/keyboards/handwired/chiron/config.h
+++ b/keyboards/handwired/chiron/config.h
@@ -18,9 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 7
-
 // Pro Micro Pins          4,  6,  7,  8,  9
 #define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 }
 // Pro Micro Pins         A3, A2, A1, A0, 15, 14, 16
diff --git a/keyboards/handwired/ck4x4/config.h b/keyboards/handwired/ck4x4/config.h
index 707fb14ae8..0a5d6c5c6a 100644
--- a/keyboards/handwired/ck4x4/config.h
+++ b/keyboards/handwired/ck4x4/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 4
-
 #define MATRIX_COL_PINS { B7, B8, B9, B10 }
 #define MATRIX_ROW_PINS { B3, B4, B5, B6 }
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/cmd60/config.h b/keyboards/handwired/cmd60/config.h
index fccbb0f95e..6ec23cbd19 100644
--- a/keyboards/handwired/cmd60/config.h
+++ b/keyboards/handwired/cmd60/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/handwired/co60/rev1/config.h b/keyboards/handwired/co60/rev1/config.h
index edf90f640e..f4b6aa0a45 100644
--- a/keyboards/handwired/co60/rev1/config.h
+++ b/keyboards/handwired/co60/rev1/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/handwired/co60/rev6/config.h b/keyboards/handwired/co60/rev6/config.h
index c4eb45d43c..aa7079f247 100644
--- a/keyboards/handwired/co60/rev6/config.h
+++ b/keyboards/handwired/co60/rev6/config.h
@@ -17,10 +17,6 @@
 #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, B1, B2, A15, A10 }
diff --git a/keyboards/handwired/co60/rev7/config.h b/keyboards/handwired/co60/rev7/config.h
index 28f6bca88f..19ddb6be2c 100644
--- a/keyboards/handwired/co60/rev7/config.h
+++ b/keyboards/handwired/co60/rev7/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #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 { A8, A2, B13, B2, B10 }
diff --git a/keyboards/handwired/colorlice/config.h b/keyboards/handwired/colorlice/config.h
index 2adf3ea152..4e981b4428 100644
--- a/keyboards/handwired/colorlice/config.h
+++ b/keyboards/handwired/colorlice/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 16
-
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, B6, B5, B4, D7, D6, D4, E6, B0, B3 }
diff --git a/keyboards/handwired/concertina/64key/config.h b/keyboards/handwired/concertina/64key/config.h
index d5f80f4681..2eb9a4cd67 100644
--- a/keyboards/handwired/concertina/64key/config.h
+++ b/keyboards/handwired/concertina/64key/config.h
@@ -17,9 +17,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/handwired/consolekeyboard/18key/config.h b/keyboards/handwired/consolekeyboard/18key/config.h
index 9013b22b90..59aa11f675 100644
--- a/keyboards/handwired/consolekeyboard/18key/config.h
+++ b/keyboards/handwired/consolekeyboard/18key/config.h
@@ -17,10 +17,6 @@
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 11
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/handwired/consolekeyboard/20key/config.h b/keyboards/handwired/consolekeyboard/20key/config.h
index 145e6d5d9c..7d8f67d24e 100644
--- a/keyboards/handwired/consolekeyboard/20key/config.h
+++ b/keyboards/handwired/consolekeyboard/20key/config.h
@@ -17,10 +17,6 @@
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 12
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/handwired/consolekeyboard/27key/config.h b/keyboards/handwired/consolekeyboard/27key/config.h
index aa43f69cc6..59966bc857 100644
--- a/keyboards/handwired/consolekeyboard/27key/config.h
+++ b/keyboards/handwired/consolekeyboard/27key/config.h
@@ -17,10 +17,6 @@
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 3
-#define MATRIX_COLS 11
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/handwired/consolekeyboard/30key/config.h b/keyboards/handwired/consolekeyboard/30key/config.h
index 4eea6f26cf..ba82037cf4 100644
--- a/keyboards/handwired/consolekeyboard/30key/config.h
+++ b/keyboards/handwired/consolekeyboard/30key/config.h
@@ -17,10 +17,6 @@
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 3
-#define MATRIX_COLS 12
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/handwired/croxsplit44/config.h b/keyboards/handwired/croxsplit44/config.h
index fb1e579a2b..b76c323641 100644
--- a/keyboards/handwired/croxsplit44/config.h
+++ b/keyboards/handwired/croxsplit44/config.h
@@ -18,8 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
 #define MATRIX_ROW_PINS { D4, D5, D6, D7 }
 #define MATRIX_COL_PINS { B6, B5, B4, D2, C0, C1, F5, F4, F3, F2, F1, F0 }
 
diff --git a/keyboards/handwired/curiosity/config.h b/keyboards/handwired/curiosity/config.h
index 96d938f3e7..bec41310c4 100644
--- a/keyboards/handwired/curiosity/config.h
+++ b/keyboards/handwired/curiosity/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D0, F7, F6, F5 }
 #define MATRIX_COL_PINS { D3, D4, F4, C6, D7, E6, B5, B4, B1, B3, B2, B6 }
diff --git a/keyboards/handwired/cyberstar/config.h b/keyboards/handwired/cyberstar/config.h
index afc1306f7b..a8ecd69985 100644
--- a/keyboards/handwired/cyberstar/config.h
+++ b/keyboards/handwired/cyberstar/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 18
-
 #define MATRIX_ROW_PINS { A15, B3, A9, B5, A3 }
 #define MATRIX_COL_PINS { A4, A5, A6, A7, B0, B1, B2, B10, B11, B12, B13, B14, B15, A8, A10, A14, B8, B9 }
 
diff --git a/keyboards/handwired/d48/config.h b/keyboards/handwired/d48/config.h
index 89142ffed6..21f78e0645 100644
--- a/keyboards/handwired/d48/config.h
+++ b/keyboards/handwired/d48/config.h
@@ -1,10 +1,6 @@
 #pragma once
 
 
-/* Key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 12
-
 /* Key matrix pins */
 #define MATRIX_ROW_PINS { B8, B9, B1, B2, B4 }
 
diff --git a/keyboards/handwired/dactyl_left/config.h b/keyboards/handwired/dactyl_left/config.h
index cc3329bd17..1e3f256b70 100644
--- a/keyboards/handwired/dactyl_left/config.h
+++ b/keyboards/handwired/dactyl_left/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 6
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/config.h b/keyboards/handwired/dactyl_manuform/3x5_3/config.h
index 32b543e30a..33f7c9769e 100644
--- a/keyboards/handwired/dactyl_manuform/3x5_3/config.h
+++ b/keyboards/handwired/dactyl_manuform/3x5_3/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 5
-
 // wiring of each half
 #define MATRIX_COL_PINS { C6, D7, E6, B4, B5 }
 #define MATRIX_ROW_PINS { B1, B3, B2, B6 }
diff --git a/keyboards/handwired/dactyl_manuform/4x5/config.h b/keyboards/handwired/dactyl_manuform/4x5/config.h
index 6b8677d19d..8cb68765ba 100644
--- a/keyboards/handwired/dactyl_manuform/4x5/config.h
+++ b/keyboards/handwired/dactyl_manuform/4x5/config.h
@@ -19,11 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 5
-
 // wiring of each half
 #define MATRIX_ROW_PINS { F7, B1, B3, B2, B6 }
 // #define MATRIX_COL_PINS { B5, B4, E6, D7, C6 }
diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/config.h b/keyboards/handwired/dactyl_manuform/4x5_5/config.h
index 971298b809..d0580b7c21 100644
--- a/keyboards/handwired/dactyl_manuform/4x5_5/config.h
+++ b/keyboards/handwired/dactyl_manuform/4x5_5/config.h
@@ -4,9 +4,6 @@
 #pragma once
 
 
-#define MATRIX_ROWS 10
-#define MATRIX_COLUMNS 5
-
 // Wiring pins
 #define MATRIX_ROW_PINS { F7, B1, B3, B2, B4 }
 #define MATRIX_COL_PINS { D4, C6, D7, E6, F6 }
diff --git a/keyboards/handwired/dactyl_manuform/4x6/config.h b/keyboards/handwired/dactyl_manuform/4x6/config.h
index 3726485bfb..64844dd7bf 100644
--- a/keyboards/handwired/dactyl_manuform/4x6/config.h
+++ b/keyboards/handwired/dactyl_manuform/4x6/config.h
@@ -19,11 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 6
-
 // row-driven
 #define MATRIX_ROW_PINS { F7, B1, B3, B2, B6 }
 #define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/config.h b/keyboards/handwired/dactyl_manuform/4x6_5/config.h
index 3726485bfb..64844dd7bf 100644
--- a/keyboards/handwired/dactyl_manuform/4x6_5/config.h
+++ b/keyboards/handwired/dactyl_manuform/4x6_5/config.h
@@ -19,11 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 6
-
 // row-driven
 #define MATRIX_ROW_PINS { F7, B1, B3, B2, B6 }
 #define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
diff --git a/keyboards/handwired/dactyl_manuform/5x6/config.h b/keyboards/handwired/dactyl_manuform/5x6/config.h
index 6afa530c68..5abd1a68a2 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6/config.h
@@ -19,11 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 12
-#define MATRIX_COLS 6
-
 // wiring of each half
 #define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
 #define MATRIX_ROW_PINS { F6, F7, B1, B3, B2, B6 }
diff --git a/keyboards/handwired/dactyl_manuform/5x6_2_5/config.h b/keyboards/handwired/dactyl_manuform/5x6_2_5/config.h
index a6b36d163c..91cd7800d5 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_2_5/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6_2_5/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 12
-#define MATRIX_COLS 6
-
 // left half pro-mirco
 #define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
 #define MATRIX_ROW_PINS { F6, F7, B1, B3, B2, B6 }
diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/config.h b/keyboards/handwired/dactyl_manuform/5x6_5/config.h
index cc21709a9c..65c4afbaf8 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_5/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6_5/config.h
@@ -19,11 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 12
-#define MATRIX_COLS 6
-
 // wiring of each half
 #define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
 #define MATRIX_ROW_PINS { F6, F7, B1, B3, B2, B6 }
diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/config.h b/keyboards/handwired/dactyl_manuform/5x6_6/config.h
index bd2cbb8b0f..0f8e9740ce 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_6/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6_6/config.h
@@ -18,11 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_COLS 6
-#define MATRIX_ROWS 14
-
 #undef SOFT_SERIAL_PIN
 #define SOFT_SERIAL_PIN D3
 
diff --git a/keyboards/handwired/dactyl_manuform/5x7/config.h b/keyboards/handwired/dactyl_manuform/5x7/config.h
index 81b2c38c02..38e4b1ab4b 100644
--- a/keyboards/handwired/dactyl_manuform/5x7/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x7/config.h
@@ -19,11 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 12
-#define MATRIX_COLS 7
-
 // wiring of each half
 #define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5 }
 #define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
diff --git a/keyboards/handwired/dactyl_manuform/6x6/config.h b/keyboards/handwired/dactyl_manuform/6x6/config.h
deleted file mode 100644
index feaf8a64b6..0000000000
--- a/keyboards/handwired/dactyl_manuform/6x6/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* USB Device descriptor parameter */
-
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 14
-#define MATRIX_COLS 6
diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/config.h b/keyboards/handwired/dactyl_manuform/6x6_4/config.h
index 874503c259..ebf41bd292 100644
--- a/keyboards/handwired/dactyl_manuform/6x6_4/config.h
+++ b/keyboards/handwired/dactyl_manuform/6x6_4/config.h
@@ -19,11 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 14
-#define MATRIX_COLS 6
-
 // wiring of each half
 #define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
 #define MATRIX_ROW_PINS { F5, F6, F7, B1, B3, B2, B6 }
diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h b/keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h
index 874503c259..ebf41bd292 100644
--- a/keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h
+++ b/keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h
@@ -19,11 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 14
-#define MATRIX_COLS 6
-
 // wiring of each half
 #define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
 #define MATRIX_ROW_PINS { F5, F6, F7, B1, B3, B2, B6 }
diff --git a/keyboards/handwired/dactyl_manuform/6x7/config.h b/keyboards/handwired/dactyl_manuform/6x7/config.h
index 9584fa8d4c..1cbf1f6545 100644
--- a/keyboards/handwired/dactyl_manuform/6x7/config.h
+++ b/keyboards/handwired/dactyl_manuform/6x7/config.h
@@ -19,11 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 14
-#define MATRIX_COLS 7
-
 // wiring of each half
 #define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5, B7 }
 #define MATRIX_ROW_PINS { F5, F6, F7, B1, B3, B2, B6 }
diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/config.h b/keyboards/handwired/dactyl_manuform/dmote/62key/config.h
index 43a9de1b54..dd38c6af7d 100644
--- a/keyboards/handwired/dactyl_manuform/dmote/62key/config.h
+++ b/keyboards/handwired/dactyl_manuform/dmote/62key/config.h
@@ -1,9 +1,6 @@
 #pragma once
 
 
-#define MATRIX_ROWS 12
-#define MATRIX_COLS 6
-
 // MCUs are flipped on each side, relative to the shape of the case,
 // but for ease of mounting, the pinout is not flipped with the controller.
 // The same finger on each hand uses a column connected to the pin with the
diff --git a/keyboards/handwired/dactyl_promicro/config.h b/keyboards/handwired/dactyl_promicro/config.h
index 69b29c6f2d..dd31ab6f7f 100644
--- a/keyboards/handwired/dactyl_promicro/config.h
+++ b/keyboards/handwired/dactyl_promicro/config.h
@@ -19,11 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 12
-#define MATRIX_COLS 6
-
 // wiring of each half
 #define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
 #define MATRIX_ROW_PINS { F6, F7, B1, B3, B2, B6 }
diff --git a/keyboards/handwired/dactyl_rah/config.h b/keyboards/handwired/dactyl_rah/config.h
index 0b89fb8b60..9216a1942f 100644
--- a/keyboards/handwired/dactyl_rah/config.h
+++ b/keyboards/handwired/dactyl_rah/config.h
@@ -18,11 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 12
-#define MATRIX_COLS 6
-
 // wiring of each half
 #define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
 #define MATRIX_ROW_PINS { F6, F7, B1, B3, B2, B6 }
diff --git a/keyboards/handwired/daishi/config.h b/keyboards/handwired/daishi/config.h
index deafac5f5c..6a5d485d7f 100644
--- a/keyboards/handwired/daishi/config.h
+++ b/keyboards/handwired/daishi/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 7
-#define MATRIX_COLS 18
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/handwired/ddg_56/config.h b/keyboards/handwired/ddg_56/config.h
index 4f73137149..7582367f13 100644
--- a/keyboards/handwired/ddg_56/config.h
+++ b/keyboards/handwired/ddg_56/config.h
@@ -15,10 +15,6 @@
  */
 #pragma once
 
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
 #define DIODE_DIRECTION COL2ROW
 
 #define MATRIX_ROW_PINS { B5, B15, B9, B10, A14 }
diff --git a/keyboards/handwired/eagleii/config.h b/keyboards/handwired/eagleii/config.h
index d26dabb9a5..7ebd3a4a8c 100644
--- a/keyboards/handwired/eagleii/config.h
+++ b/keyboards/handwired/eagleii/config.h
@@ -1,8 +1,6 @@
 #pragma once
 
 
-#define MATRIX_ROWS 12
-#define MATRIX_COLS 12
 #define MATRIX_ROW_PINS { D0, B5, F1, B2, F7, F6, D4, D7, B4, B7, F5, B0 }
 #define MATRIX_COL_PINS { D2, C6, E6, D5, B3, D3, D1, C7, F0, B6, B1, F4 }
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/elrgo_s/config.h b/keyboards/handwired/elrgo_s/config.h
index f593738e36..fcd434ebfa 100644
--- a/keyboards/handwired/elrgo_s/config.h
+++ b/keyboards/handwired/elrgo_s/config.h
@@ -18,10 +18,6 @@ Copyright 2021 Yaroslav Smirnov <elorenn@bk.ru>
 #pragma once
 
 
-// Rows are doubled-up for splits
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 6
-
 // Wiring of each half
 #define MATRIX_ROW_PINS { B1, B3, B2, B6 }
 #define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
diff --git a/keyboards/handwired/ergocheap/config.h b/keyboards/handwired/ergocheap/config.h
index b184d01df0..61946adcd2 100644
--- a/keyboards/handwired/ergocheap/config.h
+++ b/keyboards/handwired/ergocheap/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
 #define MATRIX_COL_PINS { A8, A9, B14, B12, B13, B15, B3, B11, A4, A5, A6, A7, B0, B1, B10 }
 #define MATRIX_ROW_PINS { B5, B6, B7, B9, B8 }
 
diff --git a/keyboards/handwired/evk/v1_3/config.h b/keyboards/handwired/evk/v1_3/config.h
index ccd23ad45a..a43abb351a 100644
--- a/keyboards/handwired/evk/v1_3/config.h
+++ b/keyboards/handwired/evk/v1_3/config.h
@@ -16,10 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 16
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/handwired/fc200rt_qmk/config.h b/keyboards/handwired/fc200rt_qmk/config.h
index 837def0ef1..055c910e8b 100644
--- a/keyboards/handwired/fc200rt_qmk/config.h
+++ b/keyboards/handwired/fc200rt_qmk/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 16
-
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, E6, B7, D0, D1 }
 #define MATRIX_COL_PINS { D2, D3, C6, C7, D5, D4, D6, D7, B4, B5, B6, F7, F6, F5, F4, F1 }
 
diff --git a/keyboards/handwired/fivethirteen/config.h b/keyboards/handwired/fivethirteen/config.h
index e1939dddd2..5f5fef769b 100644
--- a/keyboards/handwired/fivethirteen/config.h
+++ b/keyboards/handwired/fivethirteen/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 13
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/handwired/floorboard/config.h b/keyboards/handwired/floorboard/config.h
index fdb956e196..cb020114b2 100644
--- a/keyboards/handwired/floorboard/config.h
+++ b/keyboards/handwired/floorboard/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/handwired/frankie_macropad/config.h b/keyboards/handwired/frankie_macropad/config.h
index 03fe3ecdb7..8045d59c67 100644
--- a/keyboards/handwired/frankie_macropad/config.h
+++ b/keyboards/handwired/frankie_macropad/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 3
-#define MATRIX_COLS 4
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/handwired/freoduo/config.h b/keyboards/handwired/freoduo/config.h
index 5f0477bc7b..49e8a79049 100644
--- a/keyboards/handwired/freoduo/config.h
+++ b/keyboards/handwired/freoduo/config.h
@@ -16,11 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #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 { B2, B6, F6, B3, B1, F7 }
diff --git a/keyboards/handwired/fruity60/config.h b/keyboards/handwired/fruity60/config.h
index 459c1696c5..c325baca18 100644
--- a/keyboards/handwired/fruity60/config.h
+++ b/keyboards/handwired/fruity60/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 11
-
 #define MATRIX_ROW_PINS \
     { B6, B5, D7, C6, D0, D1 }
 #define MATRIX_COL_PINS \
diff --git a/keyboards/handwired/gamenum/config.h b/keyboards/handwired/gamenum/config.h
index c84369aa83..95477b88f0 100644
--- a/keyboards/handwired/gamenum/config.h
+++ b/keyboards/handwired/gamenum/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 4
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/handwired/hacked_motospeed/config.h b/keyboards/handwired/hacked_motospeed/config.h
index e7c0de6f9f..35c1ea212d 100644
--- a/keyboards/handwired/hacked_motospeed/config.h
+++ b/keyboards/handwired/hacked_motospeed/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 12
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/handwired/heisenberg/config.h b/keyboards/handwired/heisenberg/config.h
index 3c8b0d4d6f..0051981fc1 100644
--- a/keyboards/handwired/heisenberg/config.h
+++ b/keyboards/handwired/heisenberg/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/handwired/hexon38/config.h b/keyboards/handwired/hexon38/config.h
index c2a23c9e3d..5a75dff220 100644
--- a/keyboards/handwired/hexon38/config.h
+++ b/keyboards/handwired/hexon38/config.h
@@ -3,10 +3,6 @@
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B0, F0, B2, F4 }
 #define MATRIX_COL_PINS { C6, D3, D2, D1, D0, B7, F6, F7, B6, B5, B4, D7 }
diff --git a/keyboards/handwired/hnah108/config.h b/keyboards/handwired/hnah108/config.h
index 868ba1150b..13367a2577 100644
--- a/keyboards/handwired/hnah108/config.h
+++ b/keyboards/handwired/hnah108/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 11
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/handwired/hnah40/config.h b/keyboards/handwired/hnah40/config.h
index 5206587e5a..083450a743 100644
--- a/keyboards/handwired/hnah40/config.h
+++ b/keyboards/handwired/hnah40/config.h
@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 11
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/handwired/hnah40rgb/config.h b/keyboards/handwired/hnah40rgb/config.h
index 496b522185..d4cf391b6d 100644
--- a/keyboards/handwired/hnah40rgb/config.h
+++ b/keyboards/handwired/hnah40rgb/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 11
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/handwired/hwpm87/config.h b/keyboards/handwired/hwpm87/config.h
index c8275d9dc6..427c62a66b 100644
--- a/keyboards/handwired/hwpm87/config.h
+++ b/keyboards/handwired/hwpm87/config.h
@@ -4,11 +4,6 @@
 #pragma once
 
 
-
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 18
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/handwired/ibm122m/config.h b/keyboards/handwired/ibm122m/config.h
index d9bc86877b..e8ca31777e 100644
--- a/keyboards/handwired/ibm122m/config.h
+++ b/keyboards/handwired/ibm122m/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 20
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/handwired/ibm_wheelwriter/config.h b/keyboards/handwired/ibm_wheelwriter/config.h
index a92637a05d..254f60be74 100644
--- a/keyboards/handwired/ibm_wheelwriter/config.h
+++ b/keyboards/handwired/ibm_wheelwriter/config.h
@@ -17,10 +17,6 @@
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 13
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/handwired/jn68m/config.h b/keyboards/handwired/jn68m/config.h
index 17b0909548..a0045560a1 100644
--- a/keyboards/handwired/jn68m/config.h
+++ b/keyboards/handwired/jn68m/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 16
-
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B0, B1, D5, D3, D2 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, E6, D1 }
diff --git a/keyboards/handwired/jopr/config.h b/keyboards/handwired/jopr/config.h
index a37155d5a1..7078ebb31d 100644
--- a/keyboards/handwired/jopr/config.h
+++ b/keyboards/handwired/jopr/config.h
@@ -1,10 +1,6 @@
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 11
-
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D0, D6, D2, D4, D3, D5, D7, C6, B6, F5 }
 #define MATRIX_COL_PINS { B3, B2, B1, B0, F7, E6, F6, B5, C7, B4, D1 }
diff --git a/keyboards/handwired/jot50/config.h b/keyboards/handwired/jot50/config.h
index 004b0e5d94..e1359e093e 100644
--- a/keyboards/handwired/jot50/config.h
+++ b/keyboards/handwired/jot50/config.h
@@ -1,10 +1,6 @@
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 12
-
 /* pro_micro pin-out */
 #define MATRIX_ROW_PINS { D7, E6, B4, B6, B2 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, D3, D2, D1, D0, D4, C6 }
diff --git a/keyboards/handwired/jotanck/config.h b/keyboards/handwired/jotanck/config.h
index c445e4c8c8..f3e53c98ce 100644
--- a/keyboards/handwired/jotanck/config.h
+++ b/keyboards/handwired/jotanck/config.h
@@ -1,10 +1,6 @@
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
 /* pro_micro pin-out */
 #define MATRIX_ROW_PINS { D7, E6, B6, B2 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, D3, D2, D1, D0, D4, C6 }
diff --git a/keyboards/handwired/jotpad16/config.h b/keyboards/handwired/jotpad16/config.h
index c3bf9d66d0..c8a121fb44 100644
--- a/keyboards/handwired/jotpad16/config.h
+++ b/keyboards/handwired/jotpad16/config.h
@@ -1,10 +1,6 @@
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 4
-
 /* pro_micro pin-out */
 #define MATRIX_ROW_PINS { B6, B2, D2, D3 }
 #define MATRIX_COL_PINS { E6, D7, B3, B1 }
diff --git a/keyboards/handwired/jtallbean/split_65/config.h b/keyboards/handwired/jtallbean/split_65/config.h
index 85c9681c27..1546d57ed8 100644
--- a/keyboards/handwired/jtallbean/split_65/config.h
+++ b/keyboards/handwired/jtallbean/split_65/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 10 // Double rows for split keyboards. split_65 has 5, so define 10
-#define MATRIX_COLS 9
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/handwired/juliet/config.h b/keyboards/handwired/juliet/config.h
index 960af55388..df5d4248ca 100644
--- a/keyboards/handwired/juliet/config.h
+++ b/keyboards/handwired/juliet/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/handwired/k8split/config.h b/keyboards/handwired/k8split/config.h
index 3941216177..e8e7ad9411 100644
--- a/keyboards/handwired/k8split/config.h
+++ b/keyboards/handwired/k8split/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 8
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/handwired/k_numpad17/config.h b/keyboards/handwired/k_numpad17/config.h
index e56fcf4856..0fd1452887 100644
--- a/keyboards/handwired/k_numpad17/config.h
+++ b/keyboards/handwired/k_numpad17/config.h
@@ -20,10 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define TAPPING_TERM 400
 
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 4
-
 // ROWS: Top to bottom, COLS: Left to right
 
 #define MATRIX_ROW_PINS { D1, D4, C6, D7, E6 }
diff --git a/keyboards/handwired/kbod/config.h b/keyboards/handwired/kbod/config.h
index 5e01f4093e..2366898f05 100644
--- a/keyboards/handwired/kbod/config.h
+++ b/keyboards/handwired/kbod/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 8
-
 #define MATRIX_ROW_PINS { C6, D7, E6, B4, B5, B6, B7, D6 }
 #define MATRIX_COL_PINS { D0, D1, F0, F1, F4, F5, F6, F7 }
 
diff --git a/keyboards/handwired/ks63/config.h b/keyboards/handwired/ks63/config.h
index 67020fe483..0c798821f8 100644
--- a/keyboards/handwired/ks63/config.h
+++ b/keyboards/handwired/ks63/config.h
@@ -19,10 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 8
-
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B5, B4, E6, D7, C6 }
 #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4 }
diff --git a/keyboards/handwired/lagrange/config.h b/keyboards/handwired/lagrange/config.h
index 59a366cdb6..618862f2e2 100644
--- a/keyboards/handwired/lagrange/config.h
+++ b/keyboards/handwired/lagrange/config.h
@@ -20,10 +20,6 @@
 #define EE_HANDS
 #define SPLIT_USB_DETECT
 
-/* key matrix size */
-#define MATRIX_ROWS 14
-#define MATRIX_COLS 6
-
 /* pin-out */
 #define MATRIX_ROW_PINS { E6, F1, F0, F4, F5, F6, F7 }
 #define MATRIX_COL_PINS { B4, B5, D7, B6, C6, D6 }
diff --git a/keyboards/handwired/leftynumpad/config.h b/keyboards/handwired/leftynumpad/config.h
index 51d1731d20..3f59e84459 100644
--- a/keyboards/handwired/leftynumpad/config.h
+++ b/keyboards/handwired/leftynumpad/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 5
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/handwired/lovelive9/config.h b/keyboards/handwired/lovelive9/config.h
index 4a5759d347..87ba736bb9 100644
--- a/keyboards/handwired/lovelive9/config.h
+++ b/keyboards/handwired/lovelive9/config.h
@@ -2,10 +2,6 @@
 
 #pragma once
 
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 9
-
 /* default pin-out */
 #define MATRIX_ROW_PINS { NO_PIN }
 #define MATRIX_COL_PINS { B4, B6, B2, D7, B1, F7, F6, F5, F4 }
diff --git a/keyboards/handwired/m40/5x5_macropad/config.h b/keyboards/handwired/m40/5x5_macropad/config.h
index bbe1ce8345..2061849845 100644
--- a/keyboards/handwired/m40/5x5_macropad/config.h
+++ b/keyboards/handwired/m40/5x5_macropad/config.h
@@ -4,10 +4,6 @@
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 5
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/handwired/macroboard/config.h b/keyboards/handwired/macroboard/config.h
index bf4535f0fd..4063b253b6 100644
--- a/keyboards/handwired/macroboard/config.h
+++ b/keyboards/handwired/macroboard/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 6
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/handwired/magicforce61/config.h b/keyboards/handwired/magicforce61/config.h
index fbd4023269..2518265be6 100644
--- a/keyboards/handwired/magicforce61/config.h
+++ b/keyboards/handwired/magicforce61/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/handwired/magicforce68/config.h b/keyboards/handwired/magicforce68/config.h
index 1567e28fe0..b4c67fbbd7 100644
--- a/keyboards/handwired/magicforce68/config.h
+++ b/keyboards/handwired/magicforce68/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/handwired/marauder/config.h b/keyboards/handwired/marauder/config.h
index 767ebcbf93..608411ef31 100644
--- a/keyboards/handwired/marauder/config.h
+++ b/keyboards/handwired/marauder/config.h
@@ -17,10 +17,6 @@
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 12
-#define MATRIX_COLS 9
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/handwired/mechboards_micropad/config.h b/keyboards/handwired/mechboards_micropad/config.h
index 400a787c02..ac759e6771 100644
--- a/keyboards/handwired/mechboards_micropad/config.h
+++ b/keyboards/handwired/mechboards_micropad/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 4
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/handwired/meck_tkl/config.h b/keyboards/handwired/meck_tkl/config.h
index b86067bb98..06430fffeb 100644
--- a/keyboards/handwired/meck_tkl/config.h
+++ b/keyboards/handwired/meck_tkl/config.h
@@ -4,10 +4,6 @@
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 17
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/handwired/minorca/config.h b/keyboards/handwired/minorca/config.h
index 926807ffbb..1ba390acf9 100644
--- a/keyboards/handwired/minorca/config.h
+++ b/keyboards/handwired/minorca/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
 /* MinOrca PCB default pin-out */
 #define MATRIX_COL_PINS { D4, D6, D7, B4, B5, B6, F7, F6, F5, F4, F1, F0 }
 #define MATRIX_ROW_PINS { B0, B1, B2, B3 }
diff --git a/keyboards/handwired/ms_sculpt_mobile/config.h b/keyboards/handwired/ms_sculpt_mobile/config.h
index e24016938a..27fba0b887 100644
--- a/keyboards/handwired/ms_sculpt_mobile/config.h
+++ b/keyboards/handwired/ms_sculpt_mobile/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 18
-
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
 
diff --git a/keyboards/handwired/mutepad/config.h b/keyboards/handwired/mutepad/config.h
index 1d25a0da98..97ba13cd6a 100644
--- a/keyboards/handwired/mutepad/config.h
+++ b/keyboards/handwired/mutepad/config.h
@@ -4,10 +4,6 @@
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 4
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/handwired/myskeeb/config.h b/keyboards/handwired/myskeeb/config.h
index af5f839f02..37fe773fac 100644
--- a/keyboards/handwired/myskeeb/config.h
+++ b/keyboards/handwired/myskeeb/config.h
@@ -1,11 +1,6 @@
 #pragma once
 
 
-// Key Matrix Size //
-// Rows are Doubled-up
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 7
-
 // Wiring of Each Half
 #define DIODE_DIRECTION COL2ROW
 #define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
diff --git a/keyboards/handwired/nicekey/config.h b/keyboards/handwired/nicekey/config.h
index 19aed0cdaa..f5019df285 100644
--- a/keyboards/handwired/nicekey/config.h
+++ b/keyboards/handwired/nicekey/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 1
-
 #define MATRIX_COL_PINS { C6 }
 #define MATRIX_ROW_PINS { B6 }
 
diff --git a/keyboards/handwired/not_so_minidox/config.h b/keyboards/handwired/not_so_minidox/config.h
index b2067e6ceb..4b86dac984 100644
--- a/keyboards/handwired/not_so_minidox/config.h
+++ b/keyboards/handwired/not_so_minidox/config.h
@@ -18,11 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 6
-
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/handwired/novem/config.h b/keyboards/handwired/novem/config.h
index d94a242a4c..5758bc41c3 100644
--- a/keyboards/handwired/novem/config.h
+++ b/keyboards/handwired/novem/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 3
-#define MATRIX_COLS 3
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/handwired/nozbe_macro/config.h b/keyboards/handwired/nozbe_macro/config.h
index 70cb9e44fd..cdcb6d8732 100644
--- a/keyboards/handwired/nozbe_macro/config.h
+++ b/keyboards/handwired/nozbe_macro/config.h
@@ -18,10 +18,6 @@
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 4
-
 /* key matrix pins */
 #define MATRIX_ROW_PINS \
     { B0 }
diff --git a/keyboards/handwired/numpad20/config.h b/keyboards/handwired/numpad20/config.h
index bfcbc3680b..9c2c66732a 100644
--- a/keyboards/handwired/numpad20/config.h
+++ b/keyboards/handwired/numpad20/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 4
-
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/handwired/obuwunkunubi/spaget/config.h b/keyboards/handwired/obuwunkunubi/spaget/config.h
index 5d9c439903..7743cd6cd6 100644
--- a/keyboards/handwired/obuwunkunubi/spaget/config.h
+++ b/keyboards/handwired/obuwunkunubi/spaget/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 
-/* key matrix size */
-#d