diff --git a/keyboards/business_card/beta/beta.c b/keyboards/business_card/beta/beta.c
index b969fba9627..7a9aa1b9bd6 100644
--- a/keyboards/business_card/beta/beta.c
+++ b/keyboards/business_card/beta/beta.c
@@ -14,31 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "beta.h"
-
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-
-/*
-
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-
-  matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-  matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-  // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-  led_set_user(usb_led);
-}
-
-*/
diff --git a/keyboards/business_card/business_card.c b/keyboards/business_card/business_card.c
index cab292dc977..01beb28220f 100644
--- a/keyboards/business_card/business_card.c
+++ b/keyboards/business_card/business_card.c
@@ -14,31 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "business_card.h"
-
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-
-/*
-
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-
-  matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-  matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-  // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-  led_set_user(usb_led);
-}
-
-*/
diff --git a/keyboards/butterstick/butterstick.c b/keyboards/butterstick/butterstick.c
index 66decfc5e18..a0c665a972e 100644
--- a/keyboards/butterstick/butterstick.c
+++ b/keyboards/butterstick/butterstick.c
@@ -14,37 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "butterstick.h"
-
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-
-/*
-
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-
-  matrix_init_user();
-}
-*/
-
-void matrix_scan_kb(void) {
-#ifdef DEBUG_MATRIX
-    for (uint8_t c = 0; c < MATRIX_COLS; c++)
-		for (uint8_t r = 0; r < MATRIX_ROWS; r++)
-		  if (matrix_is_on(r, c)) xprintf("r:%d c:%d \n", r, c);
-#endif
-
-  matrix_scan_user();
-}
-
-/*
-
-void led_set_kb(uint8_t usb_led) {
-  // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-  led_set_user(usb_led);
-}
-
-*/
diff --git a/keyboards/candybar/candybar.c b/keyboards/candybar/candybar.c
index c79e536ccc3..a3c7360c212 100644
--- a/keyboards/candybar/candybar.c
+++ b/keyboards/candybar/candybar.c
@@ -15,7 +15,3 @@
  */
 
 #include "candybar.h"
-
-void matrix_init_kb(void) {
-  matrix_init_user();
-}
diff --git a/keyboards/cannonkeys/satisfaction75/satisfaction75.c b/keyboards/cannonkeys/satisfaction75/satisfaction75.c
index e936a4f40dc..02e8f376880 100644
--- a/keyboards/cannonkeys/satisfaction75/satisfaction75.c
+++ b/keyboards/cannonkeys/satisfaction75/satisfaction75.c
@@ -247,11 +247,6 @@ uint32_t layer_state_set_kb(uint32_t state) {
 }
 
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-    /* FIXME(skullydazed):
-     *     Originally this code always ran no matter what process_record_user() did.
-     *     With this PR it will only run if process_record_user() returns true. We
-     *     should think through the implications here.
-     */
   queue_for_send = true;
   switch (keycode) {
     case OLED_TOGG:
@@ -376,7 +371,6 @@ void matrix_init_kb(void)
   rtcGetTime(&RTCD1, &last_timespec);
   queue_for_send = true;
   backlight_init_ports();
-  matrix_init_user();
 }
 
 
diff --git a/keyboards/cannonkeys/stm32f072/keyboard.c b/keyboards/cannonkeys/stm32f072/keyboard.c
index 0347e939a47..a3b407d715b 100644
--- a/keyboards/cannonkeys/stm32f072/keyboard.c
+++ b/keyboards/cannonkeys/stm32f072/keyboard.c
@@ -74,15 +74,9 @@ void matrix_scan_kb(void)
   #ifdef RGBLIGHT_ENABLE
     rgblight_task();
   #endif
-    matrix_scan_user();
 }
 
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-    /* FIXME(skullydazed):
-     *     Originally this code always ran no matter what process_record_user() did.
-     *     With this PR it will only run if process_record_user() returns true. We
-     *     should think through the implications here.
-     */
   switch (keycode) {
     case BL_INC:
       if (record->event.pressed) {
diff --git a/keyboards/centromere/centromere.c b/keyboards/centromere/centromere.c
index 8800e2ce6ad..e56e56f2cc3 100644
--- a/keyboards/centromere/centromere.c
+++ b/keyboards/centromere/centromere.c
@@ -31,7 +31,6 @@ void led_init(void) {
 void matrix_init_kb(void) {
 	// put your keyboard start-up code here
 	// runs once when the firmware starts up
-	matrix_init_user();
 	uart_init();
 	led_init();
 }
diff --git a/keyboards/centromere/matrix.c b/keyboards/centromere/matrix.c
index c5fc8db6ce9..73068d0f298 100644
--- a/keyboards/centromere/matrix.c
+++ b/keyboards/centromere/matrix.c
@@ -50,12 +50,10 @@ static matrix_row_t matrix[MATRIX_ROWS];
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
diff --git a/keyboards/chimera_ergo/chimera_ergo.c b/keyboards/chimera_ergo/chimera_ergo.c
index 29470f90805..d751499b57b 100644
--- a/keyboards/chimera_ergo/chimera_ergo.c
+++ b/keyboards/chimera_ergo/chimera_ergo.c
@@ -15,17 +15,6 @@ void led_init(void) {
 void matrix_init_kb(void) {
 	// put your keyboard start-up code here
 	// runs once when the firmware starts up
-	matrix_init_user();
 	uart_init();
 	led_init();
 }
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-
-}
diff --git a/keyboards/chimera_ergo/matrix.c b/keyboards/chimera_ergo/matrix.c
index d512a51d973..57e77ea2282 100644
--- a/keyboards/chimera_ergo/matrix.c
+++ b/keyboards/chimera_ergo/matrix.c
@@ -59,12 +59,10 @@ void matrix_scan_quantum(void) {
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
diff --git a/keyboards/chimera_ls/chimera_ls.c b/keyboards/chimera_ls/chimera_ls.c
index 588b02b2d15..e2a2822f958 100644
--- a/keyboards/chimera_ls/chimera_ls.c
+++ b/keyboards/chimera_ls/chimera_ls.c
@@ -15,17 +15,6 @@ void led_init(void) {
 void matrix_init_kb(void) {
 	// put your keyboard start-up code here
 	// runs once when the firmware starts up
-	matrix_init_user();
 	uart_init();
 	led_init();
 }
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-
-}
diff --git a/keyboards/chimera_ls/matrix.c b/keyboards/chimera_ls/matrix.c
index 72fe4413704..12633aaea0f 100644
--- a/keyboards/chimera_ls/matrix.c
+++ b/keyboards/chimera_ls/matrix.c
@@ -64,12 +64,10 @@ void matrix_scan_quantum(void) {
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
diff --git a/keyboards/chimera_ortho/chimera_ortho.c b/keyboards/chimera_ortho/chimera_ortho.c
index 2a602cf2f7c..9af1f6391f7 100644
--- a/keyboards/chimera_ortho/chimera_ortho.c
+++ b/keyboards/chimera_ortho/chimera_ortho.c
@@ -15,17 +15,6 @@ void led_init(void) {
 void matrix_init_kb(void) {
 	// put your keyboard start-up code here
 	// runs once when the firmware starts up
-	matrix_init_user();
 	uart_init();
 	led_init();
 }
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-
-}
diff --git a/keyboards/chimera_ortho/matrix.c b/keyboards/chimera_ortho/matrix.c
index dc38ba74f86..ff157450336 100644
--- a/keyboards/chimera_ortho/matrix.c
+++ b/keyboards/chimera_ortho/matrix.c
@@ -49,12 +49,10 @@ static matrix_row_t matrix[MATRIX_ROWS];
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
diff --git a/keyboards/choco60/choco60.c b/keyboards/choco60/choco60.c
index a9f91d63fd5..eb0d2033c32 100644
--- a/keyboards/choco60/choco60.c
+++ b/keyboards/choco60/choco60.c
@@ -14,31 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "choco60.h"
-
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-
-/*
-
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-
-  matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-  matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-  // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-  led_set_user(usb_led);
-}
-
-*/
diff --git a/keyboards/christmas_tree/christmas_tree.c b/keyboards/christmas_tree/christmas_tree.c
index 04d41c1db33..c03670a3a54 100644
--- a/keyboards/christmas_tree/christmas_tree.c
+++ b/keyboards/christmas_tree/christmas_tree.c
@@ -1,5 +1 @@
 #include "christmas_tree.h"
-
-void matrix_init_kb(void) {
-	matrix_init_user();
-}
diff --git a/keyboards/ckeys/handwire_101/handwire_101.c b/keyboards/ckeys/handwire_101/handwire_101.c
index 06f807c5e61..4833b1be3c8 100755
--- a/keyboards/ckeys/handwire_101/handwire_101.c
+++ b/keyboards/ckeys/handwire_101/handwire_101.c
@@ -1,22 +1 @@
 #include "handwire_101.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-	// Turn status LED on
-	//DDRD |= (1<<6);
-	//PORTD |= (1<<6);
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-	led_set_user(usb_led);
-}
diff --git a/keyboards/ckeys/nakey/nakey.c b/keyboards/ckeys/nakey/nakey.c
index c8e037403af..84c0b03ff66 100644
--- a/keyboards/ckeys/nakey/nakey.c
+++ b/keyboards/ckeys/nakey/nakey.c
@@ -13,23 +13,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "nakey.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
diff --git a/keyboards/ckeys/obelus/obelus.c b/keyboards/ckeys/obelus/obelus.c
index 7706481ee2a..06e302c6af0 100644
--- a/keyboards/ckeys/obelus/obelus.c
+++ b/keyboards/ckeys/obelus/obelus.c
@@ -6,17 +6,4 @@ void matrix_init_kb(void) {
 	// Turn status LED on
 	DDRD |= (1<<6);
 	PORTD |= (1<<6);
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-	led_set_user(usb_led);
 }
diff --git a/keyboards/ckeys/thedora/thedora.c b/keyboards/ckeys/thedora/thedora.c
index d6e22f41f5d..68d0a9af510 100755
--- a/keyboards/ckeys/thedora/thedora.c
+++ b/keyboards/ckeys/thedora/thedora.c
@@ -1,22 +1 @@
 #include "thedora.h"
-
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-  // Turn status LED on
-  //DDRD |= (1<<6);
-  //PORTD |= (1<<6);
-
-  matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-  matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-  // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-  led_set_user(usb_led);
-}
diff --git a/keyboards/claw44/rev1/matrix.c b/keyboards/claw44/rev1/matrix.c
index 718cc574481..80a32239475 100644
--- a/keyboards/claw44/rev1/matrix.c
+++ b/keyboards/claw44/rev1/matrix.c
@@ -65,12 +65,10 @@ static uint8_t matrix_master_scan(void);
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
diff --git a/keyboards/clueboard/17/17.c b/keyboards/clueboard/17/17.c
index 9e8ca644ec4..44b55a323b7 100644
--- a/keyboards/clueboard/17/17.c
+++ b/keyboards/clueboard/17/17.c
@@ -2,16 +2,6 @@
 
 int pwm_level;
 
-void matrix_init_kb(void) {
-    // put your keyboard start-up code here
-    // runs once when the firmware starts up
-    matrix_init_user();
-};
-
-void led_set_kb(uint8_t usb_led) {
-    print("led_set\n");
-}
-
 void backlight_init_ports(void) {
     // Set C7 to output
     DDRC |= (1<<7);
diff --git a/keyboards/clueboard/2x1800/2x1800.c b/keyboards/clueboard/2x1800/2x1800.c
index 89608bd72d9..de5de97e2b5 100644
--- a/keyboards/clueboard/2x1800/2x1800.c
+++ b/keyboards/clueboard/2x1800/2x1800.c
@@ -20,13 +20,6 @@ void matrix_init_kb(void) {
 	DDRB |= (1<<4);  // Numlock
 	DDRB |= (1<<5);  // Capslock
 	DDRB |= (1<<6);  // Scroll Lock
-
-	// Run the keymap level init
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	matrix_scan_user();
 }
 
 void led_set_kb(uint8_t usb_led) {
diff --git a/keyboards/clueboard/60/60.c b/keyboards/clueboard/60/60.c
index aac4e94c3da..90d16613946 100644
--- a/keyboards/clueboard/60/60.c
+++ b/keyboards/clueboard/60/60.c
@@ -14,11 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "60.h"
-
-void matrix_init_kb(void) {
-
-}
-
-void matrix_scan_kb(void) {
-
-}
diff --git a/keyboards/clueboard/66/rev2/rev2.c b/keyboards/clueboard/66/rev2/rev2.c
index d676b6d5fb4..f416249c259 100644
--- a/keyboards/clueboard/66/rev2/rev2.c
+++ b/keyboards/clueboard/66/rev2/rev2.c
@@ -6,15 +6,9 @@
 void matrix_init_kb(void) {
 	// put your keyboard start-up code here
 	// runs once when the firmware starts up
-	matrix_init_user();
 	led_init_ports();
 }
 
-
-void matrix_scan_kb(void) {
-    matrix_scan_user();
-}
-
 void backlight_init_ports(void) {
     print("init_backlight_pin()\n");
     // Set our LED pins as output
diff --git a/keyboards/clueboard/66/rev3/rev3.c b/keyboards/clueboard/66/rev3/rev3.c
index 195a21a9e88..de6ef64e2f3 100644
--- a/keyboards/clueboard/66/rev3/rev3.c
+++ b/keyboards/clueboard/66/rev3/rev3.c
@@ -6,15 +6,9 @@
 void matrix_init_kb(void) {
     // put your keyboard start-up code here
     // runs once when the firmware starts up
-    matrix_init_user();
     led_init_ports();
 }
 
-
-void matrix_scan_kb(void) {
-    matrix_scan_user();
-}
-
 void backlight_init_ports(void) {
     print("init_backlight_pin()\n");
     // Set our LED pins as output
diff --git a/keyboards/clueboard/66/rev4/rev4.c b/keyboards/clueboard/66/rev4/rev4.c
index 041c31cd322..efe7e96a3f6 100644
--- a/keyboards/clueboard/66/rev4/rev4.c
+++ b/keyboards/clueboard/66/rev4/rev4.c
@@ -4,14 +4,9 @@
 void matrix_init_kb(void) {
     // put your keyboard start-up code here
     // runs once when the firmware starts up
-    matrix_init_user();
     led_init_ports();
 }
 
-void matrix_scan_kb(void) {
-    matrix_scan_user();
-}
-
 void backlight_init_ports(void) {
     print("init_backlight_pin()\n");
     // Set our LED pins as output
diff --git a/keyboards/clueboard/66_hotswap/gen1/matrix.c b/keyboards/clueboard/66_hotswap/gen1/matrix.c
index 05386215eda..ceb95bc9987 100644
--- a/keyboards/clueboard/66_hotswap/gen1/matrix.c
+++ b/keyboards/clueboard/66_hotswap/gen1/matrix.c
@@ -28,12 +28,10 @@ void matrix_scan_user(void) {}
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-  matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-  matrix_scan_user();
 }
 
 void matrix_init(void) {
diff --git a/keyboards/clueboard/66_hotswap/prototype/prototype.c b/keyboards/clueboard/66_hotswap/prototype/prototype.c
index 7c307be61ac..62fb037ba1b 100644
--- a/keyboards/clueboard/66_hotswap/prototype/prototype.c
+++ b/keyboards/clueboard/66_hotswap/prototype/prototype.c
@@ -6,15 +6,9 @@
 void matrix_init_kb(void) {
 	// put your keyboard start-up code here
 	// runs once when the firmware starts up
-	matrix_init_user();
 	led_init_ports();
 }
 
-
-void matrix_scan_kb(void) {
-    matrix_scan_user();
-}
-
 void backlight_init_ports(void) {
     print("init_backlight_pin()\n");
     // Set our LED pins as output
diff --git a/keyboards/clueboard/card/card.c b/keyboards/clueboard/card/card.c
index 953656d6f13..8a15d4240c6 100644
--- a/keyboards/clueboard/card/card.c
+++ b/keyboards/clueboard/card/card.c
@@ -3,26 +3,6 @@
 #define BL_GREEN OCR1A
 #define BL_BLUE OCR1C
 
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
-
 void backlight_init_ports(void)
 {
 	// Set B5, B6, and B7 as output
diff --git a/keyboards/cocoa40/cocoa40.c b/keyboards/cocoa40/cocoa40.c
index d2f42f951a5..fdc9f9c0eac 100644
--- a/keyboards/cocoa40/cocoa40.c
+++ b/keyboards/cocoa40/cocoa40.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "cocoa40.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
diff --git a/keyboards/comet46/comet46.c b/keyboards/comet46/comet46.c
index 0710b8e330d..f197b8a8541 100644
--- a/keyboards/comet46/comet46.c
+++ b/keyboards/comet46/comet46.c
@@ -5,18 +5,5 @@ void uart_init(void) {
 }
 
 void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-	matrix_init_user();
 	uart_init();
 }
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-
-}
diff --git a/keyboards/comet46/matrix.c b/keyboards/comet46/matrix.c
index dc38ba74f86..ff157450336 100644
--- a/keyboards/comet46/matrix.c
+++ b/keyboards/comet46/matrix.c
@@ -49,12 +49,10 @@ static matrix_row_t matrix[MATRIX_ROWS];
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
diff --git a/keyboards/converter/adb_usb/matrix.c b/keyboards/converter/adb_usb/matrix.c
index 4a70eb50213..8bcccd77196 100644
--- a/keyboards/converter/adb_usb/matrix.c
+++ b/keyboards/converter/adb_usb/matrix.c
@@ -40,12 +40,10 @@ static void register_key(uint8_t key);
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
diff --git a/keyboards/converter/hp_46010a/matrix.c b/keyboards/converter/hp_46010a/matrix.c
index ac9224087f0..52f73f2e95d 100644
--- a/keyboards/converter/hp_46010a/matrix.c
+++ b/keyboards/converter/hp_46010a/matrix.c
@@ -62,12 +62,10 @@ void matrix_scan_quantum(void) {
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {    
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
@@ -241,4 +239,4 @@ uint8_t matrix_cols(void) {
 // the online ducmentation starting from : 
 // https://docs.qmk.fm/#/config_options
 // https://docs.qmk.fm/#/understanding_qmk
-// and probably a few i forgot....
\ No newline at end of file
+// and probably a few i forgot....
diff --git a/keyboards/converter/ibm_5291/matrix.c b/keyboards/converter/ibm_5291/matrix.c
index 8b2dba7ab6f..a1ba767d36a 100644
--- a/keyboards/converter/ibm_5291/matrix.c
+++ b/keyboards/converter/ibm_5291/matrix.c
@@ -196,12 +196,10 @@ void matrix_scan_quantum(void) {
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {    
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
diff --git a/keyboards/converter/m0110_usb/matrix.c b/keyboards/converter/m0110_usb/matrix.c
index 098f9de0ff9..41d1064f57b 100644
--- a/keyboards/converter/m0110_usb/matrix.c
+++ b/keyboards/converter/m0110_usb/matrix.c
@@ -49,12 +49,10 @@ static void register_key(uint8_t key);
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
@@ -118,4 +116,4 @@ static void register_key(uint8_t key)
     } else {
         matrix[ROW(key)] |=  (1<<COL(key));
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/converter/modelm101/modelm101.c b/keyboards/converter/modelm101/modelm101.c
index 4af8ea31206..3f723b81bbd 100644
--- a/keyboards/converter/modelm101/modelm101.c
+++ b/keyboards/converter/modelm101/modelm101.c
@@ -25,20 +25,6 @@ void keyboard_pre_init_kb(void) {
   writePinHigh(B6);
 }
 
-void matrix_init_kb(void) {
-  /* put your keyboard start-up code here
-   * runs once when the firmware starts up */
-
-  matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-  /* put your looping keyboard code here
-   * runs every cycle (a lot) */
-
-  matrix_scan_user();
-}
-
 void led_set_kb(uint8_t usb_led) {
   if (usb_led & (1<<USB_LED_NUM_LOCK)) {
     writePinLow(B4);
@@ -55,6 +41,4 @@ void led_set_kb(uint8_t usb_led) {
   } else {
     writePinHigh(B5);
   }
-
-  led_set_user(usb_led);
 }
diff --git a/keyboards/converter/numeric_keypad_IIe/numeric_keypad_IIe.c b/keyboards/converter/numeric_keypad_IIe/numeric_keypad_IIe.c
index 341eea8e49c..a2f8a5bd6e8 100644
--- a/keyboards/converter/numeric_keypad_IIe/numeric_keypad_IIe.c
+++ b/keyboards/converter/numeric_keypad_IIe/numeric_keypad_IIe.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "numeric_keypad_IIe.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
diff --git a/keyboards/converter/palm_usb/matrix.c b/keyboards/converter/palm_usb/matrix.c
index 49212f2ef14..3d27dd66091 100644
--- a/keyboards/converter/palm_usb/matrix.c
+++ b/keyboards/converter/palm_usb/matrix.c
@@ -63,12 +63,10 @@ static bool is_modified = false;
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
diff --git a/keyboards/converter/siemens_tastatur/matrix.c b/keyboards/converter/siemens_tastatur/matrix.c
index 9fcfe9fdf45..f73f9626343 100644
--- a/keyboards/converter/siemens_tastatur/matrix.c
+++ b/keyboards/converter/siemens_tastatur/matrix.c
@@ -231,12 +231,10 @@ void matrix_print(void)
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
diff --git a/keyboards/converter/siemens_tastatur/siemens_tastatur.c b/keyboards/converter/siemens_tastatur/siemens_tastatur.c
index d182d72cce1..21d00c8c30e 100644
--- a/keyboards/converter/siemens_tastatur/siemens_tastatur.c
+++ b/keyboards/converter/siemens_tastatur/siemens_tastatur.c
@@ -15,24 +15,3 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "siemens_tastatur.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
-
diff --git a/keyboards/converter/sun_usb/matrix.c b/keyboards/converter/sun_usb/matrix.c
index c379e8237c9..3343d1c51c2 100644
--- a/keyboards/converter/sun_usb/matrix.c
+++ b/keyboards/converter/sun_usb/matrix.c
@@ -42,12 +42,10 @@ static bool is_modified = false;
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
diff --git a/keyboards/converter/usb_usb/custom_matrix.cpp b/keyboards/converter/usb_usb/custom_matrix.cpp
index 296f7fcd026..01ce3569ad7 100644
--- a/keyboards/converter/usb_usb/custom_matrix.cpp
+++ b/keyboards/converter/usb_usb/custom_matrix.cpp
@@ -118,7 +118,6 @@ extern "C"
 
     __attribute__ ((weak))
     void matrix_init_kb(void) {
-        matrix_init_user();
     }
 
     __attribute__ ((weak))
@@ -127,7 +126,6 @@ extern "C"
 
     __attribute__ ((weak))
     void matrix_scan_kb(void) {
-        matrix_scan_user();
     }
 
     __attribute__ ((weak))
diff --git a/keyboards/converter/xt_usb/matrix.c b/keyboards/converter/xt_usb/matrix.c
index d48f1a887f5..c79c834d3f5 100644
--- a/keyboards/converter/xt_usb/matrix.c
+++ b/keyboards/converter/xt_usb/matrix.c
@@ -35,12 +35,10 @@ static uint8_t matrix[MATRIX_ROWS];
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
diff --git a/keyboards/coseyfannitutti/mullet/mullet.c b/keyboards/coseyfannitutti/mullet/mullet.c
index 4f451f3dbb1..18445a6c937 100644
--- a/keyboards/coseyfannitutti/mullet/mullet.c
+++ b/keyboards/coseyfannitutti/mullet/mullet.c
@@ -14,10 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "mullet.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
diff --git a/keyboards/coseyfannitutti/mulletpad/mulletpad.c b/keyboards/coseyfannitutti/mulletpad/mulletpad.c
index be335cc547c..72bb19c3036 100644
--- a/keyboards/coseyfannitutti/mulletpad/mulletpad.c
+++ b/keyboards/coseyfannitutti/mulletpad/mulletpad.c
@@ -14,10 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "mulletpad.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
diff --git a/keyboards/crkbd/rev1/matrix.c b/keyboards/crkbd/rev1/matrix.c
index 9d86879d6c8..b33d52a2e33 100644
--- a/keyboards/crkbd/rev1/matrix.c
+++ b/keyboards/crkbd/rev1/matrix.c
@@ -65,12 +65,10 @@ static uint8_t matrix_master_scan(void);
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
diff --git a/keyboards/crkbd/rev1/rev1.c b/keyboards/crkbd/rev1/rev1.c
index b26292af5bf..221a0b3ad88 100644
--- a/keyboards/crkbd/rev1/rev1.c
+++ b/keyboards/crkbd/rev1/rev1.c
@@ -68,9 +68,6 @@ led_config_t g_led_config = { {
 } };
 #endif
 
-__attribute__((weak))
-void matrix_init_user(void) {}
-
 void matrix_init_kb(void) {
 
 #ifdef RGB_MATRIX_ENABLE
@@ -105,5 +102,4 @@ void matrix_init_kb(void) {
         } };
     }
 #endif
-    matrix_init_user();
 }
diff --git a/keyboards/cu75/cu75.c b/keyboards/cu75/cu75.c
index 14b163d6b92..58761f7899f 100644
--- a/keyboards/cu75/cu75.c
+++ b/keyboards/cu75/cu75.c
@@ -22,8 +22,6 @@ void matrix_init_kb(void)
 {
     // put your keyboard start-up code here
     // runs once when the firmware starts up
-    matrix_init_user();
-
 #ifdef AUDIO_ENABLE
     audio_init();
     PLAY_NOTE_ARRAY(test_sound, false, STACCATO);
@@ -69,7 +67,6 @@ void matrix_scan_kb(void)
         twi_last_ready++;
     }
 #endif
-    matrix_scan_user();
 }
 
 void click(uint16_t freq, uint16_t duration){
@@ -86,11 +83,6 @@ void click(uint16_t freq, uint16_t duration){
 
 bool process_record_kb(uint16_t keycode, keyrecord_t* record)
 {
-    /* FIXME(skullydazed):
-     *     Originally this code always ran no matter what process_record_user() did.
-     *     With this PR it will only run if process_record_user() returns true. We
-     *     should think through the implications here.
-     */
     // Test code that turns on the switch led for the key that is pressed
     // set_backlight_by_keymap(record->event.key.col, record->event.key.row);
     if (click_toggle && record->event.pressed){
@@ -168,13 +160,6 @@ void reset_keyboard_kb(){
     reset_keyboard();
 }
 
-void led_set_kb(uint8_t usb_led)
-{
-    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-    led_set_user(usb_led);
-}
-
 // LFK lighting info
 const uint8_t switch_matrices[] = {0, 1};
 const uint8_t rgb_matrices[] = {6, 7};
diff --git a/keyboards/cutie_club/wraith/wraith.c b/keyboards/cutie_club/wraith/wraith.c
index 9b25a47ebf2..ece508a28ee 100644
--- a/keyboards/cutie_club/wraith/wraith.c
+++ b/keyboards/cutie_club/wraith/wraith.c
@@ -22,11 +22,6 @@
 void matrix_init_kb(void) {
   setPinOutput(B3);
   setPinOutput(B0);
-  matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-  matrix_scan_user();
 }
 
 void led_set_kb(uint8_t usb_led) {
@@ -35,5 +30,4 @@ void led_set_kb(uint8_t usb_led) {
     } else {
         writePinHigh(B3);
     }
-  led_set_user(usb_led);
 }
diff --git a/keyboards/dc01/arrow/arrow.c b/keyboards/dc01/arrow/arrow.c
index 7fe6b9ba08d..b3ed4ede764 100644
--- a/keyboards/dc01/arrow/arrow.c
+++ b/keyboards/dc01/arrow/arrow.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "arrow.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
diff --git a/keyboards/dc01/arrow/matrix.c b/keyboards/dc01/arrow/matrix.c
index 1823138c39d..a383911988a 100644
--- a/keyboards/dc01/arrow/matrix.c
+++ b/keyboards/dc01/arrow/matrix.c
@@ -103,12 +103,10 @@ void matrix_scan_quantum(void) {
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
@@ -401,4 +399,4 @@ void matrix_setup(void){
         i2c_slave_init(SLAVE_I2C_ADDRESS); //setup address of slave i2c
         sei(); //enable interupts
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/dc01/left/left.c b/keyboards/dc01/left/left.c
index 2eb48f917ec..b10121705db 100644
--- a/keyboards/dc01/left/left.c
+++ b/keyboards/dc01/left/left.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "left.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
diff --git a/keyboards/dc01/left/matrix.c b/keyboards/dc01/left/matrix.c
index 0e7b591f82c..37672ec2f2b 100644
--- a/keyboards/dc01/left/matrix.c
+++ b/keyboards/dc01/left/matrix.c
@@ -109,12 +109,10 @@ void matrix_scan_quantum(void) {
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
@@ -461,4 +459,4 @@ i2c_status_t i2c_transaction(uint8_t address, uint32_t mask, uint8_t col_offset)
 
     i2c_stop();
     return 0;
-}
\ No newline at end of file
+}
diff --git a/keyboards/dc01/numpad/matrix.c b/keyboards/dc01/numpad/matrix.c
index f8b725adc28..b3290d4457c 100644
--- a/keyboards/dc01/numpad/matrix.c
+++ b/keyboards/dc01/numpad/matrix.c
@@ -103,12 +103,10 @@ void matrix_scan_quantum(void) {
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
@@ -401,4 +399,4 @@ void matrix_setup(void){
         i2c_slave_init(SLAVE_I2C_ADDRESS); //setup address of slave i2c
         sei(); //enable interupts
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/dc01/numpad/numpad.c b/keyboards/dc01/numpad/numpad.c
index b59e192534b..2599f6320a5 100644
--- a/keyboards/dc01/numpad/numpad.c
+++ b/keyboards/dc01/numpad/numpad.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "numpad.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
diff --git a/keyboards/dc01/right/matrix.c b/keyboards/dc01/right/matrix.c
index 6ec3a3b7231..323c190291d 100644
--- a/keyboards/dc01/right/matrix.c
+++ b/keyboards/dc01/right/matrix.c
@@ -103,12 +103,10 @@ void matrix_scan_quantum(void) {
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
@@ -401,4 +399,4 @@ void matrix_setup(void){
         i2c_slave_init(SLAVE_I2C_ADDRESS); //setup address of slave i2c
         sei(); //enable interupts
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/dc01/right/right.c b/keyboards/dc01/right/right.c
index 24e7c6da240..bbb1d568cd0 100644
--- a/keyboards/dc01/right/right.c
+++ b/keyboards/dc01/right/right.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "right.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
diff --git a/keyboards/dichotomy/dichotomy.c b/keyboards/dichotomy/dichotomy.c
index 41e12090cbd..881f1818498 100755
--- a/keyboards/dichotomy/dichotomy.c
+++ b/keyboards/dichotomy/dichotomy.c
@@ -73,7 +73,6 @@ void led_init(void) {
 void matrix_init_kb(void) {
 	// put your keyboard start-up code here
 	// runs once when the firmware starts up
-	matrix_init_user();
 	uart_init();
 	led_init();
 }
@@ -81,7 +80,6 @@ void matrix_init_kb(void) {
 void matrix_scan_kb(void) {
 	// put your looping keyboard code here
 	// runs every cycle (a lot)
-	matrix_scan_user();
 }
 
 void led_set_kb(uint8_t usb_led) {
diff --git a/keyboards/dichotomy/matrix.c b/keyboards/dichotomy/matrix.c
index f14c9012882..60bfd223be7 100755
--- a/keyboards/dichotomy/matrix.c
+++ b/keyboards/dichotomy/matrix.c
@@ -65,12 +65,10 @@ void matrix_scan_quantum(void) {
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
diff --git a/keyboards/dk60/dk60.c b/keyboards/dk60/dk60.c
index 8b9dc547d4e..1ce94ed6b37 100644
--- a/keyboards/dk60/dk60.c
+++ b/keyboards/dk60/dk60.c
@@ -21,8 +21,6 @@ void dk60_blink_all_leds(void)
 void matrix_init_kb(void) {
     led_init_ports();
     dk60_blink_all_leds();
-
-    matrix_init_user();
 }
 
 void led_init_ports(void) {
@@ -39,6 +37,4 @@ void led_set_kb(uint8_t usb_led) {
 		// Turn capslock off
 		dk60_caps_led_off();
 	}
-
-	led_set_user(usb_led);
 }
diff --git a/keyboards/do60/do60.c b/keyboards/do60/do60.c
index c1e509c5db7..b940f318b81 100644
--- a/keyboards/do60/do60.c
+++ b/keyboards/do60/do60.c
@@ -13,17 +13,10 @@ extern inline void setdefaultrgb(void);
 void matrix_init_kb(void) {
   // Keyboard start-up code goes here
   // Runs once when the firmware starts up
-  matrix_init_user();
   led_init_ports();
   setdefaultrgb();
 };
 
-void matrix_scan_kb(void) {
-  // Looping keyboard code goes here
-  // This runs every cycle (a lot)
-  matrix_scan_user();
-};
-
 void led_init_ports(void) {
   // Set caps lock LED pin as output
   DDRB |= (1 << 2);
@@ -38,8 +31,6 @@ void led_set_kb(uint8_t usb_led) {
 	//	do60_caps_led_off();
 	//}
 
-	//led_set_user(usb_led);
-
 	if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
         // Turn capslock on
         PORTB &= ~(1<<2);
diff --git a/keyboards/donutcables/scrabblepad/scrabblepad.c b/keyboards/donutcables/scrabblepad/scrabblepad.c
index ff6ee4932e7..8933be40da7 100644
--- a/keyboards/donutcables/scrabblepad/scrabblepad.c
+++ b/keyboards/donutcables/scrabblepad/scrabblepad.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "scrabblepad.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
diff --git a/keyboards/doro67/multi/multi.c b/keyboards/doro67/multi/multi.c
index f9fdb3bdb4a..3ab1f53653b 100644
--- a/keyboards/doro67/multi/multi.c
+++ b/keyboards/doro67/multi/multi.c
@@ -14,30 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "multi.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-    setPinOutput(E6);
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
-		writePinLow(E6);
-	} else {
-		writePinHigh(E6);
-	}
-
-	led_set_user(usb_led);
-}
diff --git a/keyboards/doro67/regular/regular.c b/keyboards/doro67/regular/regular.c
index d4679a9edee..f5655c0b030 100644
--- a/keyboards/doro67/regular/regular.c
+++ b/keyboards/doro67/regular/regular.c
@@ -16,25 +16,16 @@
 #include "regular.h"
 
 void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-  setPinOutput(E6);
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
+    // put your keyboard start-up code here
+    // runs once when the firmware starts up
+    setPinOutput(E6);
 }
 
 void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-  if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
-    writePinLow(E6);
-  } else {
-    writePinHigh(E6);
-  }
-	led_set_user(usb_led);
+    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
+    if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
+        writePinLow(E6);
+    } else {
+        writePinHigh(E6);
+    }
 }
diff --git a/keyboards/doro67/rgb/rgb.c b/keyboards/doro67/rgb/rgb.c
index b0fc7acf72f..fa2559a0815 100644
--- a/keyboards/doro67/rgb/rgb.c
+++ b/keyboards/doro67/rgb/rgb.c
@@ -26,14 +26,6 @@ void matrix_init_kb(void) {
   // put your keyboard start-up code here
   // runs once when the firmware starts up
   setPinOutput(E6);
-  matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-  matrix_scan_user();
 }
 
 void led_set_kb(uint8_t usb_led) {
@@ -43,7 +35,6 @@ void led_set_kb(uint8_t usb_led) {
   } else {
     writePinHigh(E6);
   }
-	led_set_user(usb_led);
 }
 
 led_config_t g_led_config = { {
diff --git a/keyboards/dozen0/dozen0.c b/keyboards/dozen0/dozen0.c
index e209225fde5..42872a2105d 100644
--- a/keyboards/dozen0/dozen0.c
+++ b/keyboards/dozen0/dozen0.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "dozen0.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
diff --git a/keyboards/dp60/matrix.c b/keyboards/dp60/matrix.c
index 3aa5925fe63..08558e35133 100644
--- a/keyboards/dp60/matrix.c
+++ b/keyboards/dp60/matrix.c
@@ -15,13 +15,11 @@ static void select_col(uint8_t col);
 __attribute__ ((weak))
 void matrix_init_kb(void)
 {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void)
 {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
@@ -242,4 +240,4 @@ static void select_col(uint8_t col) {
           writePinHigh(D5);
           break;
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/duck/eagle_viper/v2/matrix.c b/keyboards/duck/eagle_viper/v2/matrix.c
index 0964493ac6c..dcbb56fee7c 100644
--- a/keyboards/duck/eagle_viper/v2/matrix.c
+++ b/keyboards/duck/eagle_viper/v2/matrix.c
@@ -36,12 +36,10 @@ static void select_col(uint8_t col);
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
diff --git a/keyboards/duck/jetfire/matrix.c b/keyboards/duck/jetfire/matrix.c
index 2dd94a72ac0..0852ecf2ffd 100644
--- a/keyboards/duck/jetfire/matrix.c
+++ b/keyboards/duck/jetfire/matrix.c
@@ -34,12 +34,10 @@ static void select_col(uint8_t col);
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
@@ -274,4 +272,4 @@ static void select_col(uint8_t col)
             PORTB |= 0b00000001;
             break;
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/duck/lightsaver/matrix.c b/keyboards/duck/lightsaver/matrix.c
index 066452724f1..61a9fc292aa 100644
--- a/keyboards/duck/lightsaver/matrix.c
+++ b/keyboards/duck/lightsaver/matrix.c
@@ -37,12 +37,10 @@ static void select_col(uint8_t col);
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
diff --git a/keyboards/duck/octagon/v1/matrix.c b/keyboards/duck/octagon/v1/matrix.c
index a2bea865bc3..dc068cacd26 100644
--- a/keyboards/duck/octagon/v1/matrix.c
+++ b/keyboards/duck/octagon/v1/matrix.c
@@ -36,12 +36,10 @@ static void select_col(uint8_t col);
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
diff --git a/keyboards/duck/octagon/v2/matrix.c b/keyboards/duck/octagon/v2/matrix.c
index 25d1e45b051..d6e78469ff7 100644
--- a/keyboards/duck/octagon/v2/matrix.c
+++ b/keyboards/duck/octagon/v2/matrix.c
@@ -36,12 +36,10 @@ static void select_col(uint8_t col);
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
diff --git a/keyboards/duck/orion/v3/matrix.c b/keyboards/duck/orion/v3/matrix.c
index 84673bd44f0..6288a01db94 100644
--- a/keyboards/duck/orion/v3/matrix.c
+++ b/keyboards/duck/orion/v3/matrix.c
@@ -30,12 +30,10 @@ static void select_col(uint8_t col);
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
diff --git a/keyboards/dumbpad/dumbpad.c b/keyboards/dumbpad/dumbpad.c
index e22f04f55a5..6d6bbb1557b 100644
--- a/keyboards/dumbpad/dumbpad.c
+++ b/keyboards/dumbpad/dumbpad.c
@@ -19,8 +19,6 @@ void keyboard_pre_init_kb(void) {
   // Set the layer LED IO as outputs
   setPinOutput(LAYER_INDICATOR_LED_0);
   setPinOutput(LAYER_INDICATOR_LED_1);
-  
-  keyboard_pre_init_user();
 }
 
 void shutdown_user() {
@@ -58,19 +56,4 @@ void matrix_init_kb(void) {
     writePin(LAYER_INDICATOR_LED_1, false);
     wait_ms(100);
   }
-
-  matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-  matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-  // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-  led_set_user(usb_led);
 }
diff --git a/keyboards/dz60/dz60.c b/keyboards/dz60/dz60.c
index 8295fb432c7..09a524844f2 100644
--- a/keyboards/dz60/dz60.c
+++ b/keyboards/dz60/dz60.c
@@ -4,16 +4,9 @@
 void matrix_init_kb(void) {
   // Keyboard start-up code goes here
   // Runs once when the firmware starts up
-  matrix_init_user();
   led_init_ports();
 };
 
-void matrix_scan_kb(void) {
-  // Looping keyboard code goes here
-  // This runs every cycle (a lot)
-  matrix_scan_user();
-};
-
 void led_init_ports(void) {
   // Set caps lock LED pin as output
   DDRB |= (1 << 2);
@@ -27,6 +20,4 @@ void led_set_kb(uint8_t usb_led) {
     } else {
         PORTB |= (1 << 2);
     }
-
-    led_set_user(usb_led);
 }
diff --git a/keyboards/efreet/efreet.c b/keyboards/efreet/efreet.c
index f76f30dde48..52befb6b11e 100644
--- a/keyboards/efreet/efreet.c
+++ b/keyboards/efreet/efreet.c
@@ -14,31 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "efreet.h"
-
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-
-/*
-
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-
-  matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-  matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-  // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-  led_set_user(usb_led);
-}
-
-*/
diff --git a/keyboards/ep/40/40.c b/keyboards/ep/40/40.c
index fd9b2ef1c44..fad78a79417 100644
--- a/keyboards/ep/40/40.c
+++ b/keyboards/ep/40/40.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "40.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
diff --git a/keyboards/ep/96/96.c b/keyboards/ep/96/96.c
index 204e91bef71..70b48aa4114 100644
--- a/keyboards/ep/96/96.c
+++ b/keyboards/ep/96/96.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "96.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
diff --git a/keyboards/ep/comsn/hs68/hs68.c b/keyboards/ep/comsn/hs68/hs68.c
index 08a1f964a14..16595739c01 100644
--- a/keyboards/ep/comsn/hs68/hs68.c
+++ b/keyboards/ep/comsn/hs68/hs68.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "hs68.h"
-
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-
-  matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-  matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-  // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-  led_set_user(usb_led);
-}
diff --git a/keyboards/ep/comsn/mollydooker/mollydooker.c b/keyboards/ep/comsn/mollydooker/mollydooker.c
index d54f636122d..3657ac96428 100644
--- a/keyboards/ep/comsn/mollydooker/mollydooker.c
+++ b/keyboards/ep/comsn/mollydooker/mollydooker.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "mollydooker.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
diff --git a/keyboards/ep/comsn/tf_longeboye/tf__longeboye.c b/keyboards/ep/comsn/tf_longeboye/tf__longeboye.c
index fc4415672df..ee8db1e523a 100644
--- a/keyboards/ep/comsn/tf_longeboye/tf__longeboye.c
+++ b/keyboards/ep/comsn/tf_longeboye/tf__longeboye.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "tf_longeboye.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
diff --git a/keyboards/ergodash/rev1/rev1.c b/keyboards/ergodash/rev1/rev1.c
index 5e787921cbb..92780e68922 100644
--- a/keyboards/ergodash/rev1/rev1.c
+++ b/keyboards/ergodash/rev1/rev1.c
@@ -5,13 +5,6 @@
     float tone_goodbye[][2] = SONG(GOODBYE_SOUND);
 #endif
 
-#ifdef SSD1306OLED
-void led_set_kb(uint8_t usb_led) {
-    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-    led_set_user(usb_led);
-}
-#endif
-
 void matrix_init_kb(void) {
 
     #ifdef AUDIO_ENABLE
@@ -26,8 +19,6 @@ void matrix_init_kb(void) {
     // // orange led on
     // DDRB |= (1<<0);
     // PORTB &= ~(1<<0);
-
-	matrix_init_user();
 };
 
 void shutdown_user(void) {
diff --git a/keyboards/ergodone/ergodone.c b/keyboards/ergodone/ergodone.c
index e0579408e56..b297d2936b6 100644
--- a/keyboards/ergodone/ergodone.c
+++ b/keyboards/ergodone/ergodone.c
@@ -20,7 +20,6 @@ void ergodox_blink_all_leds(void);
 void matrix_init_kb(void) {
   ergodox_led_init();
   ergodox_blink_all_leds();
-  matrix_init_user();
 }
 
 void ergodox_led_init(void)
diff --git a/keyboards/ergodone/matrix.c b/keyboards/ergodone/matrix.c
index 456f73c954d..60a045aeb2a 100644
--- a/keyboards/ergodone/matrix.c
+++ b/keyboards/ergodone/matrix.c
@@ -46,12 +46,10 @@ void matrix_scan_user(void) {}
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-  matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-  matrix_scan_user();
 }
 
 inline
diff --git a/keyboards/ergodox_ez/ergodox_ez.c b/keyboards/ergodox_ez/ergodox_ez.c
index 6a0fe84e3b5..c929dbde5f3 100644
--- a/keyboards/ergodox_ez/ergodox_ez.c
+++ b/keyboards/ergodox_ez/ergodox_ez.c
@@ -56,8 +56,6 @@ void matrix_init_kb(void) {
 #endif
 
     ergodox_blink_all_leds();
-
-    matrix_init_user();
 }
 
 void ergodox_blink_all_leds(void)
@@ -330,18 +328,12 @@ void suspend_power_down_kb(void) {
 #ifdef ORYX_CONFIGURATOR
 void keyboard_post_init_kb(void) {
     rgb_matrix_enable_noeeprom();
-    keyboard_post_init_user();
 }
 #endif
 #endif
 
 #ifdef ORYX_CONFIGURATOR
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-    /* FIXME(skullydazed):
-     *     Originally this code always ran no matter what process_record_user() did.
-     *     With this PR it will only run if process_record_user() returns true. We
-     *     should think through the implications here.
-     */
     switch (keycode) {
         case LED_LEVEL:
             if (record->event.pressed) {
@@ -392,5 +384,4 @@ void eeconfig_init_kb(void) {  // EEPROM is getting reset!
     keyboard_config.led_level = 4;
     keyboard_config.rgb_matrix_enable = true;
     eeconfig_update_kb(keyboard_config.raw);
-    eeconfig_init_user();
 }
diff --git a/keyboards/ergodox_ez/matrix.c b/keyboards/ergodox_ez/matrix.c
index 28dc37a0992..9378f706b87 100644
--- a/keyboards/ergodox_ez/matrix.c
+++ b/keyboards/ergodox_ez/matrix.c
@@ -60,9 +60,9 @@ __attribute__((weak)) void matrix_init_user(void) {}
 
 __attribute__((weak)) void matrix_scan_user(void) {}
 
-__attribute__((weak)) void matrix_init_kb(void) { matrix_init_user(); }
+__attribute__((weak)) void matrix_init_kb(void) {}
 
-__attribute__((weak)) void matrix_scan_kb(void) { matrix_scan_user(); }
+__attribute__((weak)) void matrix_scan_kb(void) {}
 
 inline uint8_t matrix_rows(void) { return MATRIX_ROWS; }
 
diff --git a/keyboards/ergodox_infinity/ergodox_infinity.c b/keyboards/ergodox_infinity/ergodox_infinity.c
index 9fda7991f13..9a316615ef4 100644
--- a/keyboards/ergodox_infinity/ergodox_infinity.c
+++ b/keyboards/ergodox_infinity/ergodox_infinity.c
@@ -109,23 +109,12 @@ void matrix_scan_user(void) {
 
 
 void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
 	// The backlight always has to be initialized, otherwise it will stay lit
 #ifndef VISUALIZER_ENABLE
 	lcd_backlight_hal_init();
 #endif
 }
 
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
 bool is_keyboard_master(void) {
     return is_serial_link_master();
 }
diff --git a/keyboards/ergodox_stm32/ergodox_stm32.c b/keyboards/ergodox_stm32/ergodox_stm32.c
index 176fb3f43ad..a3fa73ffb94 100644
--- a/keyboards/ergodox_stm32/ergodox_stm32.c
+++ b/keyboards/ergodox_stm32/ergodox_stm32.c
@@ -20,8 +20,6 @@ void matrix_init_kb(void)
     palSetPadMode(GPIOA, 8, PAL_MODE_OUTPUT_PUSHPULL); // LED 3
 
     ergodox_blink_all_leds();
-
-    matrix_init_user();
 }
 
 void ergodox_blink_all_leds(void)
diff --git a/keyboards/ergodox_stm32/matrix.c b/keyboards/ergodox_stm32/matrix.c
index 383bf9790a5..7b368b56815 100644
--- a/keyboards/ergodox_stm32/matrix.c
+++ b/keyboards/ergodox_stm32/matrix.c
@@ -33,13 +33,9 @@ __attribute__((weak)) void matrix_init_user(void) {}
 
 __attribute__((weak)) void matrix_scan_user(void) {}
 
-__attribute__((weak)) void matrix_init_kb(void) {
-  matrix_init_user();
-}
+__attribute__((weak)) void matrix_init_kb(void) {}
 
-__attribute__((weak)) void matrix_scan_kb(void) {
-  matrix_scan_user();
-}
+__attribute__((weak)) void matrix_scan_kb(void) {}
 
 void matrix_init(void) {
   mcp23017_status = init_mcp23017();
diff --git a/keyboards/ergoinu/ergoinu.c b/keyboards/ergoinu/ergoinu.c
index b43ab17c8bb..c6d099a1483 100644
--- a/keyboards/ergoinu/ergoinu.c
+++ b/keyboards/ergoinu/ergoinu.c
@@ -1,5 +1 @@
 #include "ergoinu.h"
-
-void matrix_init_kb(void) {
-	matrix_init_user();
-};
diff --git a/keyboards/ergoinu/matrix.c b/keyboards/ergoinu/matrix.c
index 00914a2575e..17cb9a70de3 100644
--- a/keyboards/ergoinu/matrix.c
+++ b/keyboards/ergoinu/matrix.c
@@ -74,12 +74,10 @@ static uint8_t matrix_master_scan(void);
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-  matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-  matrix_scan_user();
 }
 
 __attribute__ ((weak))
diff --git a/keyboards/ergotaco/ergotaco.c b/keyboards/ergotaco/ergotaco.c
index ecab74b3a26..91274cd2b7b 100644
--- a/keyboards/ergotaco/ergotaco.c
+++ b/keyboards/ergotaco/ergotaco.c
@@ -24,8 +24,6 @@ void matrix_init_kb(void) {
 
     DDRF  &= ~(1<<0 | 1<<1 | 1<<4 | 1<<6 | 1<<7);
     PORTF |=  (1<<0 | 1<<1 | 1<<4 | 1<<6 | 1<<7);
-
-    matrix_init_user();
 }
 
 
diff --git a/keyboards/ergotaco/matrix.c b/keyboards/ergotaco/matrix.c
index e28f754e67e..c40bcb5d814 100644
--- a/keyboards/ergotaco/matrix.c
+++ b/keyboards/ergotaco/matrix.c
@@ -74,14 +74,10 @@ __attribute__ ((weak))
 void matrix_scan_user(void) {}
 
 __attribute__ ((weak))
-void matrix_init_kb(void) {
-  matrix_init_user();
-}
+void matrix_init_kb(void) {}
 
 __attribute__ ((weak))
-void matrix_scan_kb(void) {
-  matrix_scan_user();
-}
+void matrix_scan_kb(void) {}
 
 inline
 uint8_t matrix_rows(void)
diff --git a/keyboards/ergotravel/rev1/rev1.c b/keyboards/ergotravel/rev1/rev1.c
index 609c479eb37..520a869e57b 100644
--- a/keyboards/ergotravel/rev1/rev1.c
+++ b/keyboards/ergotravel/rev1/rev1.c
@@ -1,22 +1 @@
 #include "rev1.h"
-
-
-#ifdef SSD1306OLED
-void led_set_kb(uint8_t usb_led) {
-    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-    led_set_user(usb_led);
-}
-#endif
-
-void matrix_init_kb(void) {
-
-    // // green led on
-    // DDRD |= (1<<5);
-    // PORTD &= ~(1<<5);
-
-    // // orange led on
-    // DDRB |= (1<<0);
-    // PORTB &= ~(1<<0);
-
-	matrix_init_user();
-};
diff --git a/keyboards/evil80/evil80.c b/keyboards/evil80/evil80.c
index af1522f0f1f..4a5061697d0 100644
--- a/keyboards/evil80/evil80.c
+++ b/keyboards/evil80/evil80.c
@@ -3,14 +3,6 @@ void matrix_init_kb(void) {
     // put your keyboard start-up code here
     // runs once when the firmware starts up
     led_init_ports();
-    matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-    // put your looping keyboard code here
-    // runs every cycle (a lot)
-
-    matrix_scan_user();
 }
 
 void led_init_ports(void) {
@@ -35,6 +27,4 @@ void led_set_kb(uint8_t usb_led) {
     {
         PORTB &= ~(1<<7); // LO
     }
-
-    led_set_user(usb_led);
 }
diff --git a/keyboards/exclusive/e65/e65.c b/keyboards/exclusive/e65/e65.c
index e01a0614c52..abc9e7d7851 100644
--- a/keyboards/exclusive/e65/e65.c
+++ b/keyboards/exclusive/e65/e65.c
@@ -20,7 +20,6 @@ void matrix_init_kb(void) {
     // put your keyboard start-up code here
     // runs once when the firmware starts up
 
-    matrix_init_user();
     led_init_ports();
 }
 
@@ -30,9 +29,6 @@ void led_init_ports(void) {
 }
 
 bool led_update_kb(led_t led_state) {
-    if(led_update_user(led_state)) {
-        writePin(B6, !led_state.caps_lock);
-    }
-
+    writePin(B6, !led_state.caps_lock);
     return true;
 }
diff --git a/keyboards/exclusive/e6_rgb/e6_rgb.c b/keyboards/exclusive/e6_rgb/e6_rgb.c
index 0e248a20235..d9ffa4b3337 100644
--- a/keyboards/exclusive/e6_rgb/e6_rgb.c
+++ b/keyboards/exclusive/e6_rgb/e6_rgb.c
@@ -8,7 +8,6 @@
 void matrix_init_kb(void) {
   setPinOutput(D5);
   writePinHigh(D5);
-  matrix_init_user();
 }
 
 const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
diff --git a/keyboards/exclusive/e6v2/le/le.c b/keyboards/exclusive/e6v2/le/le.c
index ac72ef63c4e..4eb661d6c87 100644
--- a/keyboards/exclusive/e6v2/le/le.c
+++ b/keyboards/exclusive/e6v2/le/le.c
@@ -1,20 +1,6 @@
 #include "le.h"
 
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_user(uint8_t usb_led) {
+void led_set_kb(uint8_t usb_led) {
 	if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
 		DDRB |= (1 << 7); 
 		PORTB &= ~(1 << 7);
diff --git a/keyboards/exclusive/e6v2/oe/oe.c b/keyboards/exclusive/e6v2/oe/oe.c
index e9c5f60c9bd..e5efc7549ab 100644
--- a/keyboards/exclusive/e6v2/oe/oe.c
+++ b/keyboards/exclusive/e6v2/oe/oe.c
@@ -1,19 +1,5 @@
 #include "oe.h"
 
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 	DDRB |= (1<<6);
@@ -41,6 +27,4 @@ void led_set_kb(uint8_t usb_led) {
 		PORTB &= ~(1<<6);
 		// PORTB &= ~(1<<7);
 	}
-    
-	led_set_user(usb_led);
 }
diff --git a/keyboards/exclusive/e7v1/e7v1.c b/keyboards/exclusive/e7v1/e7v1.c
index e8dbe51fa04..9c99ed32e18 100644
--- a/keyboards/exclusive/e7v1/e7v1.c
+++ b/keyboards/exclusive/e7v1/e7v1.c
@@ -2,11 +2,6 @@
 
 void matrix_init_kb(void) {
   setPinOutput(F0);
-  matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-  matrix_scan_user();
 }
 
 void led_set_kb(uint8_t usb_led) {
@@ -15,7 +10,5 @@ void led_set_kb(uint8_t usb_led) {
   } else {
     writePinLow(F0);
   }
-
-  led_set_user(usb_led);
 }
 
diff --git a/keyboards/exclusive/e7v1se/e7v1se.c b/keyboards/exclusive/e7v1se/e7v1se.c
index d8cea9d2c56..69248f01d46 100644
--- a/keyboards/exclusive/e7v1se/e7v1se.c
+++ b/keyboards/exclusive/e7v1se/e7v1se.c
@@ -15,29 +15,3 @@
  */
 
 #include "e7v1se.h"
-
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-
-/*
-void matrix_init_kb(void) {
-    // put your keyboard start-up code here
-    // runs once when the firmware starts up
-
-    matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-    // put your looping keyboard code here
-    // runs every cycle (a lot)
-
-    matrix_scan_user();
-}
-
-bool led_update_kb(led_t led_state) {
-    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-    return led_update_user(led_state);
-}
-*/
diff --git a/keyboards/fc660c/fc660c.c b/keyboards/fc660c/fc660c.c
index 1c049602b13..223c30a1b64 100644
--- a/keyboards/fc660c/fc660c.c
+++ b/keyboards/fc660c/fc660c.c
@@ -27,15 +27,6 @@ void matrix_init_kb(void) {
 #ifdef ACTUATION_DEPTH_ADJUSTMENT
     adjust_actuation_point(ACTUATION_DEPTH_ADJUSTMENT);
 #endif
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
 }
 
 void led_set_kb(uint8_t usb_led) {
@@ -44,6 +35,4 @@ void led_set_kb(uint8_t usb_led) {
     } else {
         PORTB |=  (1<<6);
     }
-
-	led_set_user(usb_led);
 }
diff --git a/keyboards/fc660c/matrix.c b/keyboards/fc660c/matrix.c
index e6e49481046..b303d63abd6 100644
--- a/keyboards/fc660c/matrix.c
+++ b/keyboards/fc660c/matrix.c
@@ -89,12 +89,10 @@ static matrix_row_t _matrix1[MATRIX_ROWS];
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
diff --git a/keyboards/fc980c/fc980c.c b/keyboards/fc980c/fc980c.c
index 0d9205110de..db37a53ee17 100644
--- a/keyboards/fc980c/fc980c.c
+++ b/keyboards/fc980c/fc980c.c
@@ -28,15 +28,6 @@ void matrix_init_kb(void) {
 #ifdef ACTUATION_DEPTH_ADJUSTMENT
     adjust_actuation_point(ACTUATION_DEPTH_ADJUSTMENT);
 #endif
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
 }
 
 void led_set_kb(uint8_t usb_led) {
@@ -55,6 +46,4 @@ void led_set_kb(uint8_t usb_led) {
     } else {
         PORTB &= ~(1<<6);
     }
-
-	led_set_user(usb_led);
 }
diff --git a/keyboards/fc980c/matrix.c b/keyboards/fc980c/matrix.c
index 1126f3047ae..066f48dea1b 100644
--- a/keyboards/fc980c/matrix.c
+++ b/keyboards/fc980c/matrix.c
@@ -88,12 +88,10 @@ static matrix_row_t _matrix1[MATRIX_ROWS];
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
diff --git a/keyboards/fleuron/fleuron.c b/keyboards/fleuron/fleuron.c
index 0fccef6544b..babdb23c5d3 100644
--- a/keyboards/fleuron/fleuron.c
+++ b/keyboards/fleuron/fleuron.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "fleuron.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
diff --git a/keyboards/flx/virgo/virgo.c b/keyboards/flx/virgo/virgo.c
index 7e87234faf1..5191e67e173 100644
--- a/keyboards/flx/virgo/virgo.c
+++ b/keyboards/flx/virgo/virgo.c
@@ -22,14 +22,6 @@ void matrix_init_kb(void) {
 
   setPinOutput(E6);
   setPinOutput(B2);
-  matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-    // put your looping keyboard code here
-    // runs every cycle (a lot)
-
-    matrix_scan_user();
 }
 
 bool led_update_kb(led_t led_state) {
@@ -37,5 +29,4 @@ bool led_update_kb(led_t led_state) {
         writePin(E6, !led_state.caps_lock);
         writePin(B2, !led_state.scroll_lock);
     }
-    return true;
 }
diff --git a/keyboards/fortitude60/matrix.c b/keyboards/fortitude60/matrix.c
index 9037d53a649..d52ec3f1668 100644
--- a/keyboards/fortitude60/matrix.c
+++ b/keyboards/fortitude60/matrix.c
@@ -89,12 +89,10 @@ static matrix_row_t matrix_debouncing[MATRIX_ROWS];
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
diff --git a/keyboards/fortitude60/rev1/rev1.c b/keyboards/fortitude60/rev1/rev1.c
index 5f4cd32f695..342bcc3bedf 100644
--- a/keyboards/fortitude60/rev1/rev1.c
+++ b/keyboards/fortitude60/rev1/rev1.c
@@ -1,12 +1,5 @@
 #include "rev1.h"
 
-#ifdef SSD1306OLED
-void led_set_kb(uint8_t usb_led) {
-    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-    led_set_user(usb_led);
-}
-#endif
-
 void matrix_init_kb(void) {
 
     // // green led on
@@ -16,7 +9,5 @@ void matrix_init_kb(void) {
     // // orange led on
     // DDRB |= (1<<0);
     // PORTB &= ~(1<<0);
-
-	matrix_init_user();
 };
 
diff --git a/keyboards/foxlab/leaf60/hotswap/hotswap.c b/keyboards/foxlab/leaf60/hotswap/hotswap.c
index b4912ec7624..70885d55a00 100644
--- a/keyboards/foxlab/leaf60/hotswap/hotswap.c
+++ b/keyboards/foxlab/leaf60/hotswap/hotswap.c
@@ -15,32 +15,9 @@
  */
 #include "hotswap.h"
 
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-
 void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
   setPinOutput(E6);
-  matrix_init_user();
 }
-/*
-
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-  matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-  // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-  led_set_user(usb_led);
-}
-
-*/
 
 void led_set_kb(uint8_t usb_led) {
   if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
@@ -48,5 +25,4 @@ void led_set_kb(uint8_t usb_led) {
   } else {
     writePinHigh(E6);
   }
-	led_set_user(usb_led);
 }
diff --git a/keyboards/foxlab/leaf60/universal/universal.c b/keyboards/foxlab/leaf60/universal/universal.c
index 934706cf878..c6708458633 100644
--- a/keyboards/foxlab/leaf60/universal/universal.c
+++ b/keyboards/foxlab/leaf60/universal/universal.c
@@ -15,40 +15,16 @@
  */
 #include "universal.h"
 
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-
 void matrix_init_kb(void) {
   // put your keyboard start-up code here
   // runs once when the firmware starts up
   setPinOutput(E6);
-  matrix_init_user();
 }
 
-/*
-
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-  matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-  // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-  led_set_user(usb_led);
-}
-
-*/
-
-
 void led_set_kb(uint8_t usb_led) {
   if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
     writePinLow(E6);
   } else {
     writePinHigh(E6);
   }
-	led_set_user(usb_led);
 }
diff --git a/keyboards/freyr/freyr.c b/keyboards/freyr/freyr.c
index 68c26294f54..67156057f83 100644
--- a/keyboards/freyr/freyr.c
+++ b/keyboards/freyr/freyr.c
@@ -17,7 +17,6 @@
 
 
 void matrix_init_kb(void) {
-  matrix_init_user();
   led_init_ports();
 };
 
@@ -41,5 +40,4 @@ void led_set_kb(uint8_t usb_led) {
     // Turn Scroll Lock LED off
     writePinHigh(B7);
   }
-      led_set_user(usb_led);
 }
diff --git a/keyboards/geekboards/tester/tester.c b/keyboards/geekboards/tester/tester.c
index 37ced13a7c5..993c3c77881 100644
--- a/keyboards/geekboards/tester/tester.c
+++ b/keyboards/geekboards/tester/tester.c
@@ -32,21 +32,17 @@ led_config_t g_led_config = {
 
 
 void matrix_init_kb(void) {
-	matrix_init_user();
 }
 
 void matrix_scan_kb(void) {
-	matrix_scan_user();
 }
 
 void suspend_power_down_kb(void)
 {
     rgb_matrix_set_suspend_state(true);
-        suspend_power_down_user();
 }
 
 void suspend_wakeup_init_kb(void)
 {
     rgb_matrix_set_suspend_state(false);
-    suspend_wakeup_init_user();
 }
diff --git a/keyboards/georgi/georgi.c b/keyboards/georgi/georgi.c
index 8866886ce7c..ee9ae8f2c9d 100644
--- a/keyboards/georgi/georgi.c
+++ b/keyboards/georgi/georgi.c
@@ -18,8 +18,6 @@ void matrix_init_kb(void) {
     PORTC |=  (1<<7);
     PORTD |=  (1<<5 | 1<<4 | 1<<6 | 1<<7);
     PORTE |=  (1<<6);
-
-    matrix_init_user();
 }
 
 
diff --git a/keyboards/georgi/matrix.c b/keyboards/georgi/matrix.c
index f0b69c841ab..2f658c2ebf6 100644
--- a/keyboards/georgi/matrix.c
+++ b/keyboards/georgi/matrix.c
@@ -95,14 +95,10 @@ __attribute__ ((weak))
 void matrix_scan_user(void) {}
 
 __attribute__ ((weak))
-void matrix_init_kb(void) {
-  matrix_init_user();
-}
+void matrix_init_kb(void) {}
 
 __attribute__ ((weak))
-void matrix_scan_kb(void) {
-  matrix_scan_user();
-}
+void matrix_scan_kb(void) {}
 
 inline
 uint8_t matrix_rows(void)
diff --git a/keyboards/gergo/gergo.c b/keyboards/gergo/gergo.c
index fab8d0f44c9..18e829281b0 100644
--- a/keyboards/gergo/gergo.c
+++ b/keyboards/gergo/gergo.c
@@ -16,8 +16,6 @@ void matrix_init_kb(void) {
     PORTC |=  (1<<7);
     PORTD |=  (1<<5 | 1<<4 | 1<<6 | 1<<7);
     PORTE |=  (1<<6);
-
-    matrix_init_user();
 }
 
 
diff --git a/keyboards/gergo/matrix.c b/keyboards/gergo/matrix.c
index f659ed52c25..3664ce4ab58 100644
--- a/keyboards/gergo/matrix.c
+++ b/keyboards/gergo/matrix.c
@@ -126,14 +126,10 @@ __attribute__ ((weak)) void matrix_init_user(void) {}
 __attribute__ ((weak)) void matrix_scan_user(void) {}
 
 __attribute__ ((weak))
-void matrix_init_kb(void) {
-  matrix_init_user();
-}
+void matrix_init_kb(void) {}
 
 __attribute__ ((weak))
-void matrix_scan_kb(void) {
-  matrix_scan_user();
-}
+void matrix_scan_kb(void) {}
 
 inline uint8_t matrix_rows(void) { return MATRIX_ROWS; }
 
diff --git a/keyboards/gh60/satan/satan.c b/keyboards/gh60/satan/satan.c
index 8542a57c43a..93d7f28344b 100644
--- a/keyboards/gh60/satan/satan.c
+++ b/keyboards/gh60/satan/satan.c
@@ -1,14 +1,9 @@
 #include "satan.h"
 
 void matrix_init_kb(void) {
-  matrix_init_user();
   led_init_ports();
 };
 
-void matrix_scan_kb(void) {
-  matrix_scan_user();
-};
-
 void led_init_ports(void) {
   setPinOutput(B2);
 }
diff --git a/keyboards/gingham/gingham.c b/keyboards/gingham/gingham.c
index 9a5ffe4530c..c12fb680ae1 100644
--- a/keyboards/gingham/gingham.c
+++ b/keyboards/gingham/gingham.c
@@ -23,8 +23,6 @@ void matrix_init_kb(void) {
     //Turn the red LED on as power indicator.
     send_data = 0x10;
     i2c_writeReg((PORT_EXPANDER_ADDRESS << 1), 0x09, &send_data, 1, 20);
-
-    matrix_init_user();
 }
 
 void led_set_kb(uint8_t usb_led) {
@@ -35,6 +33,4 @@ void led_set_kb(uint8_t usb_led) {
         send_data = 0x10;
     }
     i2c_writeReg((PORT_EXPANDER_ADDRESS << 1), 0x09, &send_data, 1, 20);
-
-    led_set_user(usb_led);
 }
diff --git a/keyboards/gray_studio/cod67/cod67.c b/keyboards/gray_studio/cod67/cod67.c
index e2a54a616dc..494e06da740 100644
--- a/keyboards/gray_studio/cod67/cod67.c
+++ b/keyboards/gray_studio/cod67/cod67.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "cod67.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
diff --git a/keyboards/gray_studio/space65/space65.c b/keyboards/gray_studio/space65/space65.c
index 981fb66512e..84fe45430aa 100644
--- a/keyboards/gray_studio/space65/space65.c
+++ b/keyboards/gray_studio/space65/space65.c
@@ -16,18 +16,7 @@
 #include "space65.h"
 
 void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
 	setPinOutput(E6);
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
 }
 
 void led_set_kb(uint8_t usb_led) {
@@ -37,6 +26,4 @@ void led_set_kb(uint8_t usb_led) {
   } else {
     writePinHigh(E6);
   }
-
-	led_set_user(usb_led);
 }
diff --git a/keyboards/gray_studio/think65/hotswap/hotswap.c b/keyboards/gray_studio/think65/hotswap/hotswap.c
index 47bd93faf2f..f03f44d6cfb 100644
--- a/keyboards/gray_studio/think65/hotswap/hotswap.c
+++ b/keyboards/gray_studio/think65/hotswap/hotswap.c
@@ -27,15 +27,6 @@ void matrix_init_kb(void) {
   setPinOutput(C6);
   setPinOutput(C7);
   setPinOutput(F7);
-  
-  matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-  matrix_scan_user();
 }
 
 void led_set_kb(uint8_t usb_led) {
@@ -58,7 +49,5 @@ void led_set_kb(uint8_t usb_led) {
   } else {
     writePinHigh(F7);
   }
-
-  led_set_user(usb_led);
 }
 
diff --git a/keyboards/gray_studio/think65/solder/solder.c b/keyboards/gray_studio/think65/solder/solder.c
index 619aa2db8d5..165db892723 100644
--- a/keyboards/gray_studio/think65/solder/solder.c
+++ b/keyboards/gray_studio/think65/solder/solder.c
@@ -25,12 +25,9 @@ void matrix_init_kb(void) {
   // runs once when the firmware starts up
 
   setPinOutput(C7);
-  matrix_init_user();
 }
 
 bool led_update_kb(led_t led_state) {
-  if(led_update_user(led_state)) {
     writePin(C7, !led_state.caps_lock);
-  }
-  return true;
+    return true;
 }
diff --git a/keyboards/hadron/ver2/ver2.c b/keyboards/hadron/ver2/ver2.c
index b91f9af6530..f00b4f26d6b 100644
--- a/keyboards/hadron/ver2/ver2.c
+++ b/keyboards/hadron/ver2/ver2.c
@@ -1,19 +1 @@
 #include "ver2.h"
-
-
-void matrix_init_kb(void) {
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
diff --git a/keyboards/hadron/ver3/ver3.c b/keyboards/hadron/ver3/ver3.c
index 5e98df069ca..4df595eb643 100644
--- a/keyboards/hadron/ver3/ver3.c
+++ b/keyboards/hadron/ver3/ver3.c
@@ -185,7 +185,6 @@ void encoder_update_kb(uint8_t index, bool clockwise) {
 
 void matrix_init_kb(void) {
   queue_for_send = true;
-	matrix_init_user();
 }
 
 void matrix_scan_kb(void) {
@@ -206,5 +205,4 @@ if (queue_for_send) {
   }
   counterst = (counterst + 1) % 1024;
   //rgblight_task();
-	matrix_scan_user();
 }
diff --git a/keyboards/halberd/halberd.c b/keyboards/halberd/halberd.c
index bb27af3d293..8ce55ca3e57 100644
--- a/keyboards/halberd/halberd.c
+++ b/keyboards/halberd/halberd.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "halberd.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
diff --git a/keyboards/handwired/2x5keypad/2x5keypad.c b/keyboards/handwired/2x5keypad/2x5keypad.c
index 873c579a179..63d6409a6e7 100644
--- a/keyboards/handwired/2x5keypad/2x5keypad.c
+++ b/keyboards/handwired/2x5keypad/2x5keypad.c
@@ -3,8 +3,6 @@
 
 void matrix_init_kb(void)
 {
-    matrix_init_user();
-
     setPinOutput(RED_LED);
     setPinOutput(BLUE_LED);
     setPinOutput(GREEN_LED);
diff --git a/keyboards/handwired/412_64/412_64.c b/keyboards/handwired/412_64/412_64.c
index 4e5c26c6e5f..bfab4ba352e 100644
--- a/keyboards/handwired/412_64/412_64.c
+++ b/keyboards/handwired/412_64/412_64.c
@@ -1,22 +1,2 @@
 
 #include "412_64.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
diff --git a/keyboards/handwired/aek64/aek64.c b/keyboards/handwired/aek64/aek64.c
index 0646d308d0e..85c02a59ff9 100644
--- a/keyboards/handwired/aek64/aek64.c
+++ b/keyboards/handwired/aek64/aek64.c
@@ -20,9 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * Hardware function pre initialisation.
  * See https://docs.qmk.fm/#/custom_quantum_functions?id=example-keyboard_pre_init_user-implementation
  */
-void keyboard_pre_init_user(void) {
-  // Call the keyboard pre init code.
-
+void keyboard_pre_init_kb(void) {
   // Set our LED pins as output
   setPinOutput(C3);
 }
diff --git a/keyboards/handwired/aranck/aranck.c b/keyboards/handwired/aranck/aranck.c
index fb1ed785651..62e36bdb46b 100644
--- a/keyboards/handwired/aranck/aranck.c
+++ b/keyboards/handwired/aranck/aranck.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "aranck.h"
-
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-
-
-
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-
-  matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-  matrix_scan_user();
-}
diff --git a/keyboards/handwired/atreus50/atreus50.c b/keyboards/handwired/atreus50/atreus50.c
index 225a51bccea..de41b3225cf 100644
--- a/keyboards/handwired/atreus50/atreus50.c
+++ b/keyboards/handwired/atreus50/atreus50.c
@@ -5,6 +5,4 @@ void matrix_init_kb(void) {
     // Turn status LED on
     //DDRE |= (1<<6);
     PORTE |= (1<<6);
-
-	matrix_init_user();
 };
diff --git a/keyboards/handwired/bluepill/bluepill70/matrix.c b/keyboards/handwired/bluepill/bluepill70/matrix.c
index b2c38e52268..6fd52f2d6a8 100644
--- a/keyboards/handwired/bluepill/bluepill70/matrix.c
+++ b/keyboards/handwired/bluepill/bluepill70/matrix.c
@@ -60,12 +60,10 @@ inline uint8_t matrix_cols(void){
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
diff --git a/keyboards/handwired/cmd60/cmd60.c b/keyboards/handwired/cmd60/cmd60.c
index 91bbbd453b5..20c359e5e96 100644
--- a/keyboards/handwired/cmd60/cmd60.c
+++ b/keyboards/handwired/cmd60/cmd60.c
@@ -1,8 +1 @@
 #include "cmd60.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
diff --git a/keyboards/handwired/co60/rev1/rev1.c b/keyboards/handwired/co60/rev1/rev1.c
index dbd4b6686b2..6c68c515f45 100644
--- a/keyboards/handwired/co60/rev1/rev1.c
+++ b/keyboards/handwired/co60/rev1/rev1.c
@@ -14,26 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "rev1.h"
-
-__attribute__ ((weak))
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-__attribute__ ((weak))
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-__attribute__ ((weak))
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
diff --git a/keyboards/handwired/dactyl/matrix.c b/keyboards/handwired/dactyl/matrix.c
index faa5c19cf25..d588ce04f76 100644
--- a/keyboards/handwired/dactyl/matrix.c
+++ b/keyboards/handwired/dactyl/matrix.c
@@ -85,14 +85,10 @@ __attribute__ ((weak))
 void matrix_scan_user(void) {}
 
 __attribute__ ((weak))
-void matrix_init_kb(void) {
-  matrix_init_user();
-}
+void matrix_init_kb(void) {}
 
 __attribute__ ((weak))
-void matrix_scan_kb(void) {
-  matrix_scan_user();
-}
+void matrix_scan_kb(void) {}
 
 inline
 uint8_t matrix_rows(void)
diff --git a/keyboards/handwired/dactyl_left/dactyl_left.c b/keyboards/handwired/dactyl_left/dactyl_left.c
index 918a599cff1..51a31afbdb4 100644
--- a/keyboards/handwired/dactyl_left/dactyl_left.c
+++ b/keyboards/handwired/dactyl_left/dactyl_left.c
@@ -14,31 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "dactyl_left.h"
-
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-
-/*
-
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-
-  matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-  matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-  // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-  led_set_user(usb_led);
-}
-
-*/
diff --git a/keyboards/handwired/dactyl_manuform/4x5/4x5.c b/keyboards/handwired/dactyl_manuform/4x5/4x5.c
index 78c0fee819c..3170eb93998 100644
--- a/keyboards/handwired/dactyl_manuform/4x5/4x5.c
+++ b/keyboards/handwired/dactyl_manuform/4x5/4x5.c
@@ -1,23 +1 @@
 #include "4x5.h"
-
-
-#ifdef SSD1306OLED
-void led_set_kb(uint8_t usb_led) {
-    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-    led_set_user(usb_led);
-}
-#endif
-
-void matrix_init_kb(void) {
-
-    // // green led on
-    // DDRD |= (1<<5);
-    // PORTD &= ~(1<<5);
-
-    // // orange led on
-    // DDRB |= (1<<0);
-    // PORTB &= ~(1<<0);
-
-	matrix_init_user();
-};
-
diff --git a/keyboards/handwired/dactyl_manuform/4x6/4x6.c b/keyboards/handwired/dactyl_manuform/4x6/4x6.c
index 1d305c85414..5e68c1a9fa2 100644
--- a/keyboards/handwired/dactyl_manuform/4x6/4x6.c
+++ b/keyboards/handwired/dactyl_manuform/4x6/4x6.c
@@ -1,14 +1 @@
 #include "4x6.h"
-
-
-#ifdef SSD1306OLED
-void led_set_kb(uint8_t usb_led) {
-    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-    led_set_user(usb_led);
-}
-#endif
-
-void matrix_init_kb(void) {
-	matrix_init_user();
-};
-
diff --git a/keyboards/handwired/dactyl_manuform/5x6/5x6.c b/keyboards/handwired/dactyl_manuform/5x6/5x6.c
index 68fceffd923..0e9d5481c47 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/5x6.c
+++ b/keyboards/handwired/dactyl_manuform/5x6/5x6.c
@@ -1,23 +1 @@
 #include "5x6.h"
-
-
-#ifdef SSD1306OLED
-void led_set_kb(uint8_t usb_led) {
-    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-    led_set_user(usb_led);
-}
-#endif
-
-void matrix_init_kb(void) {
-
-    // // green led on
-    // DDRD |= (1<<5);
-    // PORTD &= ~(1<<5);
-
-    // // orange led on
-    // DDRB |= (1<<0);
-    // PORTB &= ~(1<<0);
-
-	matrix_init_user();
-};
-
diff --git a/keyboards/handwired/dactyl_manuform/5x7/5x7.c b/keyboards/handwired/dactyl_manuform/5x7/5x7.c
index 135014d6554..aae28e450c9 100644
--- a/keyboards/handwired/dactyl_manuform/5x7/5x7.c
+++ b/keyboards/handwired/dactyl_manuform/5x7/5x7.c
@@ -1,23 +1 @@
 #include "5x7.h"
-
-
-#ifdef SSD1306OLED
-void led_set_kb(uint8_t usb_led) {
-    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-    led_set_user(usb_led);
-}
-#endif
-
-void matrix_init_kb(void) {
-
-    // // green led on
-    // DDRD |= (1<<5);
-    // PORTD &= ~(1<<5);
-
-    // // orange led on
-    // DDRB |= (1<<0);
-    // PORTB &= ~(1<<0);
-
-	matrix_init_user();
-};
-
diff --git a/keyboards/handwired/dactyl_manuform/6x6/6x6.c b/keyboards/handwired/dactyl_manuform/6x6/6x6.c
index 9eb27531a8b..7d3524a5718 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/6x6.c
+++ b/keyboards/handwired/dactyl_manuform/6x6/6x6.c
@@ -1,23 +1 @@
 #include "6x6.h"
-
-
-#ifdef SSD1306OLED
-void led_set_kb(uint8_t usb_led) {
-    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-    led_set_user(usb_led);
-}
-#endif
-
-void matrix_init_kb(void) {
-
-    // // green led on
-    // DDRD |= (1<<5);
-    // PORTD &= ~(1<<5);
-
-    // // orange led on
-    // DDRB |= (1<<0);
-    // PORTB &= ~(1<<0);
-
-	matrix_init_user();
-};
-
diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/62key.c b/keyboards/handwired/dactyl_manuform/dmote/62key/62key.c
index e5d444277d2..8d0d95e166d 100644
--- a/keyboards/handwired/dactyl_manuform/dmote/62key/62key.c
+++ b/keyboards/handwired/dactyl_manuform/dmote/62key/62key.c
@@ -1,5 +1 @@
 #include "62key.h"
-
-void matrix_init_kb(void) {
-	matrix_init_user();
-};
diff --git a/keyboards/handwired/dactyl_promicro/dactyl_promicro.c b/keyboards/handwired/dactyl_promicro/dactyl_promicro.c
index 5d708cf4805..23f4b13f441 100644
--- a/keyboards/handwired/dactyl_promicro/dactyl_promicro.c
+++ b/keyboards/handwired/dactyl_promicro/dactyl_promicro.c
@@ -1,12 +1 @@
 #include "dactyl_promicro.h"
-
-#ifdef SSD1306OLED
-void led_set_kb(uint8_t usb_led) {
-    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-    led_set_user(usb_led);
-}
-#endif
-
-void matrix_init_kb(void) {
-	matrix_init_user();
-};
\ No newline at end of file
diff --git a/keyboards/handwired/daishi/daishi.c b/keyboards/handwired/daishi/daishi.c
index f4b0b1598e6..0442fc0dc57 100644
--- a/keyboards/handwired/daishi/daishi.c
+++ b/keyboards/handwired/daishi/daishi.c
@@ -1,15 +1 @@
 #include "daishi.h"
-
-void matrix_init_kb(void) {	
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-
-  matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-  matrix_scan_user();
-}
diff --git a/keyboards/handwired/fivethirteen/fivethirteen.c b/keyboards/handwired/fivethirteen/fivethirteen.c
index 4c16e72eb63..2d71560bf6e 100644
--- a/keyboards/handwired/fivethirteen/fivethirteen.c
+++ b/keyboards/handwired/fivethirteen/fivethirteen.c
@@ -1,8 +1 @@
 #include "fivethirteen.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
diff --git a/keyboards/handwired/frenchdev/frenchdev.c b/keyboards/handwired/frenchdev/frenchdev.c
index 6eed4de5ff0..70076eb69bc 100644
--- a/keyboards/handwired/frenchdev/frenchdev.c
+++ b/keyboards/handwired/frenchdev/frenchdev.c
@@ -43,8 +43,6 @@ void matrix_init_kb(void) {
     frenchdev_blink_all_leds();
     frenchdev_blink_all_leds();
     frenchdev_blink_all_leds();
-
-    matrix_init_user();
 }
 
 void frenchdev_blink_all_leds(void)
diff --git a/keyboards/handwired/frenchdev/matrix.c b/keyboards/handwired/frenchdev/matrix.c
index c9c7e94aea7..a5191d83abc 100644
--- a/keyboards/handwired/frenchdev/matrix.c
+++ b/keyboards/handwired/frenchdev/matrix.c
@@ -70,14 +70,10 @@ __attribute__ ((weak))
 void matrix_scan_user(void) {}
 
 __attribute__ ((weak))
-void matrix_init_kb(void) {
-  matrix_init_user();
-}
+void matrix_init_kb(void) {}
 
 __attribute__ ((weak))
-void matrix_scan_kb(void) {
-  matrix_scan_user();
-}
+void matrix_scan_kb(void) {}
 
 inline
 uint8_t matrix_rows(void)
diff --git a/keyboards/handwired/fruity60/fruity60.c b/keyboards/handwired/fruity60/fruity60.c
index c3abfb6d714..06403826766 100644
--- a/keyboards/handwired/fruity60/fruity60.c
+++ b/keyboards/handwired/fruity60/fruity60.c
@@ -14,31 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "fruity60.h"
-
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-
-/*
-
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-
-  matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-  matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-  // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-  led_set_user(usb_led);
-}
-
-*/
diff --git a/keyboards/handwired/gamenum/gamenum.c b/keyboards/handwired/gamenum/gamenum.c
index 8048194bbcd..55588735a61 100644
--- a/keyboards/handwired/gamenum/gamenum.c
+++ b/keyboards/handwired/gamenum/gamenum.c
@@ -8,7 +8,4 @@ void matrix_init_kb(void) {
 	
 	DDRD |= (1<<4);
 	PORTD &= ~(1<<4);
-	
-	matrix_init_user();
-	
 }
diff --git a/keyboards/handwired/hacked_motospeed/hacked_motospeed.c b/keyboards/handwired/hacked_motospeed/hacked_motospeed.c
index 1ab28669a5f..f6a394b7318 100644
--- a/keyboards/handwired/hacked_motospeed/hacked_motospeed.c
+++ b/keyboards/handwired/hacked_motospeed/hacked_motospeed.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "hacked_motospeed.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
diff --git a/keyboards/handwired/hnah40/hnah40.c b/keyboards/handwired/hnah40/hnah40.c
index 4b3665dfa17..88c81b7d497 100644
--- a/keyboards/handwired/hnah40/hnah40.c
+++ b/keyboards/handwired/hnah40/hnah40.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "hnah40.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
diff --git a/keyboards/handwired/ibm122m/ibm122m.c b/keyboards/handwired/ibm122m/ibm122m.c
index 5e68a90230b..7ee099d2500 100644
--- a/keyboards/handwired/ibm122m/ibm122m.c
+++ b/keyboards/handwired/ibm122m/ibm122m.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "ibm122m.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
diff --git a/keyboards/handwired/jn68m/jn68m.c b/keyboards/handwired/jn68m/jn68m.c
index 9c01df8c660..415645f1b4c 100644
--- a/keyboards/handwired/jn68m/jn68m.c
+++ b/keyboards/handwired/jn68m/jn68m.c
@@ -14,17 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "jn68m.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
diff --git a/keyboards/handwired/jopr/jopr.c b/keyboards/handwired/jopr/jopr.c
index 3dccb719c2e..cb97d6d250f 100644
--- a/keyboards/handwired/jopr/jopr.c
+++ b/keyboards/handwired/jopr/jopr.c
@@ -1,6 +1,5 @@
 #include "jopr.h"
 void matrix_init_kb(void) {
-    matrix_init_user();
     led_init_ports();
 };
 
@@ -8,4 +7,4 @@ void led_init_ports(void) {
     setPinOutput(F0);
     setPinOutput(F1);
     setPinOutput(F4);
-}
\ No newline at end of file
+}
diff --git a/keyboards/handwired/jot50/jot50.c b/keyboards/handwired/jot50/jot50.c
index a1d2258a581..da04e862e18 100644
--- a/keyboards/handwired/jot50/jot50.c
+++ b/keyboards/handwired/jot50/jot50.c
@@ -1,6 +1 @@
 #include "jot50.h"
-
-void matrix_init_kb(void) {
-
-	matrix_init_user();
-}
diff --git a/keyboards/handwired/jotanck/jotanck.c b/keyboards/handwired/jotanck/jotanck.c
index caf0ad01413..51f72323383 100644
--- a/keyboards/handwired/jotanck/jotanck.c
+++ b/keyboards/handwired/jotanck/jotanck.c
@@ -1,12 +1,6 @@
 #include "jotanck.h"
 
-void matrix_init_kb(void) {
-    matrix_init_user();
-}
-
 void keyboard_pre_init_kb() {
     setPinOutput(JOTANCK_LED1);
     setPinOutput(JOTANCK_LED2);
-    
-    keyboard_pre_init_user();
 }
diff --git a/keyboards/handwired/jotpad16/jotpad16.c b/keyboards/handwired/jotpad16/jotpad16.c
index 512234b9177..b1b313482c6 100644
--- a/keyboards/handwired/jotpad16/jotpad16.c
+++ b/keyboards/handwired/jotpad16/jotpad16.c
@@ -1,6 +1 @@
 #include "jotpad16.h"
-
-void matrix_init_kb(void) {
-
-	matrix_init_user();
-}
diff --git a/keyboards/handwired/kbod/kbod.c b/keyboards/handwired/kbod/kbod.c
index df16146d4c6..c229d267b17 100644
--- a/keyboards/handwired/kbod/kbod.c
+++ b/keyboards/handwired/kbod/kbod.c
@@ -1,21 +1 @@
 #include "kbod.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
diff --git a/keyboards/handwired/lovelive9/lovelive9.c b/keyboards/handwired/lovelive9/lovelive9.c
index 1ec8ae0527c..c0198a8eaf2 100644
--- a/keyboards/handwired/lovelive9/lovelive9.c
+++ b/keyboards/handwired/lovelive9/lovelive9.c
@@ -1,7 +1 @@
 #include "lovelive9.h"
-
-
-
-void matrix_init_kb(void) {
-	matrix_init_user();
-}
diff --git a/keyboards/handwired/maartenwut/maartenwut.c b/keyboards/handwired/maartenwut/maartenwut.c
index 6a7c5cee629..0547d89d3ee 100755
--- a/keyboards/handwired/maartenwut/maartenwut.c
+++ b/keyboards/handwired/maartenwut/maartenwut.c
@@ -1,13 +1 @@
 #include "maartenwut.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-	matrix_scan_user();
-};
\ No newline at end of file
diff --git a/keyboards/handwired/magicforce61/magicforce61.c b/keyboards/handwired/magicforce61/magicforce61.c
index 379395366d6..420bbb80f5e 100644
--- a/keyboards/handwired/magicforce61/magicforce61.c
+++ b/keyboards/handwired/magicforce61/magicforce61.c
@@ -1,8 +1 @@
 #include "magicforce61.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
diff --git a/keyboards/handwired/magicforce68/magicforce68.c b/keyboards/handwired/magicforce68/magicforce68.c
index 84b1007e2c5..8d74f1438b9 100644
--- a/keyboards/handwired/magicforce68/magicforce68.c
+++ b/keyboards/handwired/magicforce68/magicforce68.c
@@ -1,8 +1 @@
 #include "magicforce68.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
diff --git a/keyboards/handwired/mechboards_micropad/mechboards_micropad.c b/keyboards/handwired/mechboards_micropad/mechboards_micropad.c
index 7cb619b1be7..662af8815e5 100644
--- a/keyboards/handwired/mechboards_micropad/mechboards_micropad.c
+++ b/keyboards/handwired/mechboards_micropad/mechboards_micropad.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "mechboards_micropad.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
diff --git a/keyboards/handwired/not_so_minidox/matrix.c b/keyboards/handwired/not_so_minidox/matrix.c
index 27a38dca026..bccb05637e2 100644
--- a/keyboards/handwired/not_so_minidox/matrix.c
+++ b/keyboards/handwired/not_so_minidox/matrix.c
@@ -63,12 +63,10 @@ static void select_row(uint8_t row);
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
diff --git a/keyboards/handwired/numpad20/numpad20.c b/keyboards/handwired/numpad20/numpad20.c
index 101cf2cb4b1..50766b78571 100644
--- a/keyboards/handwired/numpad20/numpad20.c
+++ b/keyboards/handwired/numpad20/numpad20.c
@@ -1,8 +1 @@
 #include "numpad20.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
diff --git a/keyboards/handwired/ortho5x13/ortho5x13.c b/keyboards/handwired/ortho5x13/ortho5x13.c
index cf8352cc436..525e1ba112b 100644
--- a/keyboards/handwired/ortho5x13/ortho5x13.c
+++ b/keyboards/handwired/ortho5x13/ortho5x13.c
@@ -1,8 +1 @@
 #include "ortho5x13.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
diff --git a/keyboards/handwired/owlet60/matrix.c b/keyboards/handwired/owlet60/matrix.c
index dafc19fcc48..ae6d192ace2 100644
--- a/keyboards/handwired/owlet60/matrix.c
+++ b/keyboards/handwired/owlet60/matrix.c
@@ -80,14 +80,10 @@ __attribute__ ((weak))
 void matrix_scan_user(void) {}
 
 __attribute__ ((weak))
-void matrix_init_kb(void) {
-  matrix_init_user();
-}
+void matrix_init_kb(void) {}
 
 __attribute__ ((weak))
-void matrix_scan_kb(void) {
-  matrix_scan_user();
-}
+void matrix_scan_kb(void) {}
 
 inline
 uint8_t matrix_rows(void)
diff --git a/keyboards/handwired/owlet60/owlet60.c b/keyboards/handwired/owlet60/owlet60.c
index 057a69a9d35..079beb8e408 100644
--- a/keyboards/handwired/owlet60/owlet60.c
+++ b/keyboards/handwired/owlet60/owlet60.c
@@ -14,33 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "owlet60.h"
-
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-
-
-/*
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-
-  matrix_init_user();
-  
-}
-
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-  matrix_scan_user();
-  oled_task_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-  // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-  led_set_user(usb_led);
-}
-
-*/
diff --git a/keyboards/handwired/pilcrow/pilcrow.c b/keyboards/handwired/pilcrow/pilcrow.c
index 2c610e1a2a6..03db58bb2cd 100644
--- a/keyboards/handwired/pilcrow/pilcrow.c
+++ b/keyboards/handwired/pilcrow/pilcrow.c
@@ -1,21 +1 @@
 #include "pilcrow.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
diff --git a/keyboards/handwired/prime_exl/prime_exl.c b/keyboards/handwired/prime_exl/prime_exl.c
index 2085f115e50..e85991c537b 100644
--- a/keyboards/handwired/prime_exl/prime_exl.c
+++ b/keyboards/handwired/prime_exl/prime_exl.c
@@ -14,24 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "prime_exl.h"
-/*
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
-*/
diff --git a/keyboards/handwired/prime_exl_plus/prime_exl_plus.c b/keyboards/handwired/prime_exl_plus/prime_exl_plus.c
index 266a3b638b6..a0210f92a6f 100644
--- a/keyboards/handwired/prime_exl_plus/prime_exl_plus.c
+++ b/keyboards/handwired/prime_exl_plus/prime_exl_plus.c
@@ -28,13 +28,9 @@ void matrix_init_kb(void) {
 }
 
 bool led_update_kb(led_t led_state) {
-    bool res = led_update_user(led_state);
-    if(res) {
-        writePin(B1, led_state.num_lock);
-        writePin(B0, led_state.caps_lock);
-        //writePin(B2, led_state.scroll_lock);
-    }
-    return res;
+    writePin(B1, led_state.num_lock);
+    writePin(B0, led_state.caps_lock);
+    //writePin(B2, led_state.scroll_lock);
 }
 
 //function for layer indicator LED
diff --git a/keyboards/handwired/promethium/matrix.c b/keyboards/handwired/promethium/matrix.c
index b4a4c6396af..55d4a601fa8 100644
--- a/keyboards/handwired/promethium/matrix.c
+++ b/keyboards/handwired/promethium/matrix.c
@@ -77,12 +77,10 @@ static void unselect_row(uint8_t row);
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
diff --git a/keyboards/handwired/promethium/promethium.c b/keyboards/handwired/promethium/promethium.c
index 3cc0f5a8c82..b8057b48ced 100644
--- a/keyboards/handwired/promethium/promethium.c
+++ b/keyboards/handwired/promethium/promethium.c
@@ -21,10 +21,6 @@ __attribute__ ((weak))
 void battery_poll(uint8_t level) {
 }
 
-void matrix_init_kb(void) {
-	matrix_init_user();
-}
-
 void matrix_scan_kb(void) {
     static uint16_t counter = BATTERY_POLL;
     counter++;
@@ -33,15 +29,4 @@ void matrix_scan_kb(void) {
         counter = 0;
         battery_poll(battery_level());
     }
-
-    matrix_scan_user();
 }
-
-void led_set_kb(uint8_t usb_led) {
-    led_set_user(usb_led);
-}
-
-__attribute__ ((weak))
-void led_set_user(uint8_t usb_led) {
-}
-
diff --git a/keyboards/handwired/qc60/proto/proto.c b/keyboards/handwired/qc60/proto/proto.c
index a6031d772d1..fe08df85999 100644
--- a/keyboards/handwired/qc60/proto/proto.c
+++ b/keyboards/handwired/qc60/proto/proto.c
@@ -15,7 +15,3 @@
  */
 
 #include "qc60.h"
-
-void matrix_init_kb(void) {
-    matrix_init_user();
-};
diff --git a/keyboards/handwired/reddot/reddot.c b/keyboards/handwired/reddot/reddot.c
index 4e1efc06cea..1c4720b5cf7 100755
--- a/keyboards/handwired/reddot/reddot.c
+++ b/keyboards/handwired/reddot/reddot.c
@@ -1,7 +1 @@
 #include "reddot.h"
-
-void matrix_init_kb(void) {
-
-        matrix_init_user();
-}
-
diff --git a/keyboards/handwired/retro_refit/retro_refit.c b/keyboards/handwired/retro_refit/retro_refit.c
index 3d610eba343..6b84e7d7c6e 100644
--- a/keyboards/handwired/retro_refit/retro_refit.c
+++ b/keyboards/handwired/retro_refit/retro_refit.c
@@ -8,8 +8,6 @@ void matrix_init_kb(void) {
     // Disable status LED on KB, enable status LED on Teensy (KB_STATUS = !TEENSY_STATUS)
     DDRD |= (1<<6);
     PORTD |= (1<<6);
-
-    matrix_init_user();
 };
 
 void led_set_kb(uint8_t usb_led) {
@@ -42,6 +40,4 @@ void led_set_kb(uint8_t usb_led) {
         DDRC &= ~(1<<6);
         PORTC &= ~(1<<6);
     }
-
-    led_set_user(usb_led);
-};
\ No newline at end of file
+};
diff --git a/keyboards/handwired/sticc14/sticc14.c b/keyboards/handwired/sticc14/sticc14.c
index 94ca7c85f0a..50c3a4a4b71 100644
--- a/keyboards/handwired/sticc14/sticc14.c
+++ b/keyboards/handwired/sticc14/sticc14.c
@@ -14,31 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "sticc14.h"
-
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-
-/*
-
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-
-  matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-  matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-  // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-  led_set_user(usb_led);
-}
-
-*/
diff --git a/keyboards/handwired/tennie/tennie.c b/keyboards/handwired/tennie/tennie.c
index 3baedcad7ed..2bc232f2c98 100644
--- a/keyboards/handwired/tennie/tennie.c
+++ b/keyboards/handwired/tennie/tennie.c
@@ -15,24 +15,6 @@
  */
 #include "tennie.h"
 
-void matrix_init_kb(void) {
-	matrix_init_user();
-}
-
 void matrix_post_init(void) {
 	rgblight_enable_noeeprom();
-	keyboard_post_init_user();
 }
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-//void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-//	led_set_user(usb_led);
-//}
diff --git a/keyboards/handwired/terminus_mini/terminus_mini.c b/keyboards/handwired/terminus_mini/terminus_mini.c
index dd04144b443..295fa4c5a78 100644
--- a/keyboards/handwired/terminus_mini/terminus_mini.c
+++ b/keyboards/handwired/terminus_mini/terminus_mini.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "terminus_mini.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
diff --git a/keyboards/handwired/trackpoint/trackpoint.c b/keyboards/handwired/trackpoint/trackpoint.c
index 124995a6426..e1b144241ca 100644
--- a/keyboards/handwired/trackpoint/trackpoint.c
+++ b/keyboards/handwired/trackpoint/trackpoint.c
@@ -1,5 +1 @@
 #include "trackpoint.h"
-
-void matrix_init_kb(void) {
-
-}
diff --git a/keyboards/handwired/traveller/traveller.c b/keyboards/handwired/traveller/traveller.c
index 6975aa30251..a03dd9dbdef 100644
--- a/keyboards/handwired/traveller/traveller.c
+++ b/keyboards/handwired/traveller/traveller.c
@@ -1,29 +1,6 @@
 #include "traveller.h"
 
-__attribute__ ((weak))
-void matrix_init_user(void) {
-        // leave this function blank - it can be defined in a keymap file
-};
-
-__attribute__ ((weak))
-void matrix_scan_user(void) {
-        // leave this function blank - it can be defined in a keymap file
-}
-
-__attribute__ ((weak))
-void process_action_user(keyrecord_t *record) {
-        // leave this function blank - it can be defined in a keymap file
-}
-
-__attribute__ ((weak))
-void led_set_user(uint8_t usb_led) {
-        // leave this function blank - it can be defined in a keymap file
-}
-
 void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-
 #ifdef RGBLIGHT_ENABLE
         rgblight_init();
         rgblight_mode(1); // solid, no timer
@@ -33,22 +10,4 @@ void matrix_init_kb(void) {
 // Turn status LED on
         DDRC |= (1<<7);
         PORTC |= (1<<7);
-
-        matrix_init_user();
 }
-
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
-
-
diff --git a/keyboards/handwired/woodpad/woodpad.c b/keyboards/handwired/woodpad/woodpad.c
index 186e51360b5..65fa3ca22b1 100644
--- a/keyboards/handwired/woodpad/woodpad.c
+++ b/keyboards/handwired/woodpad/woodpad.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "woodpad.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
diff --git a/keyboards/handwired/wulkan/wulkan.c b/keyboards/handwired/wulkan/wulkan.c
index 5409fa5b55c..72024175d2f 100644
--- a/keyboards/handwired/wulkan/wulkan.c
+++ b/keyboards/handwired/wulkan/wulkan.c
@@ -1,6 +1 @@
 #include "wulkan.h"
-
-void matrix_init_kb(void) {
-  matrix_init_user();
-}
-
diff --git a/keyboards/handwired/xealous/rev1/rev1.c b/keyboards/handwired/xealous/rev1/rev1.c
index 3e51421d857..520a869e57b 100644
--- a/keyboards/handwired/xealous/rev1/rev1.c
+++ b/keyboards/handwired/xealous/rev1/rev1.c
@@ -1,6 +1 @@
-#include "quantum.h"
 #include "rev1.h"
-
-void matrix_init_kb(void) {
-	matrix_init_user();
-}
diff --git a/keyboards/handwired/xealousbrown/xealousbrown.c b/keyboards/handwired/xealousbrown/xealousbrown.c
index 5c8e2fb18a5..187cf003b95 100644
--- a/keyboards/handwired/xealousbrown/xealousbrown.c
+++ b/keyboards/handwired/xealousbrown/xealousbrown.c
@@ -1,8 +1 @@
 #include "xealousbrown.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
diff --git a/keyboards/hecomi/hecomi.c b/keyboards/hecomi/hecomi.c
index 3eeed446e7f..c283fe6fc28 100644
--- a/keyboards/hecomi/hecomi.c
+++ b/keyboards/hecomi/hecomi.c
@@ -14,24 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "hecomi.h"
-#include "split_util.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
diff --git a/keyboards/helix/pico/matrix.c b/keyboards/helix/pico/matrix.c
index c2940e3b3e6..b180a92fa9d 100644
--- a/keyboards/helix/pico/matrix.c
+++ b/keyboards/helix/pico/matrix.c
@@ -64,12 +64,10 @@ static uint8_t matrix_master_scan(void);
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
diff --git a/keyboards/helix/pico/pico.c b/keyboards/helix/pico/pico.c
index 0775ec63e14..539abd53495 100644
--- a/keyboards/helix/pico/pico.c
+++ b/keyboards/helix/pico/pico.c
@@ -1,16 +1 @@
 #include "helix.h"
-
-
-#ifdef SSD1306OLED
-#include "ssd1306.h"
-
-void led_set_kb(uint8_t usb_led) {
-    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-    //led_set_user(usb_led);
-}
-#endif
-
-void matrix_init_kb(void) {
-
-	matrix_init_user();
-};
diff --git a/keyboards/helix/rev1/matrix.c b/keyboards/helix/rev1/matrix.c
index f2506868eaf..aff48457899 100644
--- a/keyboards/helix/rev1/matrix.c
+++ b/keyboards/helix/rev1/matrix.c
@@ -63,12 +63,10 @@ static void select_row(uint8_t row);
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
diff --git a/keyboards/helix/rev1/rev1.c b/keyboards/helix/rev1/rev1.c
index fc713e9090c..539abd53495 100644
--- a/keyboards/helix/rev1/rev1.c
+++ b/keyboards/helix/rev1/rev1.c
@@ -1,24 +1 @@
 #include "helix.h"
-
-
-#ifdef SSD1306OLED
-#include "ssd1306.h"
-
-void led_set_kb(uint8_t usb_led) {
-    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-    led_set_user(usb_led);
-}
-#endif
-
-void matrix_init_kb(void) {
-
-    // // green led on
-    // DDRD |= (1<<5);
-    // PORTD &= ~(1<<5);
-
-    // // orange led on
-    // DDRB |= (1<<0);
-    // PORTB &= ~(1<<0);
-
-	matrix_init_user();
-};
diff --git a/keyboards/helix/rev2/matrix.c b/keyboards/helix/rev2/matrix.c
index 70a6cb0a5e0..6b2718e821f 100644
--- a/keyboards/helix/rev2/matrix.c
+++ b/keyboards/helix/rev2/matrix.c
@@ -65,12 +65,10 @@ static uint8_t matrix_master_scan(void);
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
diff --git a/keyboards/helix/rev2/rev2.c b/keyboards/helix/rev2/rev2.c
index 751c796d8fe..539abd53495 100644
--- a/keyboards/helix/rev2/rev2.c
+++ b/keyboards/helix/rev2/rev2.c
@@ -1,17 +1 @@
 #include "helix.h"
-
-
-#ifdef SSD1306OLED
-#include "ssd1306.h"
-
-void led_set_kb(uint8_t usb_led) {
-    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-    //led_set_user(usb_led);
-}
-#endif
-
-void matrix_init_kb(void) {
-
-	matrix_init_user();
-};
-
diff --git a/keyboards/hid_liber/hid_liber.c b/keyboards/hid_liber/hid_liber.c
index 1d6fc67c5bd..092fa72fea3 100755
--- a/keyboards/hid_liber/hid_liber.c
+++ b/keyboards/hid_liber/hid_liber.c
@@ -21,14 +21,6 @@ void matrix_init_kb(void) {
     // put your keyboard start-up code here
     // runs once when the firmware starts up
     led_init_ports();
-    matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-    // put your looping keyboard code here
-    // runs every cycle (a lot)
-
-    matrix_scan_user();
 }
 
 void led_init_ports(void) {
@@ -45,6 +37,4 @@ void led_set_kb(uint8_t usb_led) {
         PORTB &= ~(1<<6);
     else
         PORTB |= (1<<6);
-
-    led_set_user(usb_led);
 }
diff --git a/keyboards/hid_liber/matrix.c b/keyboards/hid_liber/matrix.c
index 05554a24c8a..4510c2148b5 100755
--- a/keyboards/hid_liber/matrix.c
+++ b/keyboards/hid_liber/matrix.c
@@ -113,12 +113,10 @@ const uint8_t   col_bit[MATRIX_COLS] = {  0x00,   0x02,   0x04,   0x06,   0x08,
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
diff --git a/keyboards/hineybush/h87a/h87a.c b/keyboards/hineybush/h87a/h87a.c
index a59c680bf12..adfcff31a23 100644
--- a/keyboards/hineybush/h87a/h87a.c
+++ b/keyboards/hineybush/h87a/h87a.c
@@ -20,27 +20,11 @@ void matrix_init_kb(void) {
 	// runs once when the firmware starts up
    	setPinOutput(D5);
     setPinOutput(E6);
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
 }
 
 bool led_update_kb(led_t led_state) {
-    if(led_update_user(led_state)) {
-        writePin(D5, !led_state.caps_lock);
-        writePin(E6, !led_state.scroll_lock);
-    }
+    writePin(D5, !led_state.caps_lock);
+    writePin(E6, !led_state.scroll_lock);
     return true;
 }
 
@@ -50,5 +34,4 @@ void eeconfig_init_kb(void) {  // EEPROM is getting reset!
   rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 2); // set to RGB_RAINBOW_SWIRL by default
   
   eeconfig_update_kb(0);
-  eeconfig_init_user();
 }
diff --git a/keyboards/hineybush/h88/h88.c b/keyboards/hineybush/h88/h88.c
index 055be6537f5..ebd65982415 100644
--- a/keyboards/hineybush/h88/h88.c
+++ b/keyboards/hineybush/h88/h88.c
@@ -15,33 +15,12 @@
  */
 #include "h88.h"
 
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
-
 void led_init_ports(void) {
   setPinOutput(D5);
   setPinOutput(E6);
 }
 
-void led_set_user(uint8_t usb_led) {
-
+void led_set_kb(uint8_t usb_led) {
   if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
     setPinOutput(D5);
     writePinLow(D5);
@@ -55,6 +34,5 @@ void led_set_user(uint8_t usb_led) {
   } else {
     setPinInput(E6);
   }
-
 }
 
diff --git a/keyboards/hineybush/hbcp/hbcp.c b/keyboards/hineybush/hbcp/hbcp.c
index 22cb0e1684b..4a0868f34ae 100644
--- a/keyboards/hineybush/hbcp/hbcp.c
+++ b/keyboards/hineybush/hbcp/hbcp.c
@@ -35,38 +35,12 @@
 // #define HSV_custom_color H, S, V
 
 
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-
-
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-
-  matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-  matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-  // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-  led_set_user(usb_led);
-}
-
 void eeconfig_init_kb(void) {  // EEPROM is getting reset!
   rgblight_enable(); // Enable RGB by default
   rgblight_sethsv(0, 255, 128);  // Set default HSV - red hue, full saturation, medium brightness
   rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 2); // set to RGB_RAINBOW_SWIRL by default
 
   eeconfig_update_kb(0);
-  eeconfig_init_user();
 }
 
 #ifdef RGBLIGHT_ENABLE
diff --git a/keyboards/hineybush/hineyg80/hineyg80.c b/keyboards/hineybush/hineyg80/hineyg80.c
index f9178955971..5900aa8b851 100644
--- a/keyboards/hineybush/hineyg80/hineyg80.c
+++ b/keyboards/hineybush/hineyg80/hineyg80.c
@@ -15,20 +15,6 @@
  */
 #include "hineyg80.h"
 
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 	if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) {
@@ -52,5 +38,4 @@ void led_set_kb(uint8_t usb_led) {
         // Turn scrolllock off
 		writePinLow(B5);
     }
-	led_set_user(usb_led);
 }
diff --git a/keyboards/hineybush/physix/physix.c b/keyboards/hineybush/physix/physix.c
index 99614aeb784..207fdb48429 100644
--- a/keyboards/hineybush/physix/physix.c
+++ b/keyboards/hineybush/physix/physix.c
@@ -16,33 +16,20 @@
 
 #include "physix.h"
 
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-
-
 void matrix_init_kb(void) {
-    // put your keyboard start-up code here
-    // runs once when the firmware starts up
     setPinOutput(D3);
     setPinOutput(D5);
-    matrix_init_user();
 }
 
 bool led_update_kb(led_t led_state) {
-    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-    bool res = led_update_user(led_state);
-    if(res) {
-        // writePin sets the pin high for 1 and low for 0.
-        // In this example the pins are inverted, setting
-        // it low/0 turns it on, and high/1 turns the LED off.
-        // This behavior depends on whether the LED is between the pin
-        // and VCC or the pin and GND.
-        writePin(D3, led_state.caps_lock);
-        writePin(D5, led_state.scroll_lock);
-    }
-    return res;
-    return led_update_user(led_state);
+    // writePin sets the pin high for 1 and low for 0.
+    // In this example the pins are inverted, setting
+    // it low/0 turns it on, and high/1 turns the LED off.
+    // This behavior depends on whether the LED is between the pin
+    // and VCC or the pin and GND.
+    writePin(D3, led_state.caps_lock);
+    writePin(D5, led_state.scroll_lock);
+    return true;
 }
 
 
diff --git a/keyboards/hineybush/sm68/sm68.c b/keyboards/hineybush/sm68/sm68.c
index 8e2a95cde06..54fd8ab0a33 100644
--- a/keyboards/hineybush/sm68/sm68.c
+++ b/keyboards/hineybush/sm68/sm68.c
@@ -15,29 +15,3 @@
  */
 
 #include "sm68.h"
-
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-
-/*
-void matrix_init_kb(void) {
-    // put your keyboard start-up code here
-    // runs once when the firmware starts up
-
-    matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-    // put your looping keyboard code here
-    // runs every cycle (a lot)
-
-    matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-    led_set_user(usb_led);
-}
-*/
diff --git a/keyboards/honeycomb/honeycomb.c b/keyboards/honeycomb/honeycomb.c
index add4af15365..efa63f80bd6 100755
--- a/keyboards/honeycomb/honeycomb.c
+++ b/keyboards/honeycomb/honeycomb.c
@@ -76,17 +76,6 @@ void led_init(void) {
 void matrix_init_kb(void) {
 	// put your keyboard start-up code here
 	// runs once when the firmware starts up
-	matrix_init_user();
 	uart_init();
 	led_init();
 }
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-
-}
diff --git a/keyboards/honeycomb/matrix.c b/keyboards/honeycomb/matrix.c
index a06afb6d968..1a9db69bfc8 100755
--- a/keyboards/honeycomb/matrix.c
+++ b/keyboards/honeycomb/matrix.c
@@ -65,12 +65,10 @@ void matrix_scan_quantum(void) {
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
diff --git a/keyboards/hotdox/hotdox.c b/keyboards/hotdox/hotdox.c
index 00af9efb1e5..389017f41da 100644
--- a/keyboards/hotdox/hotdox.c
+++ b/keyboards/hotdox/hotdox.c
@@ -20,7 +20,6 @@ void ergodox_blink_all_leds(void);
 
 void matrix_init_kb(void) {
   ergodox_blink_all_leds();
-  matrix_init_user();
 }
 
 void ergodox_blink_all_leds(void)
diff --git a/keyboards/hotdox/matrix.c b/keyboards/hotdox/matrix.c
index 605be30220e..e601c21ed8d 100644
--- a/keyboards/hotdox/matrix.c
+++ b/keyboards/hotdox/matrix.c
@@ -45,14 +45,10 @@ __attribute__ ((weak))
 void matrix_scan_user(void) {}
 
 __attribute__ ((weak))
-void matrix_init_kb(void) {
-  matrix_init_user();
-}
+void matrix_init_kb(void) {}
 
 __attribute__ ((weak))
-void matrix_scan_kb(void) {
-  matrix_scan_user();
-}
+void matrix_scan_kb(void) {}
 
 inline
 uint8_t matrix_rows(void)
diff --git a/keyboards/hs60/v1/v1.c b/keyboards/hs60/v1/v1.c
index 7d421c37047..e09dd216588 100644
--- a/keyboards/hs60/v1/v1.c
+++ b/keyboards/hs60/v1/v1.c
@@ -374,17 +374,6 @@ void matrix_init_kb(void) {
 		// Save the magic number last, in case saving was interrupted
 		eeprom_set_valid(true);
 	}*/
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	//backlight_set_indicator_state(usb_led);
 }
 
 void suspend_power_down_kb(void)
diff --git a/keyboards/hub16/matrix.c b/keyboards/hub16/matrix.c
index ad77c923bea..6da3e4fac70 100644
--- a/keyboards/hub16/matrix.c
+++ b/keyboards/hub16/matrix.c
@@ -267,4 +267,4 @@ static bool read_encoder_values(matrix_row_t current_matrix[], uint8_t current_r
     current_matrix[current_row] |= btn_2_rising ? (1 << 1) : 0;
 
     return (last_row_value != current_matrix[current_row]);
-}
\ No newline at end of file
+}
diff --git a/keyboards/idobo/idobo.c b/keyboards/idobo/idobo.c
index 4b456283fd5..ccf654f8713 100644
--- a/keyboards/idobo/idobo.c
+++ b/keyboards/idobo/idobo.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "idobo.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
diff --git a/keyboards/illuminati/is0/is0.c b/keyboards/illuminati/is0/is0.c
index afd9c3facf5..770a47f0edd 100644
--- a/keyboards/illuminati/is0/is0.c
+++ b/keyboards/illuminati/is0/is0.c
@@ -14,31 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "is0.h"
-
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-
-/*
-
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-
-  matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-  matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-  // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-  led_set_user(usb_led);
-}
-
-*/
diff --git a/keyboards/infinity60/infinity60.c b/keyboards/infinity60/infinity60.c
index fdeed5124d1..e471250febb 100644
--- a/keyboards/infinity60/infinity60.c
+++ b/keyboards/infinity60/infinity60.c
@@ -15,18 +15,3 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "infinity60.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
diff --git a/keyboards/infinity60/matrix.c b/keyboards/infinity60/matrix.c
index ba16e690062..063637e6ec3 100644
--- a/keyboards/infinity60/matrix.c
+++ b/keyboards/infinity60/matrix.c
@@ -180,12 +180,10 @@ void matrix_print(void)
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
diff --git a/keyboards/ivy/rev1/rev1.c b/keyboards/ivy/rev1/rev1.c
index c099e32c497..007ef672532 100644
--- a/keyboards/ivy/rev1/rev1.c
+++ b/keyboards/ivy/rev1/rev1.c
@@ -1,5 +1 @@
 #include "ivy.h"
-
-void matrix_init_kb(void) {
-	matrix_init_user();
-};
diff --git a/keyboards/jae/j01/j01.c b/keyboards/jae/j01/j01.c
index 40814338d26..81e59235dca 100644
--- a/keyboards/jae/j01/j01.c
+++ b/keyboards/jae/j01/j01.c
@@ -15,31 +15,3 @@
  */
 
 #include "j01.h"
-
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-
-
-void matrix_init_kb(void) {
-    // put your keyboard start-up code here
-    // runs once when the firmware starts up
-
-    matrix_init_user();
-    setPinOutput(E6);
-}
-
-void matrix_scan_kb(void) {
-    // put your looping keyboard code here
-    // runs every cycle (a lot)
-
-    matrix_scan_user();
-}
-
-bool led_update_kb(led_t led_state) {
-    if(led_update_user(led_state)) {
-        writePin(E6, !led_state.caps_lock);
-    }
-
-    return true;
-}
diff --git a/keyboards/jc65/v32u4/v32u4.c b/keyboards/jc65/v32u4/v32u4.c
index 14cbf40185b..fdcfc0d9455 100644
--- a/keyboards/jc65/v32u4/v32u4.c
+++ b/keyboards/jc65/v32u4/v32u4.c
@@ -1,19 +1,5 @@
 #include "v32u4.h"
 
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
     if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
@@ -25,5 +11,4 @@ void led_set_kb(uint8_t usb_led) {
         DDRB &= ~(1<<2);
         PORTB &= ~(1<<2);
     }
-	led_set_user(usb_led);
 }
diff --git a/keyboards/k_type/k_type.c b/keyboards/k_type/k_type.c
index 0cffbedfd69..ef3f431dd96 100644
--- a/keyboards/k_type/k_type.c
+++ b/keyboards/k_type/k_type.c
@@ -15,19 +15,3 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "k_type.h"
-
-__attribute__ ((weak))
-void matrix_init_user(void) {
-}
-
-__attribute__ ((weak))
-void matrix_scan_user(void) {
-}
-
-void matrix_init_kb(void) {
-  matrix_init_user();
-};
-
-void matrix_scan_kb(void) {
-  matrix_scan_user();
-};
diff --git a/keyboards/kagamidget/kagamidget.c b/keyboards/kagamidget/kagamidget.c
index 663553aa605..e6823570182 100644
--- a/keyboards/kagamidget/kagamidget.c
+++ b/keyboards/kagamidget/kagamidget.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "kagamidget.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
diff --git a/keyboards/katana60/katana60.c b/keyboards/katana60/katana60.c
index 68a017c4488..7ed7ce66eed 100644
--- a/keyboards/katana60/katana60.c
+++ b/keyboards/katana60/katana60.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "katana60.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
diff --git a/keyboards/kbdfans/kbd19x/kbd19x.c b/keyboards/kbdfans/kbd19x/kbd19x.c
index deb6d8cb783..ac6490ba366 100644
--- a/keyboards/kbdfans/kbd19x/kbd19x.c
+++ b/keyboards/kbdfans/kbd19x/kbd19x.c
@@ -26,20 +26,6 @@ extern inline void kbd19x_sclk_led_off(void);
 extern inline void kbd19x_nmlk_led_on(void);
 extern inline void kbd19x_nmlk_led_off(void);
 
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
@@ -60,6 +46,4 @@ void led_set_kb(uint8_t usb_led) {
   } else {
     kbd19x_sclk_led_off();
   }
-
-  led_set_user(usb_led);
 }
diff --git a/keyboards/kbdfans/kbd4x/kbd4x.c b/keyboards/kbdfans/kbd4x/kbd4x.c
index dcb378b9e5e..c7e57979322 100644
--- a/keyboards/kbdfans/kbd4x/kbd4x.c
+++ b/keyboards/kbdfans/kbd4x/kbd4x.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "kbd4x.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
diff --git a/keyboards/kbdfans/kbd66/kbd66.c b/keyboards/kbdfans/kbd66/kbd66.c
index d08a378a941..c4f56c17171 100644
--- a/keyboards/kbdfans/kbd66/kbd66.c
+++ b/keyboards/kbdfans/kbd66/kbd66.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "kbd66.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
diff --git a/keyboards/kbdfans/kbd67/hotswap/hotswap.c b/keyboards/kbdfans/kbd67/hotswap/hotswap.c
index 60f355e240b..60808979c98 100644
--- a/keyboards/kbdfans/kbd67/hotswap/hotswap.c
+++ b/keyboards/kbdfans/kbd67/hotswap/hotswap.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "hotswap.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/mkii_soldered.c b/keyboards/kbdfans/kbd67/mkii_soldered/mkii_soldered.c
index 64d6733ddf7..b685fa824ac 100644
--- a/keyboards/kbdfans/kbd67/mkii_soldered/mkii_soldered.c
+++ b/keyboards/kbdfans/kbd67/mkii_soldered/mkii_soldered.c
@@ -14,28 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "mkii_soldered.h"
-
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-
-/*
-
-void matrix_init_kb(void) {  
-
-  matrix_init_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-  
-  led_set_user(usb_led);
-}
-
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-  matrix_scan_user();
-}
-
-*/
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c b/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c
index 8991244d753..bd9fb86313d 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c
@@ -98,21 +98,17 @@ led_config_t g_led_config = { {
 #endif
 
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 void suspend_power_down_kb(void)
 {
     rgb_matrix_set_suspend_state(true);
-    suspend_power_down_user();
 }
 
 void suspend_wakeup_init_kb(void)
 {
     rgb_matrix_set_suspend_state(false);
-    suspend_wakeup_init_user();
 }
 
 __attribute__ ((weak))
diff --git a/keyboards/kbdfans/kbd67/rev1/rev1.c b/keyboards/kbdfans/kbd67/rev1/rev1.c
index ae42a88033d..2abf3d3f722 100644
--- a/keyboards/kbdfans/kbd67/rev1/rev1.c
+++ b/keyboards/kbdfans/kbd67/rev1/rev1.c
@@ -15,23 +15,7 @@
  */
 #include "rev1.h"
 
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
 void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
   if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
 		DDRB |= (1 << 2);
 		PORTB &= ~(1 << 2);
@@ -39,6 +23,4 @@ void led_set_kb(uint8_t usb_led) {
 		DDRB &= ~(1 << 2);
 		PORTB &= ~(1 << 2);
 	}
-
-	led_set_user(usb_led);
 }
diff --git a/keyboards/kbdfans/kbd67/rev2/rev2.c b/keyboards/kbdfans/kbd67/rev2/rev2.c
index 7406978ebf4..2a70f45c3cb 100644
--- a/keyboards/kbdfans/kbd67/rev2/rev2.c
+++ b/keyboards/kbdfans/kbd67/rev2/rev2.c
@@ -14,22 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "rev2.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-	led_set_user(usb_led);
-}