diff --git a/keyboards/kbdfans/kbd6x/kbd6x.c b/keyboards/kbdfans/kbd6x/kbd6x.c
index 9c7c9381515..bca5774a7ae 100644
--- a/keyboards/kbdfans/kbd6x/kbd6x.c
+++ b/keyboards/kbdfans/kbd6x/kbd6x.c
@@ -15,20 +15,6 @@
  */
 #include "kbd6x.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) {
 	if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
 		DDRB |= (1 << 6); 
@@ -37,6 +23,4 @@ void led_set_kb(uint8_t usb_led) {
 		DDRB &= ~(1 << 6); 
 		PORTB &= ~(1 << 6);
 	}
-	
-	led_set_user(usb_led);
 }
diff --git a/keyboards/kbdfans/kbd75/rev1/rev1.c b/keyboards/kbdfans/kbd75/rev1/rev1.c
index 151e395e3c4..2095a56f07c 100644
--- a/keyboards/kbdfans/kbd75/rev1/rev1.c
+++ b/keyboards/kbdfans/kbd75/rev1/rev1.c
@@ -7,11 +7,8 @@ void led_set_kb(uint8_t usb_led) {
   } else {
     writePinHigh(B2);
   }
-
-  led_set_user(usb_led);
 }
 
 void matrix_init_kb(void) {
   setPinOutput(B2);
-  matrix_init_user();
 }
diff --git a/keyboards/kbdfans/kbd75/rev2/rev2.c b/keyboards/kbdfans/kbd75/rev2/rev2.c
index bf91d400921..fa869f38289 100644
--- a/keyboards/kbdfans/kbd75/rev2/rev2.c
+++ b/keyboards/kbdfans/kbd75/rev2/rev2.c
@@ -7,11 +7,8 @@ void led_set_kb(uint8_t usb_led) {
   } else {
     writePinHigh(B2);
   }
-
-  led_set_user(usb_led);
 }
 
 void matrix_init_kb(void) {
   setPinOutput(B2);
-  matrix_init_user();
 }
diff --git a/keyboards/kbdfans/kbd8x/kbd8x.c b/keyboards/kbdfans/kbd8x/kbd8x.c
index cac50fb2569..af7b93cdfcc 100644
--- a/keyboards/kbdfans/kbd8x/kbd8x.c
+++ b/keyboards/kbdfans/kbd8x/kbd8x.c
@@ -23,20 +23,6 @@ extern inline void num_led_on(void);
 extern inline void scroll_led_off(void);
 extern inline void scroll_led_on(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 {
         scroll_led_off();
     }
-
-	led_set_user(usb_led);
 }
diff --git a/keyboards/kbdfans/kbd8x_mk2/kbd8x_mk2.c b/keyboards/kbdfans/kbd8x_mk2/kbd8x_mk2.c
index 54fd5fd7896..4eae7ec275b 100644
--- a/keyboards/kbdfans/kbd8x_mk2/kbd8x_mk2.c
+++ b/keyboards/kbdfans/kbd8x_mk2/kbd8x_mk2.c
@@ -24,8 +24,6 @@ void matrix_init_kb(void) {
   
   setPinOutput(B2);
   setPinOutput(E6);
-
-  matrix_init_user();
 }
 
 void led_set_kb(uint8_t usb_led) {
@@ -44,21 +42,4 @@ void led_set_kb(uint8_t usb_led) {
   } else {
     writePinHigh(B2);
   }
-
-  led_set_user(usb_led);
 }
-
-// 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_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-  matrix_scan_user();
-}
-
-*/
diff --git a/keyboards/kbdfans/kbdmini/kbdmini.c b/keyboards/kbdfans/kbdmini/kbdmini.c
index b605d73062e..049259db137 100644
--- a/keyboards/kbdfans/kbdmini/kbdmini.c
+++ b/keyboards/kbdfans/kbdmini/kbdmini.c
@@ -74,20 +74,12 @@ led_config_t g_led_config = { {
     1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
 } };
-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/kbdfans/kbdpad_mk2/kbdpad_mk2.c b/keyboards/kbdfans/kbdpad_mk2/kbdpad_mk2.c
index cf49e0eff49..394fdce69ed 100644
--- a/keyboards/kbdfans/kbdpad_mk2/kbdpad_mk2.c
+++ b/keyboards/kbdfans/kbdpad_mk2/kbdpad_mk2.c
@@ -21,8 +21,6 @@ void matrix_init_kb(void) {
   // Sinking setup (5V -> LED/Res -> Pin)
   
   setPinOutput(B4);
-
-  matrix_init_user();
 }
 
 void led_set_kb(uint8_t usb_led) {
@@ -34,21 +32,4 @@ void led_set_kb(uint8_t usb_led) {
   } else {
     writePinHigh(B4);
   }
-
-  led_set_user(usb_led);
 }
-
-// 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_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-  matrix_scan_user();
-}
-
-*/
diff --git a/keyboards/kc60se/kc60se.c b/keyboards/kc60se/kc60se.c
index e484d74db8d..743f945d016 100644
--- a/keyboards/kc60se/kc60se.c
+++ b/keyboards/kc60se/kc60se.c
@@ -16,15 +16,8 @@
 
 #include QMK_KEYBOARD_H
 
-void matrix_init_kb(void){
-    setPinOutput(B2);
-}
-
 bool led_update_kb(led_t led_state) {
-    bool res = led_update_user(led_state);
-    if(res) {
-        writePin(B2, !led_state.caps_lock);
-    }
-    return res;
+    writePin(B2, !led_state.caps_lock);
+    return true;
 }
 
diff --git a/keyboards/keebio/ergodicity/ergodicity.c b/keyboards/keebio/ergodicity/ergodicity.c
index e91a9bbd0ff..4b5649e1344 100644
--- a/keyboards/keebio/ergodicity/ergodicity.c
+++ b/keyboards/keebio/ergodicity/ergodicity.c
@@ -14,31 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "ergodicity.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/keebio/levinson/rev1/rev1.c b/keyboards/keebio/levinson/rev1/rev1.c
index 573fa787baa..72df88710ac 100644
--- a/keyboards/keebio/levinson/rev1/rev1.c
+++ b/keyboards/keebio/levinson/rev1/rev1.c
@@ -1,22 +1 @@
 #include "levinson.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/keebio/levinson/rev2/rev2.c b/keyboards/keebio/levinson/rev2/rev2.c
index 573fa787baa..72df88710ac 100644
--- a/keyboards/keebio/levinson/rev2/rev2.c
+++ b/keyboards/keebio/levinson/rev2/rev2.c
@@ -1,22 +1 @@
 #include "levinson.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/keebio/levinson/rev3/rev3.c b/keyboards/keebio/levinson/rev3/rev3.c
index 573fa787baa..72df88710ac 100644
--- a/keyboards/keebio/levinson/rev3/rev3.c
+++ b/keyboards/keebio/levinson/rev3/rev3.c
@@ -1,22 +1 @@
 #include "levinson.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/keebio/nyquist/rev1/rev1.c b/keyboards/keebio/nyquist/rev1/rev1.c
index 5f4cd32f695..520a869e57b 100644
--- a/keyboards/keebio/nyquist/rev1/rev1.c
+++ b/keyboards/keebio/nyquist/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/keebio/nyquist/rev2/rev2.c b/keyboards/keebio/nyquist/rev2/rev2.c
index 9922b8995ab..b1af81707d2 100644
--- a/keyboards/keebio/nyquist/rev2/rev2.c
+++ b/keyboards/keebio/nyquist/rev2/rev2.c
@@ -1,21 +1 @@
 #include "rev2.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/keebio/nyquist/rev3/rev3.c b/keyboards/keebio/nyquist/rev3/rev3.c
index 34500fb104d..51bfc7e21b9 100644
--- a/keyboards/keebio/nyquist/rev3/rev3.c
+++ b/keyboards/keebio/nyquist/rev3/rev3.c
@@ -1,21 +1 @@
 #include "rev3.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/keebio/quefrency/rev1/rev1.c b/keyboards/keebio/quefrency/rev1/rev1.c
index a690a7eff7b..d713a0ff3a6 100644
--- a/keyboards/keebio/quefrency/rev1/rev1.c
+++ b/keyboards/keebio/quefrency/rev1/rev1.c
@@ -1,5 +1 @@
 #include "quefrency.h"
-
-void matrix_init_kb(void) {
-	matrix_init_user();
-};
diff --git a/keyboards/keebio/rorschach/rev1/rev1.c b/keyboards/keebio/rorschach/rev1/rev1.c
index cd7f935ca5c..520a869e57b 100644
--- a/keyboards/keebio/rorschach/rev1/rev1.c
+++ b/keyboards/keebio/rorschach/rev1/rev1.c
@@ -1,14 +1 @@
 #include "rev1.h"
-
-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/keebio/tragicforce68/tragicforce68.c b/keyboards/keebio/tragicforce68/tragicforce68.c
index 327197d254d..42df8ec295f 100644
--- a/keyboards/keebio/tragicforce68/tragicforce68.c
+++ b/keyboards/keebio/tragicforce68/tragicforce68.c
@@ -1,8 +1 @@
 #include "tragicforce68.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/keebio/wavelet/wavelet.c b/keyboards/keebio/wavelet/wavelet.c
index 2bc9c65a52e..b87773ced98 100644
--- a/keyboards/keebio/wavelet/wavelet.c
+++ b/keyboards/keebio/wavelet/wavelet.c
@@ -1,18 +1,5 @@
 #include "wavelet.h"
 
-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();
-};
-
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
 const keypos_t hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/keyhive/maypad/maypad.c b/keyboards/keyhive/maypad/maypad.c
index d7434194b85..426575b3d26 100644
--- a/keyboards/keyhive/maypad/maypad.c
+++ b/keyboards/keyhive/maypad/maypad.c
@@ -14,31 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "maypad.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/kinesis/alvicstep/alvicstep.c b/keyboards/kinesis/alvicstep/alvicstep.c
index fcc6e854c7e..8f41ff10850 100644
--- a/keyboards/kinesis/alvicstep/alvicstep.c
+++ b/keyboards/kinesis/alvicstep/alvicstep.c
@@ -67,20 +67,10 @@ void blink_all_leds(void)
 
  void matrix_init_kb(void) {
 	  blink_all_leds();
-	  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
-
 //Copyright 2014 Warren Janssens <warren.janssens@gmail.com>
    uint8_t leds = 0xF0;
     if (usb_led & 1 << USB_LED_NUM_LOCK)
@@ -90,9 +80,6 @@ void led_set_kb(uint8_t usb_led) {
     if (usb_led & 1 << USB_LED_SCROLL_LOCK)
         leds &= ~0x20;
     PORTD = (PORTD & 0x0F) | leds;
-
-	led_set_user(usb_led);
-
 }
 
 
diff --git a/keyboards/kinesis/alvicstep/matrix.c b/keyboards/kinesis/alvicstep/matrix.c
index be2bab039cf..bdc41804690 100644
--- a/keyboards/kinesis/alvicstep/matrix.c
+++ b/keyboards/kinesis/alvicstep/matrix.c
@@ -46,12 +46,10 @@ static void select_rows(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/kinesis/stapelberg/stapelberg.c b/keyboards/kinesis/stapelberg/stapelberg.c
index b4cf877e11c..5329c57041b 100644
--- a/keyboards/kinesis/stapelberg/stapelberg.c
+++ b/keyboards/kinesis/stapelberg/stapelberg.c
@@ -8,15 +8,6 @@ void matrix_init_kb(void) {
     DDRF |= (1<<1); // ScrLock LED
     DDRF |= (1<<2); // NumLock LED
     DDRF |= (1<<3); // CapsLock LED
-
-	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() {
diff --git a/keyboards/kira75/kira75.c b/keyboards/kira75/kira75.c
index faa36a53c99..bf9afcc8f1a 100644
--- a/keyboards/kira75/kira75.c
+++ b/keyboards/kira75/kira75.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "kira75.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/kmac/kmac.c b/keyboards/kmac/kmac.c
index b70ec0f656a..d2df0d8bccd 100644
--- a/keyboards/kmac/kmac.c
+++ b/keyboards/kmac/kmac.c
@@ -29,21 +29,8 @@ void matrix_init_kb(void) {
     // runs once when the firmware starts up
     setPinOutput(CAPS_PIN);
     setPinOutput(SCROLL_PIN);
-
-    matrix_init_user();
 }
 
-/*
-
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-  matrix_scan_user();
-}
-
-*/
-
 /* LED pin configuration
  * Scroll Lock: Low PE6
  * Caps Lock: Low PB0
@@ -60,8 +47,6 @@ void led_set_kb(uint8_t usb_led) {
     } else {
         writePinHigh(SCROLL_PIN);
     }
-
-    led_set_user(usb_led);
 }
 
 void backlight_init_ports(void) {
diff --git a/keyboards/kmac/matrix.c b/keyboards/kmac/matrix.c
index 9bc59a07844..7affbd1d910 100644
--- a/keyboards/kmac/matrix.c
+++ b/keyboards/kmac/matrix.c
@@ -48,13 +48,9 @@ static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
 static matrix_row_t raw_matrix[MATRIX_ROWS];  // raw values
 static matrix_row_t matrix[MATRIX_ROWS];      // debounced values
 
-__attribute__((weak)) void matrix_init_quantum(void) { matrix_init_kb(); }
+__attribute__((weak)) void matrix_init_kb(void) {}
 
-__attribute__((weak)) void matrix_scan_quantum(void) { matrix_scan_kb(); }
-
-__attribute__((weak)) void matrix_init_kb(void) { matrix_init_user(); }
-
-__attribute__((weak)) void matrix_scan_kb(void) { matrix_scan_user(); }
+__attribute__((weak)) void matrix_scan_kb(void) {}
 
 __attribute__((weak)) void matrix_init_user(void) {}
 
diff --git a/keyboards/kmini/kmini.c b/keyboards/kmini/kmini.c
index 48638cd2293..ddea3596d3e 100755
--- a/keyboards/kmini/kmini.c
+++ b/keyboards/kmini/kmini.c
@@ -19,14 +19,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) {
@@ -40,7 +32,3 @@ void led_init_ports(void) {
  * Side1: Low B3
  * Side2: Low B2
  */
-void led_set_kb(uint8_t usb_led) {
-    led_set_user(usb_led);
-}
-
diff --git a/keyboards/kmini/matrix.c b/keyboards/kmini/matrix.c
index 9888f1a7659..362e33226fb 100755
--- a/keyboards/kmini/matrix.c
+++ b/keyboards/kmini/matrix.c
@@ -55,14 +55,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/knops/mini/mini.c b/keyboards/knops/mini/mini.c
index 54da2895936..f378cc5d5f9 100644
--- a/keyboards/knops/mini/mini.c
+++ b/keyboards/knops/mini/mini.c
@@ -14,24 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "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/kona_classic/kona_classic.c b/keyboards/kona_classic/kona_classic.c
index 806cb1f5ea3..af4ea06e6d3 100644
--- a/keyboards/kona_classic/kona_classic.c
+++ b/keyboards/kona_classic/kona_classic.c
@@ -14,25 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "kona_classic.h"
-
-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) {
-//    DDRB |= (1<<6) | (1<<7); // OUT
-}
-
-void led_set_kb(uint8_t usb_led) {
-//    led_set_user(usb_led);
-}
diff --git a/keyboards/kudox/rev1/rev1.c b/keyboards/kudox/rev1/rev1.c
index 3b39ee764d4..abcdf4843e5 100644
--- a/keyboards/kudox/rev1/rev1.c
+++ b/keyboards/kudox/rev1/rev1.c
@@ -1,22 +1 @@
 #include "kudox.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/kudox_game/rev1/rev1.c b/keyboards/kudox_game/rev1/rev1.c
index 8f1b8b2b681..32356f8a4ae 100644
--- a/keyboards/kudox_game/rev1/rev1.c
+++ b/keyboards/kudox_game/rev1/rev1.c
@@ -1,22 +1 @@
 #include "kudox_game.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/kv/revt/revt.c b/keyboards/kv/revt/revt.c
index 443a814015d..d8b381fc8b5 100644
--- a/keyboards/kv/revt/revt.c
+++ b/keyboards/kv/revt/revt.c
@@ -20,6 +20,4 @@ void matrix_init_kb(void) {
   // Turn status LED on
   setPinOutput(C14);
   writePinHigh(C14);
-
-  matrix_init_user();
 }
diff --git a/keyboards/launchpad/rev1/rev1.c b/keyboards/launchpad/rev1/rev1.c
index cff4edf9f87..cc2812a76c6 100644
--- a/keyboards/launchpad/rev1/rev1.c
+++ b/keyboards/launchpad/rev1/rev1.c
@@ -1,9 +1 @@
 #include "launchpad.h"
-
-void matrix_init_kb(void) {
-	// Undo init of RX LED, we use that port currently
-	//DDRB &= ~(1<<0);
-	
-	matrix_init_user();
-	
-};
diff --git a/keyboards/lets_split/rev1/rev1.c b/keyboards/lets_split/rev1/rev1.c
index c243f71bc4a..3caa114c221 100644
--- a/keyboards/lets_split/rev1/rev1.c
+++ b/keyboards/lets_split/rev1/rev1.c
@@ -1,15 +1 @@
 #include "lets_split.h"
-
-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/lets_split/rev2/rev2.c b/keyboards/lets_split/rev2/rev2.c
index 3ae967c0731..3caa114c221 100644
--- a/keyboards/lets_split/rev2/rev2.c
+++ b/keyboards/lets_split/rev2/rev2.c
@@ -1,23 +1 @@
 #include "lets_split.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/lets_split/sockets/sockets.c b/keyboards/lets_split/sockets/sockets.c
index d50678560a9..3caa114c221 100644
--- a/keyboards/lets_split/sockets/sockets.c
+++ b/keyboards/lets_split/sockets/sockets.c
@@ -1,22 +1 @@
 #include "lets_split.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/lfkeyboards/lfk65_hs/lfk65_hs.c b/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.c
index 6284489c62e..12ff609a2ab 100644
--- a/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.c
+++ b/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.c
@@ -4,27 +4,10 @@
 #include "lfk65_hs.h"
 #include "keymap.h"
 
-void matrix_init_kb(void)
-{
-    matrix_init_user();
-
-}
-
-void matrix_scan_kb(void)
-{
-    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.
-     */
     if (keycode == RESET) {
         reset_keyboard_kb();
-    } else {
     }
     return true;
 }
diff --git a/keyboards/lfkeyboards/lfk78/lfk78.c b/keyboards/lfkeyboards/lfk78/lfk78.c
index d615dcb9c81..eb7b5e6b691 100644
--- a/keyboards/lfkeyboards/lfk78/lfk78.c
+++ b/keyboards/lfkeyboards/lfk78/lfk78.c
@@ -24,8 +24,6 @@ const Layer_Info layer_info[] = {
 
 void matrix_init_kb(void)
 {
-    matrix_init_user();
-
     // Configure the Layer LED
     // Set up 16 bit PWM: Fast PWM, mode 15, inverted
     TCCR1A = 0b11111110;
@@ -102,7 +100,6 @@ void matrix_scan_kb(void)
             }
         }
     }
-    matrix_scan_user();
 }
 
 void click(uint16_t freq, uint16_t duration){
@@ -119,11 +116,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.
-     */
     if (click_toggle && record->event.pressed){
         click(click_hz, click_time);
     }
@@ -223,7 +215,6 @@ void led_set_kb(uint8_t usb_led)
     }
 #endif // CAPSLOCK_LED
 #endif // ISS_ENABLE
-    led_set_user(usb_led);
 }
 
 // LFK lighting info
diff --git a/keyboards/lfkeyboards/lfk87/lfk87.c b/keyboards/lfkeyboards/lfk87/lfk87.c
index 2beb922a376..70c328772fb 100644
--- a/keyboards/lfkeyboards/lfk87/lfk87.c
+++ b/keyboards/lfkeyboards/lfk87/lfk87.c
@@ -27,7 +27,6 @@ void matrix_init_kb(void)
 {
     // put your keyboard start-up code here
     // runs once when the firmware starts up
-    matrix_init_user();
     set_rgb(31, 0x00, 0x00, 0x00);  // Caps lock
     set_rgb(32, 0xFF, 0x00, 0x00);  // Layer indicator, start red
 #ifndef AUDIO_ENABLE
@@ -89,7 +88,6 @@ void matrix_scan_kb(void)
             }
         }
     }
-    matrix_scan_user();
 }
 
 void click(uint16_t freq, uint16_t duration){
@@ -106,11 +104,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.
-     */
     if (click_toggle && record->event.pressed){
         click(click_hz, click_time);
     }
@@ -196,7 +189,6 @@ void led_set_kb(uint8_t usb_led)
     }else{
         set_rgb(31, 0x00, 0x00, 0x00);
     }
-    led_set_user(usb_led);
 }
 
 // Lighting info, see lighting.h for details
diff --git a/keyboards/lfkeyboards/lfkpad/lfkpad.c b/keyboards/lfkeyboards/lfkpad/lfkpad.c
index 59d66a37620..1d8b4233e37 100644
--- a/keyboards/lfkeyboards/lfkpad/lfkpad.c
+++ b/keyboards/lfkeyboards/lfkpad/lfkpad.c
@@ -13,8 +13,6 @@ uint16_t click_time = CLICK_MS;
 uint8_t click_toggle = CLICK_ENABLED;
 
 void matrix_init_kb(void) {
-    matrix_init_user();
-
 #ifndef AUDIO_ENABLE
     // If we're not using the audio pin, drive it low
     setPinOutput(C6);
@@ -64,8 +62,6 @@ void matrix_scan_kb(void) {
         twi_last_ready++;
     }
 #endif
-
-    matrix_scan_user();
 }
 
 void click(uint16_t freq, uint16_t duration) {
@@ -83,11 +79,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.
-     */
     if (click_toggle && record->event.pressed) {
         click(click_hz, click_time);
     }
diff --git a/keyboards/lfkeyboards/mini1800/mini1800.c b/keyboards/lfkeyboards/mini1800/mini1800.c
index 680bfa7cb53..91c7f88cd59 100644
--- a/keyboards/lfkeyboards/mini1800/mini1800.c
+++ b/keyboards/lfkeyboards/mini1800/mini1800.c
@@ -30,9 +30,6 @@ const Layer_Info layer_info[] = {
 
 void matrix_init_kb(void)
 {
-    // put your keyboard start-up code here
-    // runs once when the firmware starts up
-    matrix_init_user();
     set_rgb(31, 0x00, 0x00, 0x00);  // Caps lock
     set_rgb(32, 0xFF, 0x00, 0x00);  // Layer indicator, start red
 #ifndef AUDIO_ENABLE
@@ -95,7 +92,6 @@ void matrix_scan_kb(void)
             }
         }
     }
-    matrix_scan_user();
 }
 
 void click(uint16_t freq, uint16_t duration){
@@ -112,11 +108,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.
-     */
     if (click_toggle && record->event.pressed){
         click(click_hz, click_time);
     }
@@ -205,7 +196,6 @@ void led_set_kb(uint8_t usb_led)
     }else{
         set_rgb(31, 0x00, 0x00, 0x00);
     }
-    led_set_user(usb_led);
 }
 
 // Lighting info, see lighting.h for details
diff --git a/keyboards/lfkeyboards/smk65/smk65.c b/keyboards/lfkeyboards/smk65/smk65.c
index be14c0b7aa7..958eb70e020 100644
--- a/keyboards/lfkeyboards/smk65/smk65.c
+++ b/keyboards/lfkeyboards/smk65/smk65.c
@@ -15,8 +15,6 @@ uint8_t click_toggle = CLICK_ENABLED;
 
 void matrix_init_kb(void)
 {
-    matrix_init_user();
-
 #ifdef AUDIO_ENABLE
     // audio_init() sets PB5 to output and drives it low, which breaks our matrix
     // so reset PB5 to input
@@ -38,7 +36,6 @@ void matrix_scan_kb(void)
 #ifdef WATCHDOG_ENABLE
     wdt_reset();
 #endif
-    matrix_scan_user();
 }
 
 void click(uint16_t freq, uint16_t duration){
@@ -55,11 +52,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){
@@ -137,13 +129,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/lily58/rev1/matrix.c b/keyboards/lily58/rev1/matrix.c
index eaff974e5d8..752ce959e5c 100755
--- a/keyboards/lily58/rev1/matrix.c
+++ b/keyboards/lily58/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/m0lly/m0lly.c b/keyboards/m0lly/m0lly.c
index ab919857c29..cb7edccf344 100644
--- a/keyboards/m0lly/m0lly.c
+++ b/keyboards/m0lly/m0lly.c
@@ -20,14 +20,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) {
@@ -37,8 +29,7 @@ void led_init_ports(void) {
 }
 
 void led_set_kb(uint8_t usb_led) {
-//    led_set_user(usb_led);
-	if (usb_led & (1<<USB_LED_NUM_LOCK)) {
+    if (usb_led & (1<<USB_LED_NUM_LOCK)) {
         // Turn numlock on
 		PORTD |= (1<<2);
     } else {
diff --git a/keyboards/m10a/m10a.c b/keyboards/m10a/m10a.c
index 9cc7f069ae9..80cccc29707 100644
--- a/keyboards/m10a/m10a.c
+++ b/keyboards/m10a/m10a.c
@@ -1,5 +1 @@
 #include "m10a.h"
-
-void matrix_init_kb(void) {
-	matrix_init_user();
-}
\ No newline at end of file
diff --git a/keyboards/maartenwut/atom47/rev2/rev2.c b/keyboards/maartenwut/atom47/rev2/rev2.c
index 06fce06dad4..0c56ab57ef9 100644
--- a/keyboards/maartenwut/atom47/rev2/rev2.c
+++ b/keyboards/maartenwut/atom47/rev2/rev2.c
@@ -4,16 +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) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-	matrix_scan_user();
-};
-
 void led_init_ports(void) {
     // * Set our LED pins as output
     DDRB &= ~(1<<5);
@@ -30,5 +23,4 @@ void led_set_kb(uint8_t usb_led) {
         // Turn capslock off
         PORTF &= ~(1<<5);
     }
-	led_set_user(usb_led);
 }
diff --git a/keyboards/maartenwut/atom47/rev3/rev3.c b/keyboards/maartenwut/atom47/rev3/rev3.c
index c541ed559c6..c6e8f6b224a 100644
--- a/keyboards/maartenwut/atom47/rev3/rev3.c
+++ b/keyboards/maartenwut/atom47/rev3/rev3.c
@@ -4,16 +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) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-	matrix_scan_user();
-};
-
 void led_init_ports(void) {
     // * Set our LED pins as output
     DDRE |= (1 << 6);
@@ -21,7 +14,3 @@ void led_init_ports(void) {
 	//Set output high, so the capslock led is off
 	PORTE |= (1 << 6);
 }
-
-void led_set_kb(uint8_t usb_led) {
-    led_set_user(usb_led);
-}
diff --git a/keyboards/maartenwut/minitomic/minitomic.c b/keyboards/maartenwut/minitomic/minitomic.c
index 71447b19664..286986e845e 100644
--- a/keyboards/maartenwut/minitomic/minitomic.c
+++ b/keyboards/maartenwut/minitomic/minitomic.c
@@ -19,32 +19,20 @@ 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) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-    matrix_scan_user();
-}
-
 void led_init_ports(void) {
 	//Set led pin as output, then high (off)
     writePinHigh(C7);
 }
 
 bool led_update_kb(led_t led_state) {
-    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(C7, !led_state.caps_lock);
-    }
-    return 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(C7, !led_state.caps_lock);
 }
 
diff --git a/keyboards/maartenwut/mx5160/mx5160.c b/keyboards/maartenwut/mx5160/mx5160.c
index 96859693c25..f7ad5561bce 100644
--- a/keyboards/maartenwut/mx5160/mx5160.c
+++ b/keyboards/maartenwut/mx5160/mx5160.c
@@ -20,17 +20,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) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-  matrix_scan_user();
-}
-
 void led_init_ports(void) {
 	//Set led pin as output, then high (off)
 	
@@ -48,11 +40,8 @@ void led_init_ports(void) {
 }
 
 bool led_update_kb(led_t led_state) {
-    bool res = led_update_user(led_state);
-    if (res) {
-        writePin(B2, !led_state.num_lock);
-        writePin(B1, !led_state.caps_lock);
-        writePin(B3, !led_state.scroll_lock);
-    }
-    return res;
+    writePin(B2, !led_state.num_lock);
+    writePin(B1, !led_state.caps_lock);
+    writePin(B3, !led_state.scroll_lock);
+    return true;
 }
diff --git a/keyboards/maartenwut/ta65/ta65.c b/keyboards/maartenwut/ta65/ta65.c
index 4f67a0203da..ca9aafb1b73 100644
--- a/keyboards/maartenwut/ta65/ta65.c
+++ b/keyboards/maartenwut/ta65/ta65.c
@@ -1,13 +1 @@
 #include "ta65.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/maartenwut/wasdat/wasdat.c b/keyboards/maartenwut/wasdat/wasdat.c
index a2ec320f78f..918b2962591 100644
--- a/keyboards/maartenwut/wasdat/wasdat.c
+++ b/keyboards/maartenwut/wasdat/wasdat.c
@@ -15,15 +15,7 @@
  */
 #include "wasdat.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();
     led_init_ports();
 }
 
@@ -37,11 +29,8 @@ void led_init_ports(void) {
 }
 
 bool led_update_kb(led_t led_state) {
-    if(led_update_user(led_state)) {
-        writePin(B0, !led_state.caps_lock);
-        writePin(B1, !led_state.scroll_lock);
-        writePin(B2, !led_state.num_lock);
-    }
-
+    writePin(B0, !led_state.caps_lock);
+    writePin(B1, !led_state.scroll_lock);
+    writePin(B2, !led_state.num_lock);
     return true;
 }
diff --git a/keyboards/maartenwut/wonderland/wonderland.c b/keyboards/maartenwut/wonderland/wonderland.c
index 44154438161..162d82a276b 100755
--- a/keyboards/maartenwut/wonderland/wonderland.c
+++ b/keyboards/maartenwut/wonderland/wonderland.c
@@ -4,17 +4,9 @@ __attribute__ ((weak))
 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();
 };
 
-__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_init_ports(void) {
     // * Set our LED pins as output
@@ -24,11 +16,8 @@ void led_init_ports(void) {
 }
 
 bool led_update_kb(led_t led_state) {
-    bool runDefault = led_update_user(led_state);
-    if (runDefault) {
-      writePin(B1, !led_state.num_lock);
-      writePin(B2, !led_state.caps_lock);
-      writePin(B3, !led_state.scroll_lock);
-    }
-    return runDefault;
+    writePin(B1, !led_state.num_lock);
+    writePin(B2, !led_state.caps_lock);
+    writePin(B3, !led_state.scroll_lock);
+    return true;
 }
diff --git a/keyboards/massdrop/alt/matrix.c b/keyboards/massdrop/alt/matrix.c
index 3141155712a..94d20987558 100644
--- a/keyboards/massdrop/alt/matrix.c
+++ b/keyboards/massdrop/alt/matrix.c
@@ -34,12 +34,10 @@ uint32_t row_masks[2]; //NOTE: If more than PA PB used in the future, adjust cod
 
 __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/massdrop/ctrl/matrix.c b/keyboards/massdrop/ctrl/matrix.c
index f3529fe72a9..8059c41fd26 100644
--- a/keyboards/massdrop/ctrl/matrix.c
+++ b/keyboards/massdrop/ctrl/matrix.c
@@ -34,12 +34,10 @@ uint32_t row_masks[2]; //NOTE: If more than PA PB used in the future, adjust cod
 
 __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/matrix/noah/noah.c b/keyboards/matrix/noah/noah.c
index 64069148e55..7f2d59420a0 100644
--- a/keyboards/matrix/noah/noah.c
+++ b/keyboards/matrix/noah/noah.c
@@ -50,13 +50,7 @@ void rgblight_set(void) {
 }
 #endif
 
-void matrix_scan_kb(void) { matrix_scan_user(); }
-
 void matrix_init_kb(void) {
-  matrix_init_user();
-}
-__attribute__((weak))
-void matrix_init_user(void) {
 #ifdef RGBLIGHT_ENABLE
   rgblight_enable();
 #endif
@@ -66,8 +60,7 @@ void matrix_init_user(void) {
 #endif
 }
 
-__attribute__((weak))
-void matrix_scan_user(void) {
+void matrix_scan_kb(void) {
 #ifdef RGBLIGHT_ENABLE
   rgblight_task();
 #endif
diff --git a/keyboards/maxr1998/pulse4k/pulse4k.c b/keyboards/maxr1998/pulse4k/pulse4k.c
index 2ec9dca7391..abb7a781f35 100644
--- a/keyboards/maxr1998/pulse4k/pulse4k.c
+++ b/keyboards/maxr1998/pulse4k/pulse4k.c
@@ -30,10 +30,6 @@ combo_t key_combos[COMBO_COUNT] = {
 
 bool led_adjust_active = false;
 
-void matrix_init_kb(void) {
-    matrix_init_user();
-}
-
 void process_combo_event(uint8_t combo_index, bool pressed) {
     if (combo_index == LED_ADJUST) {
         led_adjust_active = pressed;
diff --git a/keyboards/mechkeys/mk60/mk60.c b/keyboards/mechkeys/mk60/mk60.c
index 2192526decb..6a762b75c56 100644
--- a/keyboards/mechkeys/mk60/mk60.c
+++ b/keyboards/mechkeys/mk60/mk60.c
@@ -19,15 +19,6 @@ void matrix_init_kb(void) {
 	// put your keyboard start-up code here
 	// runs once when the firmware starts up
 	setPinOutput(B7);
-
-	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) {
@@ -38,6 +29,4 @@ void led_set_kb(uint8_t usb_led) {
 	}else {
 		writePinHigh(B7);
 	}
-
-	led_set_user(usb_led);
 }
diff --git a/keyboards/mechlovin/hannah910/hannah910.c b/keyboards/mechlovin/hannah910/hannah910.c
index 2c696ab564f..1e7228521f6 100644
--- a/keyboards/mechlovin/hannah910/hannah910.c
+++ b/keyboards/mechlovin/hannah910/hannah910.c
@@ -16,7 +16,6 @@
 #include "hannah910.h"
 
 void matrix_init_kb(void) {
-  matrix_init_user();
   led_init_ports();
 };
 void led_init_ports(void) {
@@ -32,10 +31,9 @@ void led_set_kb(uint8_t usb_led) {
   } else {
     writePinLow(B2);
   }
-      led_set_user(usb_led);
 }
 
-uint32_t layer_state_set_user(uint32_t state)
+uint32_t layer_state_set_kb(uint32_t state)
 {
   // if on layer 1, turn on D2 LED, otherwise off.
     if (biton32(state) == 1) {
@@ -57,5 +55,5 @@ uint32_t layer_state_set_user(uint32_t state)
         writePinLow(D0);
     }
 
-    return state;
+    return layer_state_set_user(state);
 }
diff --git a/keyboards/mechlovin/infinityce/infinityce.c b/keyboards/mechlovin/infinityce/infinityce.c
index 5d75b480b3d..32953b37ecd 100644
--- a/keyboards/mechlovin/infinityce/infinityce.c
+++ b/keyboards/mechlovin/infinityce/infinityce.c
@@ -19,7 +19,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();
 };
 
@@ -27,16 +26,14 @@ void led_init_ports(void) {
     // * Set our LED pins as output
     setPinOutput(B3);
 }
+
 bool led_update_kb(led_t led_state) {
-    bool res = led_update_user(led_state);
-    if(res) {
-        writePin(B3, led_state.caps_lock);
-        rgblight_set_effect_range(1, 30);
-        if (led_state.scroll_lock) {
-            rgblight_setrgb_at(255, 255, 255, 0);
-        } else {
-            rgblight_setrgb_at(0, 0, 0, 0);
-        }
+    writePin(B3, led_state.caps_lock);
+    rgblight_set_effect_range(1, 30);
+    if (led_state.scroll_lock) {
+        rgblight_setrgb_at(255, 255, 255, 0);
+    } else {
+        rgblight_setrgb_at(0, 0, 0, 0);
     }
-    return res;
-}
\ No newline at end of file
+    return true;
+}
diff --git a/keyboards/meira/matrix.c b/keyboards/meira/matrix.c
index 7de188a68c6..2fcbadf6184 100644
--- a/keyboards/meira/matrix.c
+++ b/keyboards/meira/matrix.c
@@ -78,12 +78,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/meira/meira.c b/keyboards/meira/meira.c
index d4a5a23211a..bea30ac1951 100644
--- a/keyboards/meira/meira.c
+++ b/keyboards/meira/meira.c
@@ -36,10 +36,6 @@ void matrix_init_kb(void)
     // we should get a flashing red light
     wdt_enable(WDTO_500MS);
 #endif
-
-    // put your keyboard start-up code here
-    // runs once when the firmware starts up
-    matrix_init_user();
 }
 
 void matrix_scan_kb(void)
@@ -71,29 +67,17 @@ void matrix_scan_kb(void)
         twi_last_ready++;
     }
 #endif
-    matrix_scan_user();
 }
 
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
     // 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);
-    /* 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.
-     */
     if (keycode == RESET) {
         reset_keyboard_kb();
-    } else {
     }
     return true;
 }
 
-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 reset_keyboard_kb(){
 #ifdef WATCHDOG_ENABLE
     MCUSR = 0;
diff --git a/keyboards/meishi/meishi.c b/keyboards/meishi/meishi.c
index 42e4959c3a4..85ede859d32 100644
--- a/keyboards/meishi/meishi.c
+++ b/keyboards/meishi/meishi.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "meishi.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/meishi2/meishi2.c b/keyboards/meishi2/meishi2.c
index be046eadbfe..14525ae175c 100644
--- a/keyboards/meishi2/meishi2.c
+++ b/keyboards/meishi2/meishi2.c
@@ -14,31 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "meishi2.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/meme/meme.c b/keyboards/meme/meme.c
index bd34a281a75..928f121fe91 100644
--- a/keyboards/meme/meme.c
+++ b/keyboards/meme/meme.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "meme.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/meson/meson.c b/keyboards/meson/meson.c
index 89b6cc7aafa..4b777633b11 100644
--- a/keyboards/meson/meson.c
+++ b/keyboards/meson/meson.c
@@ -14,31 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "meson.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/miniaxe/miniaxe.c b/keyboards/miniaxe/miniaxe.c
index ec2b69b8502..bda61784ed0 100644
--- a/keyboards/miniaxe/miniaxe.c
+++ b/keyboards/miniaxe/miniaxe.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "miniaxe.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/mitosis/matrix.c b/keyboards/mitosis/matrix.c
index e149b68bd7d..b90cf5bf4f5 100644
--- a/keyboards/mitosis/matrix.c
+++ b/keyboards/mitosis/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/mitosis/mitosis.c b/keyboards/mitosis/mitosis.c
index 1ca7276e410..f665d8e4b09 100644
--- a/keyboards/mitosis/mitosis.c
+++ b/keyboards/mitosis/mitosis.c
@@ -14,7 +14,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/miuni32/miuni32.c b/keyboards/miuni32/miuni32.c
index 05393e13da0..7defbe891bb 100644
--- a/keyboards/miuni32/miuni32.c
+++ b/keyboards/miuni32/miuni32.c
@@ -1,21 +1 @@
 #include "miuni32.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/model01/model01.c b/keyboards/model01/model01.c
index 29615ca866f..9a1c9cd21f6 100644
--- a/keyboards/model01/model01.c
+++ b/keyboards/model01/model01.c
@@ -21,18 +21,7 @@
 void matrix_init_kb(void) {
   /* the bootloader can leave LEDs on, so */
   set_all_leds_to(0, 0, 0);
-  matrix_init_user();
 }
 
 void matrix_scan_kb(void) {
-  matrix_scan_user();
 }
-
-__attribute__ ((weak))
-void matrix_scan_user(void) {
-}
-
-__attribute__ ((weak))
-void matrix_init_user(void) {
-}
-
diff --git a/keyboards/moon/matrix.c b/keyboards/moon/matrix.c
index c74c70f8977..0936dbe14ef 100644
--- a/keyboards/moon/matrix.c
+++ b/keyboards/moon/matrix.c
@@ -98,9 +98,9 @@ __attribute__((weak)) void matrix_init_quantum(void) { matrix_init_kb(); }
 
 __attribute__((weak)) void matrix_scan_quantum(void) { matrix_scan_kb(); }
 
-__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) {}
 
 __attribute__((weak)) void matrix_init_user(void) {}
 
diff --git a/keyboards/moon/moon.c b/keyboards/moon/moon.c
index d9236c29a04..b090bc92153 100644
--- a/keyboards/moon/moon.c
+++ b/keyboards/moon/moon.c
@@ -28,21 +28,8 @@ void matrix_init_kb(void) {
 
   setPinOutput(CAPS_PIN);
   setPinOutput(SCROLL_PIN);
-
-  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
 
@@ -57,6 +44,4 @@ void led_set_kb(uint8_t usb_led) {
   } else {
     writePinLow(SCROLL_PIN);
   }
-
-  led_set_user(usb_led);
 }
diff --git a/keyboards/mxss/mxss.c b/keyboards/mxss/mxss.c
index 9b39c5d8573..682094184d9 100644
--- a/keyboards/mxss/mxss.c
+++ b/keyboards/mxss/mxss.c
@@ -35,15 +35,6 @@ void matrix_init_kb(void) {
     fled_init();
     via_eeprom_set_valid(true);
 #endif // VIA_ENABLE
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
 }
 
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
@@ -54,7 +45,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
 
 bool led_update_kb(led_t led_state) {
     fled_lock_update(led_state);
-	return led_update_user(led_state);
+    return true;
 }
 
 layer_state_t layer_state_set_kb(layer_state_t state) {
diff --git a/keyboards/nafuda/nafuda.c b/keyboards/nafuda/nafuda.c
index d2061181e73..334b3dab27f 100644
--- a/keyboards/nafuda/nafuda.c
+++ b/keyboards/nafuda/nafuda.c
@@ -1,5 +1 @@
 #include "nafuda.h"
-
-void matrix_init_kb(void) {
-	matrix_init_user();
-};
diff --git a/keyboards/naked48/rev1/rev1.c b/keyboards/naked48/rev1/rev1.c
index e127232d80e..411f2900a2e 100644
--- a/keyboards/naked48/rev1/rev1.c
+++ b/keyboards/naked48/rev1/rev1.c
@@ -1,12 +1,5 @@
 #include "naked48.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*/
-
 #ifdef RGB_MATRIX_ENABLE
     led_config_t g_led_config = { {
     // Key Matrix to LED Index
@@ -30,7 +23,3 @@ void led_set_kb(uint8_t usb_led) {
         4, 4, 4, 4, 4, 4, 4, 4
 } };
 #endif
-
-void matrix_init_kb(void) {
-	matrix_init_user();
-};
\ No newline at end of file
diff --git a/keyboards/naked60/rev1/rev1.c b/keyboards/naked60/rev1/rev1.c
index bce48f89c30..1ff159cdb41 100644
--- a/keyboards/naked60/rev1/rev1.c
+++ b/keyboards/naked60/rev1/rev1.c
@@ -1,5 +1 @@
 #include "naked60.h"
-
-void matrix_init_kb(void) {
-	matrix_init_user();
-};
diff --git a/keyboards/naked64/rev1/rev1.c b/keyboards/naked64/rev1/rev1.c
index d851f97823e..520a869e57b 100644
--- a/keyboards/naked64/rev1/rev1.c
+++ b/keyboards/naked64/rev1/rev1.c
@@ -1,5 +1 @@
 #include "rev1.h"
-
-void matrix_init_kb(void) {
-	matrix_init_user();
-};
diff --git a/keyboards/namecard2x4/namecard2x4.c b/keyboards/namecard2x4/namecard2x4.c
index 85f64aefc34..091b55c10d5 100644
--- a/keyboards/namecard2x4/namecard2x4.c
+++ b/keyboards/namecard2x4/namecard2x4.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "namecard2x4.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/navi10/rev0/rev0.c b/keyboards/navi10/rev0/rev0.c
index f6c1f362ca4..39ce4137ead 100644
--- a/keyboards/navi10/rev0/rev0.c
+++ b/keyboards/navi10/rev0/rev0.c
@@ -16,15 +16,9 @@
 #include "rev0.h"
 
 void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-
   //set the indicator LED pin to Output
   setPinOutput(B5);
   //set HIGH for off.
   writePinHigh(B5);
-
-  //call any user functions
-  matrix_init_user();
 }
 
diff --git a/keyboards/navi10/rev2/rev2.c b/keyboards/navi10/rev2/rev2.c
index fed0e03897c..05bee9b0193 100644
--- a/keyboards/navi10/rev2/rev2.c
+++ b/keyboards/navi10/rev2/rev2.c
@@ -16,15 +16,9 @@
 #include "rev2.h"
 
 void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-
   //set the indicator LED pin to Output
   setPinOutput(B5);
   //set HIGH for off.
   writePinHigh(B5);
-
-  //call any user functions
-  matrix_init_user();
 }
 
diff --git a/keyboards/navi10/rev3/rev3.c b/keyboards/navi10/rev3/rev3.c
index 2b0355aa36e..4226ac73d1b 100644
--- a/keyboards/navi10/rev3/rev3.c
+++ b/keyboards/navi10/rev3/rev3.c
@@ -16,15 +16,9 @@
 #include "rev3.h"
 
 void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-
   //set the indicator LED pin to Output
   setPinOutput(B5);
   //set HIGH for off.
   writePinHigh(B5);
-
-  //call any user functions
-  matrix_init_user();
 }
 
diff --git a/keyboards/nek_type_a/matrix.c b/keyboards/nek_type_a/matrix.c
index a3c0155e1a3..8ea54d9fcd0 100644
--- a/keyboards/nek_type_a/matrix.c
+++ b/keyboards/nek_type_a/matrix.c
@@ -107,12 +107,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/nek_type_a/nek_type_a.c b/keyboards/nek_type_a/nek_type_a.c
index 8e108552d83..f7e1dd4d7bf 100644
--- a/keyboards/nek_type_a/nek_type_a.c
+++ b/keyboards/nek_type_a/nek_type_a.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "nek_type_a.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/newgame40/newgame40.c b/keyboards/newgame40/newgame40.c
index e55b25b3d0d..98add8ea0e5 100644
--- a/keyboards/newgame40/newgame40.c
+++ b/keyboards/newgame40/newgame40.c
@@ -1,5 +1 @@
 #include "newgame40.h"
-
-void matrix_init_kb(void) {
-	matrix_init_user();
-}
diff --git a/keyboards/nightmare/nightmare.c b/keyboards/nightmare/nightmare.c
index 5d40700b077..301a8981a8d 100644
--- a/keyboards/nightmare/nightmare.c
+++ b/keyboards/nightmare/nightmare.c
@@ -14,31 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "nightmare.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/niu_mini/niu_mini.c b/keyboards/niu_mini/niu_mini.c
index 835625ee4f6..47b8835f4bf 100644
--- a/keyboards/niu_mini/niu_mini.c
+++ b/keyboards/niu_mini/niu_mini.c
@@ -14,6 +14,4 @@ void matrix_init_kb(void) {
     // Turn status LED on
     setPinOutput(E6);
     writePinHigh(E6);
-
-    matrix_init_user();
 }
diff --git a/keyboards/noxary/220/220.c b/keyboards/noxary/220/220.c
index 086f59bd5ec..6a8c2815d8b 100644
--- a/keyboards/noxary/220/220.c
+++ b/keyboards/noxary/220/220.c
@@ -23,33 +23,12 @@ void matrix_init_kb(void) {
   // put your keyboard start-up code here
   // runs once when the firmware starts up
   setPinOutput(C6);
-  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) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
   if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) {
     writePinLow(C6);
   } else {
     writePinHigh(C6);
   }
-	led_set_user(usb_led);
 }
diff --git a/keyboards/noxary/260/260.c b/keyboards/noxary/260/260.c
index af3dbb69ac1..365adff8957 100644
--- a/keyboards/noxary/260/260.c
+++ b/keyboards/noxary/260/260.c
@@ -21,34 +21,13 @@
 
 
 void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
   setPinOutput(B1);
-	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(B1);
   } else {
     writePinHigh(B1);
   }
-
-	led_set_user(usb_led);
 }
diff --git a/keyboards/noxary/280/280.c b/keyboards/noxary/280/280.c
index 1743ebc0d58..398c60a051a 100644
--- a/keyboards/noxary/280/280.c
+++ b/keyboards/noxary/280/280.c
@@ -21,17 +21,12 @@
 
 
 void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
   setPinOutput(D5);
   setPinOutput(D0);
-	matrix_init_user();
 }
 
 bool led_update_kb(led_t led_state) {
-    if(led_update_user(led_state)) {
-        writePin(D5, led_state.caps_lock);
-        writePin(D0, led_state.scroll_lock);
-    }
+    writePin(D5, led_state.caps_lock);
+    writePin(D0, led_state.scroll_lock);
     return true;
-}
\ No newline at end of file
+}
diff --git a/keyboards/noxary/x268/x268.c b/keyboards/noxary/x268/x268.c
index ff407954872..f0c6d8b6fbc 100644
--- a/keyboards/noxary/x268/x268.c
+++ b/keyboards/noxary/x268/x268.c
@@ -15,32 +15,10 @@
  */
 #include "x268.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_set_user(uint8_t usb_led) {
-
     if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
         DDRB |= (1 << 0); PORTB |= (1 << 0);
-    }
-    else {
+    } else {
         DDRB &= ~(1 << 0); PORTB &= ~(1 << 0);
     }
 }
diff --git a/keyboards/orthodox/rev1/rev1.c b/keyboards/orthodox/rev1/rev1.c
index ecb908b3ae9..1c2634410c3 100644
--- a/keyboards/orthodox/rev1/rev1.c
+++ b/keyboards/orthodox/rev1/rev1.c
@@ -21,19 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "orthodox.h"
 
-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();
-};
-
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
 // swap-hands action needs a matrix to define the swap
diff --git a/keyboards/orthodox/rev3/rev3.c b/keyboards/orthodox/rev3/rev3.c
index ecb908b3ae9..1c2634410c3 100644
--- a/keyboards/orthodox/rev3/rev3.c
+++ b/keyboards/orthodox/rev3/rev3.c
@@ -21,19 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "orthodox.h"
 
-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();
-};
-
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
 // swap-hands action needs a matrix to define the swap
diff --git a/keyboards/orthodox/rev3_teensy/rev3_teensy.c b/keyboards/orthodox/rev3_teensy/rev3_teensy.c
index ecb908b3ae9..1c2634410c3 100644
--- a/keyboards/orthodox/rev3_teensy/rev3_teensy.c
+++ b/keyboards/orthodox/rev3_teensy/rev3_teensy.c
@@ -21,19 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "orthodox.h"
 
-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();
-};
-
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
 // swap-hands action needs a matrix to define the swap
diff --git a/keyboards/otaku_split/rev0/rev0.c b/keyboards/otaku_split/rev0/rev0.c
index 0eb8eff045c..6ec80aabb6d 100644
--- a/keyboards/otaku_split/rev0/rev0.c
+++ b/keyboards/otaku_split/rev0/rev0.c
@@ -14,31 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "rev0.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/otaku_split/rev1/rev1.c b/keyboards/otaku_split/rev1/rev1.c
index 8190319ff55..b63bb047aa2 100644
--- a/keyboards/otaku_split/rev1/rev1.c
+++ b/keyboards/otaku_split/rev1/rev1.c
@@ -14,31 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "rev1.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/pdxkbc/pdxkbc.c b/keyboards/pdxkbc/pdxkbc.c
index 32ac0fc9874..dd464c561af 100644
--- a/keyboards/pdxkbc/pdxkbc.c
+++ b/keyboards/pdxkbc/pdxkbc.c
@@ -14,31 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "pdxkbc.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/peiorisboards/ixora/ixora.c b/keyboards/peiorisboards/ixora/ixora.c
index 075b7dbc427..c32c5e920ba 100644
--- a/keyboards/peiorisboards/ixora/ixora.c
+++ b/keyboards/peiorisboards/ixora/ixora.c
@@ -1,21 +1,12 @@
 #include "ixora.h"
 
 void matrix_init_kb(void) {
-    // put your keyboard start-up code here
-    // runs once when the firmware starts up
     setPinOutput(A8);
     setPinOutput(A9);
     setPinOutput(A10);
     writePinLow(A8);
     writePinLow(A9);
     writePinLow(A10);
-
-    matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-
-    matrix_scan_user();
 }
 
 void led_set_kb(uint8_t usb_led) {
@@ -34,5 +25,4 @@ void led_set_kb(uint8_t usb_led) {
     } else {
         writePinLow(A8);
     }
-    led_set_user(usb_led);
 }
diff --git a/keyboards/percent/booster/booster.c b/keyboards/percent/booster/booster.c
index d8847b5ddc5..bbae5d6f4e3 100644
--- a/keyboards/percent/booster/booster.c
+++ b/keyboards/percent/booster/booster.c
@@ -14,31 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "booster.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/phantom/phantom.c b/keyboards/phantom/phantom.c
index e8e49285562..9de2a0aafbf 100644
--- a/keyboards/phantom/phantom.c
+++ b/keyboards/phantom/phantom.c
@@ -16,17 +16,7 @@
 #include "phantom.h"
 
 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) {
@@ -51,6 +41,4 @@ void led_set_kb(uint8_t usb_led) {
     {
         PORTB &= ~(1<<7); // LO
     }
-
-    led_set_user(usb_led);
 }
diff --git a/keyboards/pinky/pinky.c b/keyboards/pinky/pinky.c
index 32b9f843385..aa873c7a727 100644
--- a/keyboards/pinky/pinky.c
+++ b/keyboards/pinky/pinky.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "pinky.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/plaid/plaid.c b/keyboards/plaid/plaid.c
index 41b7ff1ccf5..50da81950e0 100644
--- a/keyboards/plaid/plaid.c
+++ b/keyboards/plaid/plaid.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "plaid.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/planck/light/light.c b/keyboards/planck/light/light.c
index 00706aa2cc1..1c0355e07a5 100644
--- a/keyboards/planck/light/light.c
+++ b/keyboards/planck/light/light.c
@@ -101,8 +101,6 @@ void matrix_init_kb(void) {
     // Turn status LED on
     DDRD |= (1<<6);
     PORTD |= (1<<6);
-
-    matrix_init_user();
 }
 
 uint8_t rgb_matrix_map_row_column_to_led_kb(uint8_t row, uint8_t column, uint8_t *led_i) {
@@ -115,20 +113,13 @@ uint8_t rgb_matrix_map_row_column_to_led_kb(uint8_t row, uint8_t column, uint8_t
     return 0;
 }
 
-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/planck/planck.c b/keyboards/planck/planck.c
index 5a65d5e5f3e..9a0076836eb 100644
--- a/keyboards/planck/planck.c
+++ b/keyboards/planck/planck.c
@@ -17,8 +17,6 @@ void matrix_init_kb(void) {
 	setPinOutput(E6);
 	writePinHigh(E6);
 	#endif
-
-	matrix_init_user();
 }
 
 const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = LAYOUT_planck_grid(
diff --git a/keyboards/planck/rev6/rev6.c b/keyboards/planck/rev6/rev6.c
index 8f4d168bf45..e492c07e1ad 100644
--- a/keyboards/planck/rev6/rev6.c
+++ b/keyboards/planck/rev6/rev6.c
@@ -15,14 +15,6 @@
  */
 #include "rev6.h"
 
-void matrix_init_kb(void) {
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	matrix_scan_user();
-}
-
 #ifdef DIP_SWITCH_ENABLE
 __attribute__((weak))
 void dip_update(uint8_t index, bool active) {}
diff --git a/keyboards/playkbtw/pk60/pk60.c b/keyboards/playkbtw/pk60/pk60.c
index a9da0ff2296..78712a812bf 100644
--- a/keyboards/playkbtw/pk60/pk60.c
+++ b/keyboards/playkbtw/pk60/pk60.c
@@ -2,18 +2,9 @@
 #include "led.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) {
   // Set capslock LED pin as pinout
   DDRF |= (1 << 4);
@@ -22,7 +13,6 @@ void led_init_ports(void) {
 }
 
 void led_set_kb(uint8_t usb_led) {
-    
   if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
       // Turn capslock on
       PORTF &= ~(1 << 4);
@@ -30,6 +20,4 @@ void led_set_kb(uint8_t usb_led) {
       // Turn capslock off
       PORTF |= (1 << 4);
   }
-  led_set_user(usb_led);
-
-}
\ No newline at end of file
+}
diff --git a/keyboards/preonic/rev1/rev1.c b/keyboards/preonic/rev1/rev1.c
index c9fd8330ef7..885c188acd6 100644
--- a/keyboards/preonic/rev1/rev1.c
+++ b/keyboards/preonic/rev1/rev1.c
@@ -20,8 +20,6 @@ void matrix_init_kb(void) {
     // Turn status LED on
     setPinOutput(E6);
     writePinHigh(E6);
-
-  matrix_init_user();
 };
 
 #ifdef SWAP_HANDS_ENABLE
diff --git a/keyboards/preonic/rev2/rev2.c b/keyboards/preonic/rev2/rev2.c
index c0e72620ed8..33293f4e4dc 100644
--- a/keyboards/preonic/rev2/rev2.c
+++ b/keyboards/preonic/rev2/rev2.c
@@ -20,8 +20,6 @@ void matrix_init_kb(void) {
     // Turn status LED on
     setPinOutput(E6);
     writePinHigh(E6);
-
-  matrix_init_user();
 };
 
 #ifdef SWAP_HANDS_ENABLE
diff --git a/keyboards/preonic/rev3/rev3.c b/keyboards/preonic/rev3/rev3.c
index 04b691f405b..8f0b4f5c6e3 100644
--- a/keyboards/preonic/rev3/rev3.c
+++ b/keyboards/preonic/rev3/rev3.c
@@ -15,14 +15,6 @@
  */
 #include "rev3.h"
 
-void matrix_init_kb(void) {
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	matrix_scan_user();
-}
-
 #ifdef DIP_SWITCH_ENABLE
  __attribute__((weak))
 void dip_update(uint8_t index, bool active) {}
diff --git a/keyboards/primekb/prime_o/prime_o.c b/keyboards/primekb/prime_o/prime_o.c
index 60a9578504d..369347cf4c5 100644
--- a/keyboards/primekb/prime_o/prime_o.c
+++ b/keyboards/primekb/prime_o/prime_o.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "prime_o.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/primekb/prime_r/prime_r.c b/keyboards/primekb/prime_r/prime_r.c
index 083b6021580..3a08bed591c 100644
--- a/keyboards/primekb/prime_r/prime_r.c
+++ b/keyboards/primekb/prime_r/prime_r.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "prime_r.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/quantrik/kyuu/kyuu.c b/keyboards/quantrik/kyuu/kyuu.c
index 025ee8dbcfe..7f7d2fcc82d 100644
--- a/keyboards/quantrik/kyuu/kyuu.c
+++ b/keyboards/quantrik/kyuu/kyuu.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "kyuu.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/qwertyydox/rev1/rev1.c b/keyboards/qwertyydox/rev1/rev1.c
index 609c479eb37..520a869e57b 100644
--- a/keyboards/qwertyydox/rev1/rev1.c
+++ b/keyboards/qwertyydox/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/redox/rev1/rev1.c b/keyboards/redox/rev1/rev1.c
index 2eb7c7c0e83..b1ab15df322 100644
--- a/keyboards/redox/rev1/rev1.c
+++ b/keyboards/redox/rev1/rev1.c
@@ -1,22 +1 @@
 #include "redox.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/redox_w/matrix.c b/keyboards/redox_w/matrix.c
index 31233af1018..80d15bf0ee6 100644
--- a/keyboards/redox_w/matrix.c
+++ b/keyboards/redox_w/matrix.c
@@ -57,12 +57,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/redox_w/redox_w.c b/keyboards/redox_w/redox_w.c
index 75df91066cd..767b4dd26e4 100644
--- a/keyboards/redox_w/redox_w.c
+++ b/keyboards/redox_w/redox_w.c
@@ -15,21 +15,10 @@ 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) {
-
-}
-
 #ifdef ONEHAND_ENABLE
 __attribute__ ((weak))
 const keypos_t hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/redscarf_iiplus/verb/matrix.c b/keyboards/redscarf_iiplus/verb/matrix.c
index 54b0f3a9a10..8e1a8fb8555 100755
--- a/keyboards/redscarf_iiplus/verb/matrix.c
+++ b/keyboards/redscarf_iiplus/verb/matrix.c
@@ -68,12 +68,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/redscarf_iiplus/verb/verb.c b/keyboards/redscarf_iiplus/verb/verb.c
index 62ea1859d35..7dd5829e4f1 100755
--- a/keyboards/redscarf_iiplus/verb/verb.c
+++ b/keyboards/redscarf_iiplus/verb/verb.c
@@ -20,10 +20,6 @@
 // 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();
     led_init_ports();
 }
 
@@ -46,6 +42,4 @@ void led_set_kb(uint8_t usb_led) {
     } else {
         writePinHigh(E6);
     }
-
-    led_set_user(usb_led);
 }
diff --git a/keyboards/redscarf_iiplus/verc/matrix.c b/keyboards/redscarf_iiplus/verc/matrix.c
index 54b0f3a9a10..8e1a8fb8555 100755
--- a/keyboards/redscarf_iiplus/verc/matrix.c
+++ b/keyboards/redscarf_iiplus/verc/matrix.c
@@ -68,12 +68,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/redscarf_iiplus/verc/verc.c b/keyboards/redscarf_iiplus/verc/verc.c
index 9dfc260679e..61b38120b9d 100755
--- a/keyboards/redscarf_iiplus/verc/verc.c
+++ b/keyboards/redscarf_iiplus/verc/verc.c
@@ -20,10 +20,6 @@
 // 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();
     led_init_ports();
 }
 
@@ -46,6 +42,4 @@ void led_set_kb(uint8_t usb_led) {
     } else {
         writePinHigh(E6);
     }
-
-    led_set_user(usb_led);
 }
diff --git a/keyboards/redscarf_iiplus/verd/matrix.c b/keyboards/redscarf_iiplus/verd/matrix.c
index 28568653c5a..7444e171e32 100644
--- a/keyboards/redscarf_iiplus/verd/matrix.c
+++ b/keyboards/redscarf_iiplus/verd/matrix.c
@@ -68,12 +68,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/redscarf_iiplus/verd/verd.c b/keyboards/redscarf_iiplus/verd/verd.c
index c16a5a97407..abab414402d 100644
--- a/keyboards/redscarf_iiplus/verd/verd.c
+++ b/keyboards/redscarf_iiplus/verd/verd.c
@@ -19,10 +19,6 @@
 // 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();
     led_init_ports();
 }
 
@@ -34,9 +30,7 @@ void led_init_ports(void) {
 }
 
 bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(C7, !led_state.caps_lock);
-        writePin(E6, !led_state.num_lock);
-    }
+    writePin(C7, !led_state.caps_lock);
+    writePin(E6, !led_state.num_lock);
     return true;
 }
diff --git a/keyboards/rgbkb/zen/rev1/rev1.c b/keyboards/rgbkb/zen/rev1/rev1.c
index 5f4cd32f695..520a869e57b 100644
--- a/keyboards/rgbkb/zen/rev1/rev1.c
+++ b/keyboards/rgbkb/zen/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/sentraq/s65_plus/s65_plus.c b/keyboards/sentraq/s65_plus/s65_plus.c
index 3eaaa37174c..1ad29faab98 100644
--- a/keyboards/sentraq/s65_plus/s65_plus.c
+++ b/keyboards/sentraq/s65_plus/s65_plus.c
@@ -1,18 +1,6 @@
 #include "s65_plus.h"
 #include "led.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) {
   if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
     // Turn capslock on
diff --git a/keyboards/sentraq/s65_x/s65_x.c b/keyboards/sentraq/s65_x/s65_x.c
index 844f5cf28bb..09ce310b071 100644
--- a/keyboards/sentraq/s65_x/s65_x.c
+++ b/keyboards/sentraq/s65_x/s65_x.c
@@ -1,18 +1 @@
 #include "s65_x.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/setta21/rev1/rev1.c b/keyboards/setta21/rev1/rev1.c
index 3c0823870b9..b3774527702 100644
--- a/keyboards/setta21/rev1/rev1.c
+++ b/keyboards/setta21/rev1/rev1.c
@@ -19,7 +19,3 @@
         4
 } };
 #endif
-
-void matrix_init_kb(void) {
-	matrix_init_user();
-};
diff --git a/keyboards/sirius/uni660/matrix.c b/keyboards/sirius/uni660/matrix.c
index 3e231b33bc3..53b25107873 100644
--- a/keyboards/sirius/uni660/matrix.c
+++ b/keyboards/sirius/uni660/matrix.c
@@ -51,12 +51,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/sirius/uni660/uni660.c b/keyboards/sirius/uni660/uni660.c
index 2144facc565..4abaf99c506 100644
--- a/keyboards/sirius/uni660/uni660.c
+++ b/keyboards/sirius/uni660/uni660.c
@@ -16,7 +16,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/sixkeyboard/matrix.c b/keyboards/sixkeyboard/matrix.c
index 64b46e9b0c8..406f967b078 100644
--- a/keyboards/sixkeyboard/matrix.c
+++ b/keyboards/sixkeyboard/matrix.c
@@ -41,12 +41,10 @@ static bool debouncing = 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/sixkeyboard/sixkeyboard.c b/keyboards/sixkeyboard/sixkeyboard.c
index 85190f6167c..ea1affd034b 100644
--- a/keyboards/sixkeyboard/sixkeyboard.c
+++ b/keyboards/sixkeyboard/sixkeyboard.c
@@ -25,6 +25,4 @@ void matrix_init_kb(void) {
 
     DDRD |= (1<<3);
     PORTD &= ~(1<<3);
-
-    matrix_init_user();
-};
\ No newline at end of file
+};
diff --git a/keyboards/stella/stella.c b/keyboards/stella/stella.c
index 4b545042b47..5e8f983d285 100644
--- a/keyboards/stella/stella.c
+++ b/keyboards/stella/stella.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/switchplate/southpaw_fullsize/southpaw_fullsize.c b/keyboards/switchplate/southpaw_fullsize/southpaw_fullsize.c
index 253a4fd6768..771bdca70dd 100644
--- a/keyboards/switchplate/southpaw_fullsize/southpaw_fullsize.c
+++ b/keyboards/switchplate/southpaw_fullsize/southpaw_fullsize.c
@@ -33,19 +33,13 @@ void matrix_init_kb(void) {
     setPinOutput(INDICATOR_NUM);
     setPinOutput(INDICATOR_CAPS);
     setPinOutput(INDICATOR_SCR);
-
-    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(INDICATOR_NUM, !led_state.num_lock);
-        writePin(INDICATOR_CAPS, !led_state.caps_lock);
-        writePin(INDICATOR_SCR, !led_state.scroll_lock);
-    }
-    return res;
+    writePin(INDICATOR_NUM, !led_state.num_lock);
+    writePin(INDICATOR_CAPS, !led_state.caps_lock);
+    writePin(INDICATOR_SCR, !led_state.scroll_lock);
+    return true;
 }
 
diff --git a/keyboards/sx60/matrix.c b/keyboards/sx60/matrix.c
index 58647d13b08..f46ee1031c5 100644
--- a/keyboards/sx60/matrix.c
+++ b/keyboards/sx60/matrix.c
@@ -86,12 +86,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/tada68/tada68.c b/keyboards/tada68/tada68.c
index e4fab981019..1f4d0f58c15 100755
--- a/keyboards/tada68/tada68.c
+++ b/keyboards/tada68/tada68.c
@@ -4,16 +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) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-	matrix_scan_user();
-};
-
 void led_init_ports(void) {
     // * Set our LED pins as output
     DDRB |= (1<<2);
@@ -27,5 +20,4 @@ void led_set_kb(uint8_t usb_led) {
         // Turn capslock off
         PORTB |= (1<<2);
     }
-	led_set_user(usb_led);
 }
diff --git a/keyboards/tanuki/tanuki.c b/keyboards/tanuki/tanuki.c
index 573e2006111..0829369b427 100644
--- a/keyboards/tanuki/tanuki.c
+++ b/keyboards/tanuki/tanuki.c
@@ -1,10 +1 @@
 #include "tanuki.h"
-#include "rgblight.h"
-#include "config.h"
-#include "rgblight.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-};
diff --git a/keyboards/telophase/matrix.c b/keyboards/telophase/matrix.c
index c332eba556c..1c5f6964b38 100644
--- a/keyboards/telophase/matrix.c
+++ b/keyboards/telophase/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/telophase/telophase.c b/keyboards/telophase/telophase.c
index c77a43389f4..ecd8834eabf 100644
--- a/keyboards/telophase/telophase.c
+++ b/keyboards/telophase/telophase.c
@@ -15,21 +15,10 @@ 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) {
-
-}
-
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
 const keypos_t hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/thedogkeyboard/matrix.c b/keyboards/thedogkeyboard/matrix.c
index e06fc15dc4f..d6ade7e3907 100644
--- a/keyboards/thedogkeyboard/matrix.c
+++ b/keyboards/thedogkeyboard/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/tkc1800/tkc1800.c b/keyboards/tkc1800/tkc1800.c
index d4f579dc16d..e3862b101a8 100644
--- a/keyboards/tkc1800/tkc1800.c
+++ b/keyboards/tkc1800/tkc1800.c
@@ -20,7 +20,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 led_init_ports(void) {
@@ -51,5 +50,4 @@ void led_set_kb(uint8_t usb_led) {
         // Turn scrolllock off
 		PORTD &= ~(1<<4);
     }
-    led_set_user(usb_led);
 }
diff --git a/keyboards/tmo50/tmo50.c b/keyboards/tmo50/tmo50.c
index f477d067f2f..361a7193598 100644
--- a/keyboards/tmo50/tmo50.c
+++ b/keyboards/tmo50/tmo50.c
@@ -27,8 +27,6 @@ void matrix_init_kb(void) {
   PORTB |= (1<<PB2);
   DDRB |= (1 << PB3);
   PORTB |= (1<<PB3);
-
-	matrix_init_user();
 }
 
 uint32_t layer_state_set_kb(uint32_t state)
diff --git a/keyboards/tokyo60/tokyo60.c b/keyboards/tokyo60/tokyo60.c
index 2126bb612d4..67113700a5d 100644
--- a/keyboards/tokyo60/tokyo60.c
+++ b/keyboards/tokyo60/tokyo60.c
@@ -1,18 +1 @@
 #include "tokyo60.h"
-
-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) {
-  /* LEDs on */
-}
diff --git a/keyboards/touchpad/matrix.c b/keyboards/touchpad/matrix.c
index 3af4c5c3c79..fc858be02e4 100644
--- a/keyboards/touchpad/matrix.c
+++ b/keyboards/touchpad/matrix.c
@@ -112,14 +112,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) {}
 
 void matrix_init(void) {
 
diff --git a/keyboards/ut472/ut472.c b/keyboards/ut472/ut472.c
index c0686d661aa..637922171a8 100644
--- a/keyboards/ut472/ut472.c
+++ b/keyboards/ut472/ut472.c
@@ -1,13 +1 @@
 #include "ut472.h"
-
-void matrix_init_kb(void) {
-  // Keyboard start-up code goes here
-  // Runs once when the firmware starts up
-  matrix_init_user();
-};
-
-void matrix_scan_kb(void) {
-  // Looping keyboard code goes here
-  // This runs every cycle (a lot)
-  matrix_scan_user();
-};
diff --git a/keyboards/v60_type_r/v60_type_r.c b/keyboards/v60_type_r/v60_type_r.c
index 7af6b33fa6c..4c8858d5acf 100644
--- a/keyboards/v60_type_r/v60_type_r.c
+++ b/keyboards/v60_type_r/v60_type_r.c
@@ -27,7 +27,6 @@ static uint8_t softpwm_buff[3] = {0};
 
 void matrix_init_kb(void) {
 	rgb_init();
-	matrix_init_user();
 }
 
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/vitamins_included/rev1/rev1.c b/keyboards/vitamins_included/rev1/rev1.c
index 56fbb878708..520a869e57b 100644
--- a/keyboards/vitamins_included/rev1/rev1.c
+++ b/keyboards/vitamins_included/rev1/rev1.c
@@ -1,13 +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) {
-	matrix_init_user();
-};
diff --git a/keyboards/vitamins_included/rev2/rev2.c b/keyboards/vitamins_included/rev2/rev2.c
index 7bdeebb03c5..15b47089e8f 100644
--- a/keyboards/vitamins_included/rev2/rev2.c
+++ b/keyboards/vitamins_included/rev2/rev2.c
@@ -1,13 +1,5 @@
 #include "rev2.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
-
 bool is_keyboard_left(void) {
     #if defined(MASTER_LEFT)
         return is_keyboard_master();
@@ -25,7 +17,3 @@ bool is_keyboard_left(void) {
 
     return is_keyboard_master();
 }
-
-void matrix_init_kb(void) {
-	matrix_init_user();
-};
diff --git a/keyboards/vn66/vn66.c b/keyboards/vn66/vn66.c
index 122047468c7..3890a084dac 100644
--- a/keyboards/vn66/vn66.c
+++ b/keyboards/vn66/vn66.c
@@ -17,7 +17,6 @@
 
 void matrix_init_kb(void) {
   led_init_ports();
-  matrix_init_user(); 
 };
 
 void led_init_ports(void) {
@@ -32,5 +31,4 @@ void led_set_kb(uint8_t usb_led) {
     // Turn Caps Lock LED off
     writePinHigh(E6);
   }
-    led_set_user(usb_led);
 }
diff --git a/keyboards/whitefox/whitefox.c b/keyboards/whitefox/whitefox.c
index 2555dc2025c..0d7f50995cd 100644
--- a/keyboards/whitefox/whitefox.c
+++ b/keyboards/whitefox/whitefox.c
@@ -25,10 +25,8 @@ 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/wilba_tech/wt_main.c b/keyboards/wilba_tech/wt_main.c
index 1f9e41a53be..7316a295da0 100644
--- a/keyboards/wilba_tech/wt_main.c
+++ b/keyboards/wilba_tech/wt_main.c
@@ -70,8 +70,6 @@ void matrix_init_kb(void)
     via_init_kb();
     via_eeprom_set_valid(true);
 #endif // VIA_ENABLE
-
-    matrix_init_user();
 }
 
 void matrix_scan_kb(void)
@@ -80,7 +78,6 @@ void matrix_scan_kb(void)
     // This only updates the LED driver buffers if something has changed.
     backlight_update_pwm_buffers();
 #endif // RGB_BACKLIGHT_ENABLED || MONO_BACKLIGHT_ENABLED
-    matrix_scan_user();
 }
 
 bool process_record_kb(uint16_t keycode, keyrecord_t *record)
@@ -97,7 +94,6 @@ void led_set_kb(uint8_t usb_led)
 #if RGB_BACKLIGHT_ENABLED || MONO_BACKLIGHT_ENABLED
     backlight_set_indicator_state(usb_led);
 #endif // RGB_BACKLIGHT_ENABLED || MONO_BACKLIGHT_ENABLED
-    led_set_user(usb_led);
 }
 
 void suspend_power_down_kb(void)
diff --git a/keyboards/xbows/knight/knight.c b/keyboards/xbows/knight/knight.c
index dcc5035d516..6de612c50d5 100644
--- a/keyboards/xbows/knight/knight.c
+++ b/keyboards/xbows/knight/knight.c
@@ -1,10 +1,6 @@
 #include "knight.h"
 
 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();
 }
 
@@ -15,9 +11,7 @@ void led_init_ports(void) {
     writePinHigh(C7);
 }
 bool led_update_kb(led_t led_state) {
-    if(led_update_user(led_state)) {
-        writePin(C7, !led_state.caps_lock);
-        writePin(D1, !led_state.num_lock);
-    }
+    writePin(C7, !led_state.caps_lock);
+    writePin(D1, !led_state.num_lock);
     return true;
 }
diff --git a/keyboards/xd68/xd68.c b/keyboards/xd68/xd68.c
index 2a5a52bdae2..82ef9b3988a 100755
--- a/keyboards/xd68/xd68.c
+++ b/keyboards/xd68/xd68.c
@@ -1,9 +1,6 @@
 #include "xd68.h"
 
 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();
 }
 
@@ -14,9 +11,7 @@ void led_init_ports(void) {
 }
 
 bool led_update_kb(led_t led_state) {
-    if(led_update_user(led_state)) {
-        writePin(B2, !led_state.caps_lock);
-    }
+    writePin(B2, !led_state.caps_lock);
     return true;
 }
 
diff --git a/keyboards/xd75/xd75.c b/keyboards/xd75/xd75.c
index 66d4aad4616..ade44acc9e6 100644
--- a/keyboards/xd75/xd75.c
+++ b/keyboards/xd75/xd75.c
@@ -28,8 +28,6 @@ void matrix_init_kb(void) {
 	gp100_led_init();
 	gp103_led_init();
 	keycaps_led_init();
-
-	matrix_init_user();
 }
 
 void capslock_led_init(void) {
diff --git a/keyboards/xd87/xd87.c b/keyboards/xd87/xd87.c
index 94e64e6c609..31da0f9c71a 100644
--- a/keyboards/xd87/xd87.c
+++ b/keyboards/xd87/xd87.c
@@ -19,7 +19,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 led_set_kb(uint8_t usb_led) {
@@ -30,8 +29,6 @@ void led_set_kb(uint8_t usb_led) {
   } else {
     writePinHigh(E2);
   }
-
-  led_set_user(usb_led);
 }
 
 void led_init_ports(void) {
diff --git a/keyboards/yd68/yd68.c b/keyboards/yd68/yd68.c
index 55148315c47..c13b7a06e2e 100644
--- a/keyboards/yd68/yd68.c
+++ b/keyboards/yd68/yd68.c
@@ -38,8 +38,6 @@ void matrix_init_kb(void) {
 	//RGB data output low
 	DDRB |= (1<<3);
 	PORTB &= ~(1<<3);
-	
-	matrix_init_user();
 }
 
 void led_set_kb(uint8_t usb_led) {
@@ -54,6 +52,4 @@ void led_set_kb(uint8_t usb_led) {
         DDRD |= (1<<4);
         PORTD |= (1<<4);
     }
-
-	led_set_user(usb_led);
 }
diff --git a/keyboards/yosino58/rev1/matrix.c b/keyboards/yosino58/rev1/matrix.c
index 718cc574481..80a32239475 100644
--- a/keyboards/yosino58/rev1/matrix.c
+++ b/keyboards/yosino58/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/z150_blackheart/z150_blackheart.c b/keyboards/z150_blackheart/z150_blackheart.c
index b754c64a12a..7c4bad0067c 100644
--- a/keyboards/z150_blackheart/z150_blackheart.c
+++ b/keyboards/z150_blackheart/z150_blackheart.c
@@ -4,8 +4,6 @@ void matrix_init_kb(void) {
     setPinOutput(B0);
     setPinOutput(E6);
     setPinOutput(E7);
-
-    matrix_init_user();
 };
 
 void led_set_kb(uint8_t usb_led) {
@@ -27,6 +25,4 @@ void led_set_kb(uint8_t usb_led) {
     } else {
         writePinLow(E6);
     }
-
-    led_set_user(usb_led);
 }
diff --git a/keyboards/zinc/rev1/matrix.c b/keyboards/zinc/rev1/matrix.c
index 220954f0519..f1b2470971f 100644
--- a/keyboards/zinc/rev1/matrix.c
+++ b/keyboards/zinc/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/zinc/rev1/rev1.c b/keyboards/zinc/rev1/rev1.c
index 2ce08a07c43..139919d5a60 100644
--- a/keyboards/zinc/rev1/rev1.c
+++ b/keyboards/zinc/rev1/rev1.c
@@ -1,6 +1 @@
 #include "zinc.h"
-
-void matrix_init_kb(void) {
-	matrix_init_user();
-};
-
diff --git a/keyboards/zinc/reva/matrix.c b/keyboards/zinc/reva/matrix.c
index 220954f0519..f1b2470971f 100644
--- a/keyboards/zinc/reva/matrix.c
+++ b/keyboards/zinc/reva/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/zinc/reva/reva.c b/keyboards/zinc/reva/reva.c
index 2ce08a07c43..139919d5a60 100644
--- a/keyboards/zinc/reva/reva.c
+++ b/keyboards/zinc/reva/reva.c
@@ -1,6 +1 @@
 #include "zinc.h"
-
-void matrix_init_kb(void) {
-	matrix_init_user();
-};
-
diff --git a/keyboards/zj68/zj68.c b/keyboards/zj68/zj68.c
index 960c943033b..8de12a64528 100644
--- a/keyboards/zj68/zj68.c
+++ b/keyboards/zj68/zj68.c
@@ -14,11 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "zj68.h"
-
-void matrix_init_kb(void) {
-    matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-    matrix_scan_user();
-}