diff --git a/keyboards/adpenrose/shisaku/config.h b/keyboards/adpenrose/shisaku/config.h
index 7371685ca6d..4980749d9fc 100644
--- a/keyboards/adpenrose/shisaku/config.h
+++ b/keyboards/adpenrose/shisaku/config.h
@@ -21,7 +21,6 @@
  */
 #define MATRIX_ROW_PINS { B2, B0, B1, D0, B4, D6, B3, D7 }
 #define MATRIX_COL_PINS { D1, C3, C4, D4, C0, C1, C2 }
-//#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cannonkeys/nearfield/config.h b/keyboards/cannonkeys/nearfield/config.h
index 7d8f9049152..a275a6213c6 100755
--- a/keyboards/cannonkeys/nearfield/config.h
+++ b/keyboards/cannonkeys/nearfield/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* 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 }
-#define UNUSED_PINS { E2, E6, D0, B1, B0 }
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/dumbpad/v1x_oled/config.h b/keyboards/dumbpad/v1x_oled/config.h
index 2dba0c3b145..4b3695096e3 100644
--- a/keyboards/dumbpad/v1x_oled/config.h
+++ b/keyboards/dumbpad/v1x_oled/config.h
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { F4, F5, F6, F7 }
 #define MATRIX_COL_PINS { C6, B1, B3, B2, B6 }
-#define UNUSED_PINS
 
 /* Dual rotary encoders */
 #define ENCODERS_PAD_A { B4, E6 }
diff --git a/keyboards/ferris/0_1/config.h b/keyboards/ferris/0_1/config.h
index 79a74ae9bb8..8d062d9b5f8 100644
--- a/keyboards/ferris/0_1/config.h
+++ b/keyboards/ferris/0_1/config.h
@@ -32,14 +32,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { B3, B2, B1, F0 }
 #define MATRIX_COL_PINS_MCU \
     { D6, D7, B4, B5, B6 }
-#define UNUSED_PINS_MCU \
-    { B0, B7, C6, C7, D2, D3, D4, D5, E6, F1, F4, F5, F6, F7 }
 #define MATRIX_ROW_PINS_MCP \
     { B0, B1, B2, B3 }
 #define MATRIX_COL_PINS_MCP \
     { A0, A1, A2, A3, A4 }
-#define UNUSED_PINS_MCP \
-    { B4, B5, B6, B7, A5, A6, A7 }
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ferris/0_2/config.h b/keyboards/ferris/0_2/config.h
index 5de356f3cf4..b6816b396e5 100644
--- a/keyboards/ferris/0_2/config.h
+++ b/keyboards/ferris/0_2/config.h
@@ -32,14 +32,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { B7, B6, B5, A2 }
 #define MATRIX_COL_PINS_MCU \
     { B8, B4, B3, A15, A14 }
-#define UNUSED_PINS_MCU \
-    { A0, A1, A3, A4, A5, A6, A7, A8, A9, A10, A13, B0, B1, B2, B9, B12, B13, B14, B15, C13, C14, C15, F0, F1 }
 #define MATRIX_ROW_PINS_MCP \
     { B0, B1, B2, B3 }
 #define MATRIX_COL_PINS_MCP \
     { A0, A1, A2, A3, A4 }
-#define UNUSED_PINS_MCP \
-    { B4, B5, B6, B7, A5, A6, A7 }
 
 #define MATRIX_ROW_PINS \
     { B7, B6, B5, A2, A0, A0, A0, A0 }
diff --git a/keyboards/fjlabs/avalon/config.h b/keyboards/fjlabs/avalon/config.h
index 2d2c53c14e1..9975b9a5137 100644
--- a/keyboards/fjlabs/avalon/config.h
+++ b/keyboards/fjlabs/avalon/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // Checked with Eagle Schematic
 #define MATRIX_ROW_PINS { F4, F1, F7, F6, F5 }
 #define MATRIX_COL_PINS { B0, F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6, C6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/fjlabs/peaker/config.h b/keyboards/fjlabs/peaker/config.h
index c7d19f0c6c1..f9f18861430 100644
--- a/keyboards/fjlabs/peaker/config.h
+++ b/keyboards/fjlabs/peaker/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // Checked with Eagle Schematic
 #define MATRIX_ROW_PINS { B5, B6, C0, E1, E0 }
 #define MATRIX_COL_PINS { F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5, A6, A7, D5, D6, D7 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/fjlabs/sinanjuwk/config.h b/keyboards/fjlabs/sinanjuwk/config.h
index 01d81a2f3dc..751dd24383f 100644
--- a/keyboards/fjlabs/sinanjuwk/config.h
+++ b/keyboards/fjlabs/sinanjuwk/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // Checked with Eagle Schematic
 #define MATRIX_ROW_PINS { F4, F1, F7, F6, F5  }
 #define MATRIX_COL_PINS { F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ingrained/config.h b/keyboards/ingrained/config.h
index 7741dde0f71..8fb731efe56 100644
--- a/keyboards/ingrained/config.h
+++ b/keyboards/ingrained/config.h
@@ -21,14 +21,10 @@
     { B0, B1, B2, B3 }
 #define MATRIX_COL_PINS_MCU \
     { F7, F6, F5, F4, F1, F0 }
-#define UNUSED_PINS_MCU \
-    { B4, B5, B6, B7, C6, C7, D2, D3, D4, D5, D6, D7, E6}
 #define MATRIX_ROW_PINS_MCP \
     { B0, B1, B2, B3 }
 #define MATRIX_COL_PINS_MCP \
     { A0, A1, A2, A3, A4, A5 }
-#define UNUSED_PINS_MCP \
-    { B4, B5, B6, B7, A6, A7 }
 
 /*
  * Keyboard Matrix Assignments
diff --git a/keyboards/jkeys_design/gentleman65_se_s/config.h b/keyboards/jkeys_design/gentleman65_se_s/config.h
index f5ecb8f5de9..1676e2e5aec 100644
--- a/keyboards/jkeys_design/gentleman65_se_s/config.h
+++ b/keyboards/jkeys_design/gentleman65_se_s/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 }
 #define MATRIX_COL_PINS { D5, D3, D2, D1, D0, B7, B2, B3, D4, D6, D7, C7, C6, B6, B5, B4 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kegen/gboy/config.h b/keyboards/kegen/gboy/config.h
index 77f9ef3b218..30268122edd 100644
--- a/keyboards/kegen/gboy/config.h
+++ b/keyboards/kegen/gboy/config.h
@@ -27,7 +27,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F1, F4, F5, F6, F7 }
 #define MATRIX_COL_PINS { E2, E6, C6, C7, D7, B6, B5, B4, B3, B2, B1, B0, D4, D6, D5, F0 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/keygem/kg60ansi/config.h b/keyboards/keygem/kg60ansi/config.h
index 6c79d5571c0..3be2c3efeb3 100644
--- a/keyboards/keygem/kg60ansi/config.h
+++ b/keyboards/keygem/kg60ansi/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // Checked with Eagle Schematic
 #define MATRIX_ROW_PINS { F0, F1, F4, F5, F6  }
 #define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, B3, B2, B1 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/keygem/kg65rgbv2/config.h b/keyboards/keygem/kg65rgbv2/config.h
index e62df985c4e..941fef6c08d 100644
--- a/keyboards/keygem/kg65rgbv2/config.h
+++ b/keyboards/keygem/kg65rgbv2/config.h
@@ -37,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // Checked with Eagle Schematic
 #define MATRIX_ROW_PINS { F0, F1, F4, F5, F6  }
 #define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, B3, B2, B1, D1 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/keyten/aperture/config.h b/keyboards/keyten/aperture/config.h
index 27eecf26020..9234382117f 100644
--- a/keyboards/keyten/aperture/config.h
+++ b/keyboards/keyten/aperture/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D1, D0, F7, F5, F6 }
 #define MATRIX_COL_PINS { B7, F0, F1, F4, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kopibeng/mnk65/config.h b/keyboards/kopibeng/mnk65/config.h
index bdabb4af7e5..cab71e82100 100644
--- a/keyboards/kopibeng/mnk65/config.h
+++ b/keyboards/kopibeng/mnk65/config.h
@@ -35,7 +35,6 @@
 
 #define MATRIX_ROW_PINS { B3, D0, F6, F4, F1 }
 #define MATRIX_COL_PINS { B7, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, F5 }
-#define UNUSED_PINS
 
 #define LED_CAPS_LOCK_PIN F0
 
diff --git a/keyboards/linworks/fave104/config.h b/keyboards/linworks/fave104/config.h
index 6a13406eade..e631c079f0a 100644
--- a/keyboards/linworks/fave104/config.h
+++ b/keyboards/linworks/fave104/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B11, B10, B2,  B1,  B0, A7, A6,  A5,  A4,  A3,  A2, A0 }
 #define MATRIX_COL_PINS { B12, B13, B14, B15, A8, A9, A10, A13, A14, A15, B3     }
-#define UNUSED_PINS
 
 #define LED_NUM_LOCK_PIN B6
 #define LED_CAPS_LOCK_PIN B5
diff --git a/keyboards/mechlovin/foundation/config.h b/keyboards/mechlovin/foundation/config.h
index 35145c440b9..7f98028a059 100644
--- a/keyboards/mechlovin/foundation/config.h
+++ b/keyboards/mechlovin/foundation/config.h
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B12, B13, B14, A8, A2 }
 #define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A5, A4, A3, A15, B9, B8, B7, B6, B5, B4, B3}
-#define UNUSED_PINS
 
 /* key matrix size */
 #define MATRIX_ROWS 5
diff --git a/keyboards/mechwild/puckbuddy/config.h b/keyboards/mechwild/puckbuddy/config.h
index 656fa2e7d1e..473b7b5ecdc 100644
--- a/keyboards/mechwild/puckbuddy/config.h
+++ b/keyboards/mechwild/puckbuddy/config.h
@@ -39,7 +39,6 @@
  */
 #define MATRIX_ROW_PINS { B12, B13, B14, B15 }
 #define MATRIX_COL_PINS { B10, A8, B4, B5 }
-#define UNUSED_PINS
 
 /* spi config */
 #define SPI_DRIVER SPID1
diff --git a/keyboards/mokey/ibis80/config.h b/keyboards/mokey/ibis80/config.h
index e70b8b8084b..c6a40383aa9 100644
--- a/keyboards/mokey/ibis80/config.h
+++ b/keyboards/mokey/ibis80/config.h
@@ -22,7 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { B0, B1, B2, E6, F0, F1 }
 #define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/ploopyco/trackball_thumb/rev1_001/config.h b/keyboards/ploopyco/trackball_thumb/rev1_001/config.h
deleted file mode 100644
index dc80d9401eb..00000000000
--- a/keyboards/ploopyco/trackball_thumb/rev1_001/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2021 Colin Lam (Ploopy Corporation)
- * Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- * Copyright 2019 Sunjun Kim
- *
- * 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
-
-// These pins are not broken out, and cannot be used normally.
-// They are set as output and pulled high, by default
-#define UNUSED_PINS \
-    { D1, D3, B4, B7, D6, C7, F6, F5, F3, F7 }
diff --git a/keyboards/ploopyco/trackball_thumb/trackball_thumb.c b/keyboards/ploopyco/trackball_thumb/trackball_thumb.c
index f76d243f18c..123ee571514 100644
--- a/keyboards/ploopyco/trackball_thumb/trackball_thumb.c
+++ b/keyboards/ploopyco/trackball_thumb/trackball_thumb.c
@@ -188,19 +188,6 @@ void keyboard_pre_init_kb(void) {
     setPinInput(OPT_ENC1);
     setPinInput(OPT_ENC2);
 
-    /* Ground all output pins connected to ground. This provides additional
-     * pathways to ground. If you're messing with this, know this: driving ANY
-     * of these pins high will cause a short. On the MCU. Ka-blooey.
-     */
-#ifdef UNUSED_PINS
-    const pin_t unused_pins[] = UNUSED_PINS;
-
-    for (uint8_t i = 0; i < (sizeof(unused_pins) / sizeof(pin_t)); i++) {
-        setPinOutput(unused_pins[i]);
-        writePinLow(unused_pins[i]);
-    }
-#endif
-
     // This is the debug LED.
 #if defined(DEBUG_LED_PIN)
     setPinOutput(DEBUG_LED_PIN);
diff --git a/keyboards/plywrks/lune/config.h b/keyboards/plywrks/lune/config.h
index 065cc52d935..66aad1dc955 100644
--- a/keyboards/plywrks/lune/config.h
+++ b/keyboards/plywrks/lune/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F1, F0, B7, B0, B6, B5, D7, B4, D6 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, D4, D5, D3, D2 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/xelus/valor_frl_tkl/rev2_0/config.h b/keyboards/xelus/valor_frl_tkl/rev2_0/config.h
index 4f42348b567..53064275b12 100644
--- a/keyboards/xelus/valor_frl_tkl/rev2_0/config.h
+++ b/keyboards/xelus/valor_frl_tkl/rev2_0/config.h
@@ -23,7 +23,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { A15, A14, A10, B3, B4 }
 #define MATRIX_COL_PINS { A9, A8, B15, B14, B13, B12, B9, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/xelus/valor_frl_tkl/rev2_1/config.h b/keyboards/xelus/valor_frl_tkl/rev2_1/config.h
index 2ab13507539..fdcbf4ffe3d 100644
--- a/keyboards/xelus/valor_frl_tkl/rev2_1/config.h
+++ b/keyboards/xelus/valor_frl_tkl/rev2_1/config.h
@@ -23,7 +23,6 @@
 /* key matrix pins */
 #define MATRIX_ROW_PINS { A15, A14, A13, B3, B4 }
 #define MATRIX_COL_PINS { A10, A8, B15, B14, B13, B12, B9, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW