diff --git a/keyboards/1upkeyboards/1up60hse/1up60hse.c b/keyboards/1upkeyboards/1up60hse/1up60hse.c
index f2ef58be175..fa62f52e649 100644
--- a/keyboards/1upkeyboards/1up60hse/1up60hse.c
+++ b/keyboards/1upkeyboards/1up60hse/1up60hse.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "1up60hse.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/1upkeyboards/super16/super16.c b/keyboards/1upkeyboards/super16/super16.c
index 41c5eab2c7f..f43c838f73a 100644
--- a/keyboards/1upkeyboards/super16/super16.c
+++ b/keyboards/1upkeyboards/super16/super16.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "super16.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/40percentclub/25/25.c b/keyboards/40percentclub/25/25.c
index 01019bea3e4..230a5411d5f 100644
--- a/keyboards/40percentclub/25/25.c
+++ b/keyboards/40percentclub/25/25.c
@@ -15,26 +15,6 @@
  */
 #include "25.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);
-}
-
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
 const keypos_t hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/40percentclub/4pack/4pack.c b/keyboards/40percentclub/4pack/4pack.c
index b17b7196b61..e1bd943b646 100644
--- a/keyboards/40percentclub/4pack/4pack.c
+++ b/keyboards/40percentclub/4pack/4pack.c
@@ -15,33 +15,10 @@
  */
 #include "4pack.h"
 
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-
 void matrix_init_kb(void) {
   // put your keyboard start-up code here
   // runs once when the firmware starts up
 
   setPinOutput(F4); // cathodes
   setPinOutput(F5); // cathodes
-
-  // Do the rest
-  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/40percentclub/4x4/4x4.c b/keyboards/40percentclub/4x4/4x4.c
index 94abafa580b..2c556775c45 100644
--- a/keyboards/40percentclub/4x4/4x4.c
+++ b/keyboards/40percentclub/4x4/4x4.c
@@ -1,22 +1,2 @@
 
 #include "4x4.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/40percentclub/5x5/5x5.c b/keyboards/40percentclub/5x5/5x5.c
index 0a7e29dddee..f30eb66071f 100644
--- a/keyboards/40percentclub/5x5/5x5.c
+++ b/keyboards/40percentclub/5x5/5x5.c
@@ -1,22 +1,2 @@
 
 #include "5x5.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/40percentclub/6lit/6lit.c b/keyboards/40percentclub/6lit/6lit.c
index 6c2297067f2..58732c4befe 100644
--- a/keyboards/40percentclub/6lit/6lit.c
+++ b/keyboards/40percentclub/6lit/6lit.c
@@ -15,26 +15,6 @@
  */
 #include "6lit.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);
-}
-
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
 const keypos_t hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/40percentclub/foobar/foobar.c b/keyboards/40percentclub/foobar/foobar.c
index 8deccd6a89b..638618e0b0b 100644
--- a/keyboards/40percentclub/foobar/foobar.c
+++ b/keyboards/40percentclub/foobar/foobar.c
@@ -15,26 +15,6 @@
  */
 #include "foobar.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);
-}
-
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
 const keypos_t hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/40percentclub/half_n_half/half_n_half.c b/keyboards/40percentclub/half_n_half/half_n_half.c
index 1d024608898..e49e5457989 100644
--- a/keyboards/40percentclub/half_n_half/half_n_half.c
+++ b/keyboards/40percentclub/half_n_half/half_n_half.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "half_n_half.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/40percentclub/i75/i75.c b/keyboards/40percentclub/i75/i75.c
index 9360877ac89..28684e7144d 100644
--- a/keyboards/40percentclub/i75/i75.c
+++ b/keyboards/40percentclub/i75/i75.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "i75.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/40percentclub/mf68/mf68.c b/keyboards/40percentclub/mf68/mf68.c
index 1da522e7e18..4abee8e0c35 100644
--- a/keyboards/40percentclub/mf68/mf68.c
+++ b/keyboards/40percentclub/mf68/mf68.c
@@ -1,8 +1 @@
 #include "mf68.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/40percentclub/nano/nano.c b/keyboards/40percentclub/nano/nano.c
index 63e23545e6c..8761e8add4f 100644
--- a/keyboards/40percentclub/nano/nano.c
+++ b/keyboards/40percentclub/nano/nano.c
@@ -1,5 +1 @@
 #include "nano.h"
-
-void matrix_init_kb(void) {
-	matrix_init_user();
-}
diff --git a/keyboards/40percentclub/nori/nori.c b/keyboards/40percentclub/nori/nori.c
index 5c51c7baa32..f60cf98d868 100644
--- a/keyboards/40percentclub/nori/nori.c
+++ b/keyboards/40percentclub/nori/nori.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "nori.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/40percentclub/ut47/ut47.c b/keyboards/40percentclub/ut47/ut47.c
index 662e9099f11..a1027e56212 100644
--- a/keyboards/40percentclub/ut47/ut47.c
+++ b/keyboards/40percentclub/ut47/ut47.c
@@ -18,28 +18,9 @@
     #include "protocol/serial.h"
 #endif
 
-void matrix_init_kb(void) {
-    // put your keyboard start-up code here
-    // runs once when the firmware starts up
-
-    matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-    // put your looping keyboard code here
-    // runs every cycle (a lot)
-
-    matrix_scan_user();
-}
-
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
     // put your per-action keyboard code here
     // runs for every action, just before processing by the firmware
-    /* 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 (record->event.pressed) {
 #ifdef LED_ENABLE
         serial_send((record->event.key.row*16)+record->event.key.col);
@@ -47,9 +28,3 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
     }
     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);
-}
diff --git a/keyboards/6ball/6ball.c b/keyboards/6ball/6ball.c
index 5060a5db46a..1eddde9ba5c 100644
--- a/keyboards/6ball/6ball.c
+++ b/keyboards/6ball/6ball.c
@@ -1,5 +1 @@
 #include "6ball.h"
-
-void matrix_init_kb(void) {
-	matrix_init_user();
-}
diff --git a/keyboards/9key/9key.c b/keyboards/9key/9key.c
index ed8e91e73b5..bbbabb81c4b 100644
--- a/keyboards/9key/9key.c
+++ b/keyboards/9key/9key.c
@@ -1,5 +1 @@
 #include "9key.h"
-
-void matrix_init_kb(void) {
-	matrix_init_user();
-}
\ No newline at end of file
diff --git a/keyboards/abstract/ellipse/rev1/rev1.c b/keyboards/abstract/ellipse/rev1/rev1.c
index 482065c5c9a..f2a7e484cd8 100644
--- a/keyboards/abstract/ellipse/rev1/rev1.c
+++ b/keyboards/abstract/ellipse/rev1/rev1.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "rev1.h"
-
-/*void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}*/
diff --git a/keyboards/acheron/shark/shark.c b/keyboards/acheron/shark/shark.c
index 667a716f5d5..ab607edae1f 100644
--- a/keyboards/acheron/shark/shark.c
+++ b/keyboards/acheron/shark/shark.c
@@ -14,31 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "shark.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/acr60/acr60.c b/keyboards/acr60/acr60.c
index 8a76020e547..e4f9184a1d7 100644
--- a/keyboards/acr60/acr60.c
+++ b/keyboards/acr60/acr60.c
@@ -4,25 +4,12 @@
 void matrix_init_kb(void) {
   // Keyboard start-up code goes here
   // Runs once when the firmware starts up
-  matrix_init_user();
   led_init_ports();
 };
 
-void matrix_scan_kb(void) {
-  // Looping keyboard code goes here
-  // This runs every cycle (a lot)
-  matrix_scan_user();
-};
-
 void led_init_ports(void) {
   // Set caps lock LED pin as output
   DDRB |= (1 << 2);
   // Default to off
   PORTB |= (1 << 2);
 }
-
-void led_set_kb(uint8_t usb_led) {
-  // Code for caps lock LED as reported by the OS
-  // Set this per keymap, instead of globally
-  led_set_user(usb_led);
-}
diff --git a/keyboards/adkb96/rev1/rev1.c b/keyboards/adkb96/rev1/rev1.c
index 872a7e08ff0..1dcf818a036 100644
--- a/keyboards/adkb96/rev1/rev1.c
+++ b/keyboards/adkb96/rev1/rev1.c
@@ -9,7 +9,5 @@ void matrix_init_kb(void) {
     // // orange led on
     // DDRB |= (1<<0);
     // PORTB &= ~(1<<0);
-
-	matrix_init_user();
 };
 
diff --git a/keyboards/ai03/orbit/matrix.c b/keyboards/ai03/orbit/matrix.c
index a1509666cd5..582a5144443 100644
--- a/keyboards/ai03/orbit/matrix.c
+++ b/keyboards/ai03/orbit/matrix.c
@@ -66,15 +66,6 @@ static matrix_row_t raw_matrix[ROWS_PER_HAND];
 uint8_t thisHand, thatHand;
 
 // user-defined overridable functions
-
-__attribute__((weak)) void matrix_init_kb(void) { matrix_init_user(); }
-
-__attribute__((weak)) void matrix_scan_kb(void) { matrix_scan_user(); }
-
-__attribute__((weak)) void matrix_init_user(void) {}
-
-__attribute__((weak)) void matrix_scan_user(void) {}
-
 __attribute__((weak)) void matrix_slave_scan_user(void) {}
 
 // helper functions
diff --git a/keyboards/ai03/orbit/orbit.c b/keyboards/ai03/orbit/orbit.c
index 18dd2244bab..756771ec560 100644
--- a/keyboards/ai03/orbit/orbit.c
+++ b/keyboards/ai03/orbit/orbit.c
@@ -168,15 +168,6 @@ void matrix_init_kb(void) {
 	}
 
 	set_layer_indicators(0);
-	
-	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) {
@@ -194,7 +185,6 @@ void led_set_kb(uint8_t usb_led) {
 		
 	}
 
-	led_set_user(usb_led);
 }
 
 uint32_t layer_state_set_kb(uint32_t state) {
diff --git a/keyboards/ai03/quasar/quasar.c b/keyboards/ai03/quasar/quasar.c
index dd70947d1fa..75d77e355c0 100644
--- a/keyboards/ai03/quasar/quasar.c
+++ b/keyboards/ai03/quasar/quasar.c
@@ -14,31 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "quasar.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/ai03/soyuz/soyuz.c b/keyboards/ai03/soyuz/soyuz.c
index 4d4cbef3cdb..e643d14ec16 100644
--- a/keyboards/ai03/soyuz/soyuz.c
+++ b/keyboards/ai03/soyuz/soyuz.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "soyuz.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/akb/eb46/eb46.c b/keyboards/akb/eb46/eb46.c
index 8c0a2ddb9b9..a2113d0fe95 100644
--- a/keyboards/akb/eb46/eb46.c
+++ b/keyboards/akb/eb46/eb46.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "eb46.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/alf/dc60/dc60.c b/keyboards/alf/dc60/dc60.c
index 7f724b45d20..756727bbe99 100644
--- a/keyboards/alf/dc60/dc60.c
+++ b/keyboards/alf/dc60/dc60.c
@@ -15,20 +15,6 @@
  */
 #include "dc60.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 << 7);
@@ -37,6 +23,4 @@ void led_set_kb(uint8_t usb_led) {
 		DDRB &= ~(1 << 7);
 		PORTB &= ~(1 << 7);
 	}
-
-	led_set_user(usb_led);
 }
diff --git a/keyboards/alf/x11/x11.c b/keyboards/alf/x11/x11.c
index 1c35fb2c78d..fe38cebbcb3 100644
--- a/keyboards/alf/x11/x11.c
+++ b/keyboards/alf/x11/x11.c
@@ -22,14 +22,6 @@ void matrix_init_kb(void) {
     setPinOutput(C6);
     setPinOutput(E6);
     setPinOutput(C7);
-    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) {
@@ -52,6 +44,4 @@ void led_set_kb(uint8_t usb_led) {
     } else {
         writePinHigh(C7);
     }
-
-    led_set_user(usb_led);
 }
diff --git a/keyboards/amj40/amj40.c b/keyboards/amj40/amj40.c
index 5a237699912..52301fb82e7 100755
--- a/keyboards/amj40/amj40.c
+++ b/keyboards/amj40/amj40.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);
diff --git a/keyboards/amj60/amj60.c b/keyboards/amj60/amj60.c
index 993a5917dbd..6c044c53e32 100644
--- a/keyboards/amj60/amj60.c
+++ b/keyboards/amj60/amj60.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);
diff --git a/keyboards/amj96/amj96.c b/keyboards/amj96/amj96.c
index b9cf6d720a4..65fca6f12ad 100644
--- a/keyboards/amj96/amj96.c
+++ b/keyboards/amj96/amj96.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "amj96.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/amjkeyboard/amj66/amj66.c b/keyboards/amjkeyboard/amj66/amj66.c
index 2a6b3687a53..6d77e43a0a2 100644
--- a/keyboards/amjkeyboard/amj66/amj66.c
+++ b/keyboards/amjkeyboard/amj66/amj66.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "amj66.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/amjpad/amjpad.c b/keyboards/amjpad/amjpad.c
index ac5991bd087..31f49057ad1 100644
--- a/keyboards/amjpad/amjpad.c
+++ b/keyboards/amjpad/amjpad.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
     DDRD |= (1<<6);
diff --git a/keyboards/angel17/alpha/alpha.c b/keyboards/angel17/alpha/alpha.c
index a5f094f7c57..1c2936e1574 100644
--- a/keyboards/angel17/alpha/alpha.c
+++ b/keyboards/angel17/alpha/alpha.c
@@ -14,31 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "alpha.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/angel17/rev1/rev1.c b/keyboards/angel17/rev1/rev1.c
index 831064dde4c..40ff30e6202 100644
--- a/keyboards/angel17/rev1/rev1.c
+++ b/keyboards/angel17/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/angel64/alpha/alpha.c b/keyboards/angel64/alpha/alpha.c
index a5f094f7c57..1c2936e1574 100644
--- a/keyboards/angel64/alpha/alpha.c
+++ b/keyboards/angel64/alpha/alpha.c
@@ -14,31 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "alpha.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/angel64/alpha/matrix.c b/keyboards/angel64/alpha/matrix.c
index e06fc15dc4f..003fa1b87ca 100644
--- a/keyboards/angel64/alpha/matrix.c
+++ b/keyboards/angel64/alpha/matrix.c
@@ -54,22 +54,18 @@ static matrix_row_t matrix[MATRIX_ROWS]; //debounced values
 
 __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_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
diff --git a/keyboards/angel64/rev1/matrix.c b/keyboards/angel64/rev1/matrix.c
index e06fc15dc4f..d6ade7e3907 100644
--- a/keyboards/angel64/rev1/matrix.c
+++ b/keyboards/angel64/rev1/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/angel64/rev1/rev1.c b/keyboards/angel64/rev1/rev1.c
index 831064dde4c..40ff30e6202 100644
--- a/keyboards/angel64/rev1/rev1.c
+++ b/keyboards/angel64/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/atomic/atomic.c b/keyboards/atomic/atomic.c
index eba5ed61f68..29ddd05aaca 100644
--- a/keyboards/atomic/atomic.c
+++ b/keyboards/atomic/atomic.c
@@ -7,6 +7,4 @@ void matrix_init_kb(void) {
     // Turn status LED on
     DDRE |= (1<<6);
     PORTE |= (1<<6);
-
-    matrix_init_user();
 }
diff --git a/keyboards/baguette/baguette.c b/keyboards/baguette/baguette.c
index 6f707fe56e5..78af3f8c7a4 100644
--- a/keyboards/baguette/baguette.c
+++ b/keyboards/baguette/baguette.c
@@ -46,19 +46,4 @@ void matrix_init_kb(void) {
 	// put your keyboard start-up code here
 	// runs once when the firmware starts up
 	bootmagic_lite();
-
-	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/bm16a/bm16a.c b/keyboards/bm16a/bm16a.c
index 64b5bf64305..9676b501199 100644
--- a/keyboards/bm16a/bm16a.c
+++ b/keyboards/bm16a/bm16a.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "bm16a.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/bm43a/bm43a.c b/keyboards/bm43a/bm43a.c
index a4bb6fad634..47e42864e02 100644
--- a/keyboards/bm43a/bm43a.c
+++ b/keyboards/bm43a/bm43a.c
@@ -14,31 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "bm43a.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/bm60rgb/bm60rgb.c b/keyboards/bm60rgb/bm60rgb.c
index c4248a672d1..fa199768451 100644
--- a/keyboards/bm60rgb/bm60rgb.c
+++ b/keyboards/bm60rgb/bm60rgb.c
@@ -15,26 +15,6 @@
  */
 #include "bm60rgb.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);
-}
-
 led_config_t g_led_config = { {
   {   0,   1,   2,   3,   4,   5,   6,   7,   8,   9,  10,  11,  12,  13 },
   {  14,  15,  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27 },
diff --git a/keyboards/boston_meetup/2019/2019.c b/keyboards/boston_meetup/2019/2019.c
index b4501af07b7..34613496dd8 100644
--- a/keyboards/boston_meetup/2019/2019.c
+++ b/keyboards/boston_meetup/2019/2019.c
@@ -152,7 +152,7 @@ void draw_ui(void) {
   send_buffer();
 }
 
-void led_set_user(uint8_t usb_led) {
+void led_set_kb(uint8_t usb_led) {
     if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) {
       if (led_numlock == false){led_numlock = true;}
     } else {
@@ -186,7 +186,6 @@ void encoder_update_kb(uint8_t index, bool clockwise) {
 
 void matrix_init_kb(void) {
   queue_for_send = true;
-	matrix_init_user();
 }
 
 void matrix_scan_kb(void) {
@@ -206,5 +205,4 @@ if (queue_for_send) {
   }
   counterst = (counterst + 1) % 1024;
   //rgblight_task();
-	matrix_scan_user();
 }
diff --git a/keyboards/bpiphany/frosty_flake/frosty_flake.c b/keyboards/bpiphany/frosty_flake/frosty_flake.c
index f858a356f8b..3e1283ee313 100644
--- a/keyboards/bpiphany/frosty_flake/frosty_flake.c
+++ b/keyboards/bpiphany/frosty_flake/frosty_flake.c
@@ -1,19 +1,5 @@
 #include "frosty_flake.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) {
     DDRB |= (1<<7);
     DDRC |= (1<<5) | (1<<6);
@@ -34,23 +20,4 @@ void led_set_kb(uint8_t usb_led) {
         PORTC &= ~(1<<6);
     else
         PORTC |=  (1<<6);
-
-    led_set_user(usb_led);
-}
-
-__attribute__ ((weak))
-void matrix_init_user(void) {
-}
-
-__attribute__ ((weak))
-void matrix_scan_user(void) {
-}
-
-__attribute__ ((weak))
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-
-__attribute__ ((weak))
-void led_set_user(uint8_t usb_led) {
 }
diff --git a/keyboards/bpiphany/frosty_flake/matrix.c b/keyboards/bpiphany/frosty_flake/matrix.c
index 3c49e9c000f..3f38634052a 100644
--- a/keyboards/bpiphany/frosty_flake/matrix.c
+++ b/keyboards/bpiphany/frosty_flake/matrix.c
@@ -34,12 +34,10 @@ static matrix_row_t matrix_debouncing[MATRIX_ROWS];
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
diff --git a/keyboards/bpiphany/kitten_paw/kitten_paw.c b/keyboards/bpiphany/kitten_paw/kitten_paw.c
index c2d42e1428d..f1c7e42d01a 100644
--- a/keyboards/bpiphany/kitten_paw/kitten_paw.c
+++ b/keyboards/bpiphany/kitten_paw/kitten_paw.c
@@ -1,27 +1,5 @@
 #include "kitten_paw.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();
-}
-
-__attribute__ ((weak))
-void matrix_init_user(void) {
-}
-
-__attribute__ ((weak))
-void matrix_scan_user(void) {
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
     CONFIG_LED_IO;
@@ -40,5 +18,4 @@ void led_set_kb(uint8_t usb_led) {
         USB_LED_SCROLL_LOCK_ON;
     else
         USB_LED_SCROLL_LOCK_OFF;
-	led_set_user(usb_led);
 }
diff --git a/keyboards/bpiphany/kitten_paw/matrix.c b/keyboards/bpiphany/kitten_paw/matrix.c
index b59089cdf43..8b541f6c995 100644
--- a/keyboards/bpiphany/kitten_paw/matrix.c
+++ b/keyboards/bpiphany/kitten_paw/matrix.c
@@ -37,12 +37,10 @@ static void select_col(uint8_t col);
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
diff --git a/keyboards/bpiphany/pegasushoof/2013/2013.c b/keyboards/bpiphany/pegasushoof/2013/2013.c
index 7a489b22a70..c9bd01a9978 100644
--- a/keyboards/bpiphany/pegasushoof/2013/2013.c
+++ b/keyboards/bpiphany/pegasushoof/2013/2013.c
@@ -23,37 +23,3 @@ extern inline void ph_caps_led_off(void);
 
 extern inline void ph_sclk_led_on(void);
 extern inline void ph_sclk_led_off(void);
-
-
-__attribute__ ((weak))
-void matrix_init_user(void) {
-};
-
-__attribute__ ((weak))
-void matrix_scan_user(void) {
-}
-
-__attribute__ ((weak))
-bool process_action_user(keyrecord_t *record) {
-    return true;
-}
-
-__attribute__ ((weak))
-void led_set_user(uint8_t usb_led) {
-}
-
-void matrix_init_kb(void) {
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	matrix_scan_user();
-}
-
-bool process_action_kb(keyrecord_t *record) {
-	return process_action_user(record);
-}
-
-void led_set_kb(uint8_t usb_led) {
-	led_set_user(usb_led);
-}
diff --git a/keyboards/bpiphany/pegasushoof/2013/matrix.c b/keyboards/bpiphany/pegasushoof/2013/matrix.c
index a670d538238..5110e3adf37 100644
--- a/keyboards/bpiphany/pegasushoof/2013/matrix.c
+++ b/keyboards/bpiphany/pegasushoof/2013/matrix.c
@@ -35,12 +35,10 @@ static void select_row(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/bpiphany/pegasushoof/2015/2015.c b/keyboards/bpiphany/pegasushoof/2015/2015.c
index 62841e7af18..401dc2633b7 100644
--- a/keyboards/bpiphany/pegasushoof/2015/2015.c
+++ b/keyboards/bpiphany/pegasushoof/2015/2015.c
@@ -23,36 +23,3 @@ extern inline void ph_caps_led_off(void);
 
 extern inline void ph_sclk_led_on(void);
 extern inline void ph_sclk_led_off(void);
-
-__attribute__ ((weak))
-void matrix_init_user(void) {
-};
-
-__attribute__ ((weak))
-void matrix_scan_user(void) {
-}
-
-__attribute__ ((weak))
-bool process_action_user(keyrecord_t *record) {
-    return true;
-}
-
-__attribute__ ((weak))
-void led_set_user(uint8_t usb_led) {
-}
-
-void matrix_init_kb(void) {
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	matrix_scan_user();
-}
-
-bool process_action_kb(keyrecord_t *record) {
-	return process_action_user(record);
-}
-
-void led_set_kb(uint8_t usb_led) {
-	led_set_user(usb_led);
-}
diff --git a/keyboards/bpiphany/sixshooter/sixshooter.c b/keyboards/bpiphany/sixshooter/sixshooter.c
index 87a739454d3..e95a06f16f8 100644
--- a/keyboards/bpiphany/sixshooter/sixshooter.c
+++ b/keyboards/bpiphany/sixshooter/sixshooter.c
@@ -16,23 +16,3 @@ extern inline void sixshooter_led_5_off(void);
 
 extern inline void sixshooter_led_all_on(void);
 extern inline void sixshooter_led_all_off(void);
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
diff --git a/keyboards/bpiphany/tiger_lily/matrix.c b/keyboards/bpiphany/tiger_lily/matrix.c
index 47a92268c86..d684f31e3aa 100644
--- a/keyboards/bpiphany/tiger_lily/matrix.c
+++ b/keyboards/bpiphany/tiger_lily/matrix.c
@@ -34,12 +34,10 @@ static matrix_row_t matrix_debouncing[MATRIX_ROWS];
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
diff --git a/keyboards/bpiphany/tiger_lily/tiger_lily.c b/keyboards/bpiphany/tiger_lily/tiger_lily.c
index ec50ea8b3f4..b593254a3ce 100644
--- a/keyboards/bpiphany/tiger_lily/tiger_lily.c
+++ b/keyboards/bpiphany/tiger_lily/tiger_lily.c
@@ -1,19 +1,5 @@
 #include "tiger_lily.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) {
     DDRB |= (1<<7);
     DDRC |= (1<<5) | (1<<6);
@@ -34,23 +20,4 @@ void led_set_kb(uint8_t usb_led) {
         PORTC &= ~(1<<6);
     else
         PORTC |=  (1<<6);
-
-    led_set_user(usb_led);
-}
-
-__attribute__ ((weak))
-void matrix_init_user(void) {
-}
-
-__attribute__ ((weak))
-void matrix_scan_user(void) {
-}
-
-__attribute__ ((weak))
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-
-__attribute__ ((weak))
-void led_set_user(uint8_t usb_led) {
 }
diff --git a/keyboards/bpiphany/unloved_bastard/matrix.c b/keyboards/bpiphany/unloved_bastard/matrix.c
index 328d9015c25..53b290ab7bd 100644
--- a/keyboards/bpiphany/unloved_bastard/matrix.c
+++ b/keyboards/bpiphany/unloved_bastard/matrix.c
@@ -27,12 +27,10 @@
 
 __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/bpiphany/unloved_bastard/unloved_bastard.c b/keyboards/bpiphany/unloved_bastard/unloved_bastard.c
index ab54a5293dc..4537d2aa3f6 100644
--- a/keyboards/bpiphany/unloved_bastard/unloved_bastard.c
+++ b/keyboards/bpiphany/unloved_bastard/unloved_bastard.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();
 }
 
 // C5 left
@@ -59,6 +51,4 @@ void led_set_kb(uint8_t usb_led) {
         PORTC &= ~(1<<6);
     else
         PORTC |=  (1<<6);
-
-    led_set_user(usb_led);
 }
diff --git a/keyboards/bthlabs/geekpad/geekpad.c b/keyboards/bthlabs/geekpad/geekpad.c
index 61df9391739..6b8edd31c34 100644
--- a/keyboards/bthlabs/geekpad/geekpad.c
+++ b/keyboards/bthlabs/geekpad/geekpad.c
@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "geekpad.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/business_card/alpha/alpha.c b/keyboards/business_card/alpha/alpha.c
index a5f094f7c57..1c2936e1574 100644
--- a/keyboards/business_card/alpha/alpha.c
+++ b/keyboards/business_card/alpha/alpha.c
@@ -14,31 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "alpha.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/kbdfans/kbd66/kbd66.c b/keyboards/kbdfans/kbd66/kbd66.c
index 7a84b63684f..d08a378a941 100644
--- a/keyboards/kbdfans/kbd66/kbd66.c
+++ b/keyboards/kbdfans/kbd66/kbd66.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/kbdfans/kbd67/hotswap/hotswap.c b/keyboards/kbdfans/kbd67/hotswap/hotswap.c
index e6999f6af2b..60f355e240b 100644
--- a/keyboards/kbdfans/kbd67/hotswap/hotswap.c
+++ b/keyboards/kbdfans/kbd67/hotswap/hotswap.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/mkii_soldered.c b/keyboards/kbdfans/kbd67/mkii_soldered/mkii_soldered.c
index c36a84e75ff..64d6733ddf7 100644
--- a/keyboards/kbdfans/kbd67/mkii_soldered/mkii_soldered.c
+++ b/keyboards/kbdfans/kbd67/mkii_soldered/mkii_soldered.c
@@ -38,11 +38,4 @@ void matrix_scan_kb(void) {
   matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
 */
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c b/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c
index 526949e6fe7..8991244d753 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c
@@ -103,9 +103,6 @@ void matrix_init_kb(void) {
 void matrix_scan_kb(void) {
     matrix_scan_user();
 }
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-    return process_record_user(keycode, record);
-}
 void suspend_power_down_kb(void)
 {
     rgb_matrix_set_suspend_state(true);
diff --git a/keyboards/kbdfans/kbd67/rev1/rev1.c b/keyboards/kbdfans/kbd67/rev1/rev1.c
index 94cb9e553b0..ae42a88033d 100644
--- a/keyboards/kbdfans/kbd67/rev1/rev1.c
+++ b/keyboards/kbdfans/kbd67/rev1/rev1.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/kbdfans/kbd67/rev2/rev2.c b/keyboards/kbdfans/kbd67/rev2/rev2.c
index 8aa83f58614..7406978ebf4 100644
--- a/keyboards/kbdfans/kbd67/rev2/rev2.c
+++ b/keyboards/kbdfans/kbd67/rev2/rev2.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 	led_set_user(usb_led);
diff --git a/keyboards/kbdfans/kbd6x/kbd6x.c b/keyboards/kbdfans/kbd6x/kbd6x.c
index f558af0304b..9c7c9381515 100644
--- a/keyboards/kbdfans/kbd6x/kbd6x.c
+++ b/keyboards/kbdfans/kbd6x/kbd6x.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
 		DDRB |= (1 << 6); 
@@ -46,4 +39,4 @@ void led_set_kb(uint8_t usb_led) {
 	}
 	
 	led_set_user(usb_led);
-}
\ No newline at end of file
+}
diff --git a/keyboards/kbdfans/kbd8x/kbd8x.c b/keyboards/kbdfans/kbd8x/kbd8x.c
index 97c2e74e3a6..cac50fb2569 100644
--- a/keyboards/kbdfans/kbd8x/kbd8x.c
+++ b/keyboards/kbdfans/kbd8x/kbd8x.c
@@ -37,13 +37,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/kbdfans/kbd8x_mk2/kbd8x_mk2.c b/keyboards/kbdfans/kbd8x_mk2/kbd8x_mk2.c
index 1472707234e..54fd5fd7896 100644
--- a/keyboards/kbdfans/kbd8x_mk2/kbd8x_mk2.c
+++ b/keyboards/kbdfans/kbd8x_mk2/kbd8x_mk2.c
@@ -61,11 +61,4 @@ void matrix_scan_kb(void) {
   matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
 */
diff --git a/keyboards/kbdfans/kbdmini/kbdmini.c b/keyboards/kbdfans/kbdmini/kbdmini.c
index b402eed64f4..b605d73062e 100644
--- a/keyboards/kbdfans/kbdmini/kbdmini.c
+++ b/keyboards/kbdfans/kbdmini/kbdmini.c
@@ -80,9 +80,6 @@ void matrix_init_kb(void) {
 void matrix_scan_kb(void) {
     matrix_scan_user();
 }
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-    return process_record_user(keycode, record);
-}
 void suspend_power_down_kb(void)
 {
     rgb_matrix_set_suspend_state(true);
diff --git a/keyboards/kbdfans/kbdpad_mk2/kbdpad_mk2.c b/keyboards/kbdfans/kbdpad_mk2/kbdpad_mk2.c
index 3ca8e0c7355..cf49e0eff49 100644
--- a/keyboards/kbdfans/kbdpad_mk2/kbdpad_mk2.c
+++ b/keyboards/kbdfans/kbdpad_mk2/kbdpad_mk2.c
@@ -51,11 +51,4 @@ void matrix_scan_kb(void) {
   matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
 */
diff --git a/keyboards/keebio/ergodicity/ergodicity.c b/keyboards/keebio/ergodicity/ergodicity.c
index 0bbcf611784..e91a9bbd0ff 100644
--- a/keyboards/keebio/ergodicity/ergodicity.c
+++ b/keyboards/keebio/ergodicity/ergodicity.c
@@ -35,13 +35,6 @@ void matrix_scan_kb(void) {
   matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
   // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/keyhive/maypad/maypad.c b/keyboards/keyhive/maypad/maypad.c
index 825d8c4a5d5..d7434194b85 100644
--- a/keyboards/keyhive/maypad/maypad.c
+++ b/keyboards/keyhive/maypad/maypad.c
@@ -35,13 +35,6 @@ void matrix_scan_kb(void) {
   matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
   // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/kinesis/alvicstep/alvicstep.c b/keyboards/kinesis/alvicstep/alvicstep.c
index fba9f5136fe..fcc6e854c7e 100644
--- a/keyboards/kinesis/alvicstep/alvicstep.c
+++ b/keyboards/kinesis/alvicstep/alvicstep.c
@@ -78,13 +78,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/kinesis/stapelberg/stapelberg.c b/keyboards/kinesis/stapelberg/stapelberg.c
index af407ac4fc6..b4cf877e11c 100644
--- a/keyboards/kinesis/stapelberg/stapelberg.c
+++ b/keyboards/kinesis/stapelberg/stapelberg.c
@@ -19,13 +19,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_init_ports() {
   // * Set our LED pins as output
   DDRF |= (1<<0); // Keypad LED
diff --git a/keyboards/kira75/kira75.c b/keyboards/kira75/kira75.c
index 4b53290bef1..faa36a53c99 100644
--- a/keyboards/kira75/kira75.c
+++ b/keyboards/kira75/kira75.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/kmac/kmac.c b/keyboards/kmac/kmac.c
index dcbbc2f1796..b70ec0f656a 100644
--- a/keyboards/kmac/kmac.c
+++ b/keyboards/kmac/kmac.c
@@ -42,13 +42,6 @@ void matrix_scan_kb(void) {
   matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
 */
 
 /* LED pin configuration
diff --git a/keyboards/kmini/kmini.c b/keyboards/kmini/kmini.c
index 08a120b65fb..48638cd2293 100755
--- a/keyboards/kmini/kmini.c
+++ b/keyboards/kmini/kmini.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
     matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-    // put your per-action keyboard code here
-    // runs for every action, just before processing by the firmware
-
-    return process_record_user(keycode, record);
-}
-
 void led_init_ports(void) {
     DDRB |= (1<<1); // OUT
     DDRB |= (1<<2); // OUT
diff --git a/keyboards/knops/mini/mini.c b/keyboards/knops/mini/mini.c
index ccfd4331b3e..54da2895936 100644
--- a/keyboards/knops/mini/mini.c
+++ b/keyboards/knops/mini/mini.c
@@ -29,16 +29,9 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 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);
 }
-*/
\ No newline at end of file
+*/
diff --git a/keyboards/kona_classic/kona_classic.c b/keyboards/kona_classic/kona_classic.c
index 71cee7baafb..806cb1f5ea3 100644
--- a/keyboards/kona_classic/kona_classic.c
+++ b/keyboards/kona_classic/kona_classic.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
     matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-    // put your per-action keyboard code here
-    // runs for every action, just before processing by the firmware
-
-    return process_record_user(keycode, record);
-}
-
 void led_init_ports(void) {
 //    DDRB |= (1<<6) | (1<<7); // OUT
 }
diff --git a/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.c b/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.c
index 26ab883a497..6284489c62e 100644
--- a/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.c
+++ b/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.c
@@ -17,11 +17,16 @@ void matrix_scan_kb(void)
 
 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 process_record_user(keycode, record);
+    return true;
 }
 
 void reset_keyboard_kb(){
diff --git a/keyboards/lfkeyboards/lfk78/lfk78.c b/keyboards/lfkeyboards/lfk78/lfk78.c
index 60b7ab4ce09..d615dcb9c81 100644
--- a/keyboards/lfkeyboards/lfk78/lfk78.c
+++ b/keyboards/lfkeyboards/lfk78/lfk78.c
@@ -119,6 +119,11 @@ 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);
     }
@@ -126,7 +131,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record)
         reset_keyboard_kb();
     } else {
     }
-    return process_record_user(keycode, record);
+    return true;
 }
 
 void action_function(keyrecord_t *event, uint8_t id, uint8_t opt)
diff --git a/keyboards/lfkeyboards/lfk87/lfk87.c b/keyboards/lfkeyboards/lfk87/lfk87.c
index 4b34fcef7e1..2beb922a376 100644
--- a/keyboards/lfkeyboards/lfk87/lfk87.c
+++ b/keyboards/lfkeyboards/lfk87/lfk87.c
@@ -106,6 +106,11 @@ 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);
     }
@@ -113,7 +118,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record)
         reset_keyboard_kb();
     } else {
     }
-    return process_record_user(keycode, record);
+    return true;
 }
 
 void action_function(keyrecord_t *event, uint8_t id, uint8_t opt)
diff --git a/keyboards/lfkeyboards/lfkpad/lfkpad.c b/keyboards/lfkeyboards/lfkpad/lfkpad.c
index b91b7da67d4..59d66a37620 100644
--- a/keyboards/lfkeyboards/lfkpad/lfkpad.c
+++ b/keyboards/lfkeyboards/lfkpad/lfkpad.c
@@ -83,6 +83,11 @@ 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);
     }
@@ -91,7 +96,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
         reset_keyboard_kb();
     }
 
-    return process_record_user(keycode, record);
+    return true;
 }
 
 void action_function(keyrecord_t *event, uint8_t id, uint8_t opt) {
diff --git a/keyboards/lfkeyboards/mini1800/mini1800.c b/keyboards/lfkeyboards/mini1800/mini1800.c
index d5f4193c1da..680bfa7cb53 100644
--- a/keyboards/lfkeyboards/mini1800/mini1800.c
+++ b/keyboards/lfkeyboards/mini1800/mini1800.c
@@ -112,6 +112,11 @@ 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);
     }
@@ -119,7 +124,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record)
         reset_keyboard_kb();
     } else {
     }
-    return process_record_user(keycode, record);
+    return true;
 }
 
 void action_function(keyrecord_t *event, uint8_t id, uint8_t opt)
diff --git a/keyboards/lfkeyboards/smk65/smk65.c b/keyboards/lfkeyboards/smk65/smk65.c
index d3654b88083..be14c0b7aa7 100644
--- a/keyboards/lfkeyboards/smk65/smk65.c
+++ b/keyboards/lfkeyboards/smk65/smk65.c
@@ -55,6 +55,11 @@ 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){
@@ -64,7 +69,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record)
         reset_keyboard_kb();
     } else {
     }
-    return process_record_user(keycode, record);
+    return true;
 }
 
 void action_function(keyrecord_t *event, uint8_t id, uint8_t opt)
diff --git a/keyboards/lily58/lily58.c b/keyboards/lily58/lily58.c
index eacd90a82de..d880e52643a 100644
--- a/keyboards/lily58/lily58.c
+++ b/keyboards/lily58/lily58.c
@@ -2,9 +2,14 @@
 #include "ssd1306.h"
 
 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.
+     */
 #ifdef SSD1306OLED
-  return process_record_gfx(keycode,record) && process_record_user(keycode, record);
+  return process_record_gfx(keycode,record);
 #else
-  return process_record_user(keycode, record);
+  return true;
 #endif
-}
\ No newline at end of file
+}
diff --git a/keyboards/m0lly/m0lly.c b/keyboards/m0lly/m0lly.c
index 5e1b5371a12..ab919857c29 100644
--- a/keyboards/m0lly/m0lly.c
+++ b/keyboards/m0lly/m0lly.c
@@ -30,13 +30,6 @@ void matrix_scan_kb(void) {
     matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-    // put your per-action keyboard code here
-    // runs for every action, just before processing by the firmware
-
-    return process_record_user(keycode, record);
-}
-
 void led_init_ports(void) {
 	DDRD |= (1<<2) | (1<<3) | (1<<4); // OUT
 	DDRB |= (1<<7); // OUT
@@ -66,4 +59,4 @@ void led_set_kb(uint8_t usb_led) {
         // Turn scrolllock off
 		PORTD &= ~(1<<4);
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/mechkeys/mk60/mk60.c b/keyboards/mechkeys/mk60/mk60.c
index 4c6a059f4cf..2192526decb 100644
--- a/keyboards/mechkeys/mk60/mk60.c
+++ b/keyboards/mechkeys/mk60/mk60.c
@@ -30,13 +30,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/meira/meira.c b/keyboards/meira/meira.c
index 1d0db5e9972..d4a5a23211a 100644
--- a/keyboards/meira/meira.c
+++ b/keyboards/meira/meira.c
@@ -77,11 +77,16 @@ void matrix_scan_kb(void)
 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 process_record_user(keycode, record);
+    return true;
 }
 
 void led_set_kb(uint8_t usb_led) {
diff --git a/keyboards/meishi/meishi.c b/keyboards/meishi/meishi.c
index 92c5194d5f7..42e4959c3a4 100644
--- a/keyboards/meishi/meishi.c
+++ b/keyboards/meishi/meishi.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/meishi2/meishi2.c b/keyboards/meishi2/meishi2.c
index a74e6d3e639..be046eadbfe 100644
--- a/keyboards/meishi2/meishi2.c
+++ b/keyboards/meishi2/meishi2.c
@@ -35,13 +35,6 @@ void matrix_scan_kb(void) {
   matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
   // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/meme/meme.c b/keyboards/meme/meme.c
index 8ba421b1508..bd34a281a75 100644
--- a/keyboards/meme/meme.c
+++ b/keyboards/meme/meme.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/meson/meson.c b/keyboards/meson/meson.c
index 9dc6f6a2e66..89b6cc7aafa 100644
--- a/keyboards/meson/meson.c
+++ b/keyboards/meson/meson.c
@@ -35,13 +35,6 @@ void matrix_scan_kb(void) {
   matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
   // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/miniaxe/miniaxe.c b/keyboards/miniaxe/miniaxe.c
index 965ada9a188..ec2b69b8502 100644
--- a/keyboards/miniaxe/miniaxe.c
+++ b/keyboards/miniaxe/miniaxe.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/miuni32/miuni32.c b/keyboards/miuni32/miuni32.c
index 1c1983a5641..05393e13da0 100644
--- a/keyboards/miuni32/miuni32.c
+++ b/keyboards/miuni32/miuni32.c
@@ -14,13 +14,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/moon/moon.c b/keyboards/moon/moon.c
index c218bf5ef15..d9236c29a04 100644
--- a/keyboards/moon/moon.c
+++ b/keyboards/moon/moon.c
@@ -41,13 +41,6 @@ void matrix_scan_kb(void) {
   matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
 */
 
 void led_set_kb(uint8_t usb_led) {
diff --git a/keyboards/mt980/keymaps/walker/keymap.c b/keyboards/mt980/keymaps/walker/keymap.c
index 83a3fb8167d..56ec7428af4 100644
--- a/keyboards/mt980/keymaps/walker/keymap.c
+++ b/keyboards/mt980/keymaps/walker/keymap.c
@@ -89,7 +89,7 @@ qk_tap_dance_action_t tap_dance_actions[] = {
   [ALT_L1] = ACTION_TAP_DANCE_FN_ADVANCED(NULL,alt_finished, alt_reset)
 };
 
-void led_set_keymap(uint8_t usb_led) {
+void led_set_user(uint8_t usb_led) {
   if (usb_led & (1<<USB_LED_NUM_LOCK)) {
     numlock_on = true;
   }
@@ -98,7 +98,7 @@ void led_set_keymap(uint8_t usb_led) {
   }
 }
 
-bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
   switch (keycode) {
     case KC_TRNS:
diff --git a/keyboards/mt980/mt980.c b/keyboards/mt980/mt980.c
index 5461a3b21ff..3d6b4a8eed8 100644
--- a/keyboards/mt980/mt980.c
+++ b/keyboards/mt980/mt980.c
@@ -1,31 +1,6 @@
 #include "mt980.h"
 
-__attribute__ ((weak))
-void matrix_init_keymap(void) {}
-
-__attribute__ ((weak))
-void matrix_scan_keymap(void) {}
-
-__attribute__ ((weak))
-bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-__attribute__ ((weak))
-uint32_t layer_state_set_keymap (uint32_t state) {
-  return state;
-}
-__attribute__ ((weak))
-void led_set_keymap(uint8_t usb_led) {}
-
-void matrix_init_user(void) {
-  matrix_init_keymap();
-}
-
-void matrix_scan_user(void) {
-  matrix_scan_keymap();
-}
-
-void keyboard_pre_init_user(void) {
+void keyboard_pre_init_kb(void) {
   /* Set NUMLOCK indicator pin as output */
   setPinOutput(C6);
   /* Set CAPSLOCK indicator pin as output */
@@ -34,11 +9,7 @@ void keyboard_pre_init_user(void) {
   setPinOutput(B5);
 }
 
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return process_record_keymap(keycode, record);
-}
-
-void led_set_user(uint8_t usb_led) {
+void led_set_kb(uint8_t usb_led) {
 
   if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) {
     writePinLow(C6);
@@ -61,5 +32,5 @@ void led_set_user(uint8_t usb_led) {
     writePinHigh(B5);
   }
 
-  led_set_keymap(usb_led);
+  led_set_user(usb_led);
 }
diff --git a/keyboards/mxss/mxss.c b/keyboards/mxss/mxss.c
index 48ea4664194..9b39c5d8573 100644
--- a/keyboards/mxss/mxss.c
+++ b/keyboards/mxss/mxss.c
@@ -49,7 +49,7 @@ void matrix_scan_kb(void) {
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
     // Handle custom keycodes for front LED operation
     process_record_fled(keycode, record);
-	return process_record_user(keycode, record);
+    return true;
 }
 
 bool led_update_kb(led_t led_state) {
diff --git a/keyboards/namecard2x4/namecard2x4.c b/keyboards/namecard2x4/namecard2x4.c
index 349923daf86..85f64aefc34 100644
--- a/keyboards/namecard2x4/namecard2x4.c
+++ b/keyboards/namecard2x4/namecard2x4.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/nek_type_a/nek_type_a.c b/keyboards/nek_type_a/nek_type_a.c
index ec76a209b1a..8e108552d83 100644
--- a/keyboards/nek_type_a/nek_type_a.c
+++ b/keyboards/nek_type_a/nek_type_a.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/nightmare/nightmare.c b/keyboards/nightmare/nightmare.c
index ee0f5fc2e1c..5d40700b077 100644
--- a/keyboards/nightmare/nightmare.c
+++ b/keyboards/nightmare/nightmare.c
@@ -35,13 +35,6 @@ void matrix_scan_kb(void) {
   matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
   // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/noxary/220/220.c b/keyboards/noxary/220/220.c
index e671e15a43a..086f59bd5ec 100644
--- a/keyboards/noxary/220/220.c
+++ b/keyboards/noxary/220/220.c
@@ -36,13 +36,6 @@ void matrix_scan_kb(void) {
   matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
   // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
@@ -59,4 +52,4 @@ void led_set_kb(uint8_t usb_led) {
     writePinHigh(C6);
   }
 	led_set_user(usb_led);
-}
\ No newline at end of file
+}
diff --git a/keyboards/noxary/260/260.c b/keyboards/noxary/260/260.c
index 9f577a2aee6..af3dbb69ac1 100644
--- a/keyboards/noxary/260/260.c
+++ b/keyboards/noxary/260/260.c
@@ -35,13 +35,6 @@ void matrix_scan_kb(void) {
   matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
   // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
@@ -58,4 +51,4 @@ void led_set_kb(uint8_t usb_led) {
   }
 
 	led_set_user(usb_led);
-}
\ No newline at end of file
+}
diff --git a/keyboards/noxary/x268/x268.c b/keyboards/noxary/x268/x268.c
index 3921270acc6..ff407954872 100644
--- a/keyboards/noxary/x268/x268.c
+++ b/keyboards/noxary/x268/x268.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/omnikeyish/omnikeyish.c b/keyboards/omnikeyish/omnikeyish.c
index d7b68d41aba..792f6568bf2 100644
--- a/keyboards/omnikeyish/omnikeyish.c
+++ b/keyboards/omnikeyish/omnikeyish.c
@@ -1,6 +1,6 @@
 #include "omnikeyish.h"
 
-void keyboard_pre_init_user(void) {
+void keyboard_pre_init_kb(void) {
   /* Configure LED driving pins as output pins */
   setPinOutput(NUMLOCKLEDPIN);
   setPinOutput(CAPSLOCKLEDPIN);
@@ -9,7 +9,7 @@ void keyboard_pre_init_user(void) {
   dynamic_macro_init();
 }
 
-void keyboard_post_init_user(void) {
+void keyboard_post_init_kb(void) {
   /* Customise these values to desired behaviour */
   //debug_enable = true;
   //debug_matrix=true;
@@ -26,7 +26,7 @@ void keyboard_post_init_user(void) {
   unregister_code(KC_NUMLOCK);
 }
 
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
   if (!process_record_dynamic_macro(keycode, record)) {
     return false;
   }
@@ -34,7 +34,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   return true;
 }
 
-void led_set_user(uint8_t usb_led) {
+void led_set_kb(uint8_t usb_led) {
   if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) {
     writePinHigh(NUMLOCKLEDPIN);
   } else {
@@ -52,4 +52,5 @@ void led_set_user(uint8_t usb_led) {
   } else {
     writePinLow(SCROLLLOCKLEDPIN);
   }
-}
\ No newline at end of file
+  led_set_user();
+}
diff --git a/keyboards/otaku_split/rev0/rev0.c b/keyboards/otaku_split/rev0/rev0.c
index 75c24b584f5..0eb8eff045c 100644
--- a/keyboards/otaku_split/rev0/rev0.c
+++ b/keyboards/otaku_split/rev0/rev0.c
@@ -35,13 +35,6 @@ void matrix_scan_kb(void) {
   matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
   // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/otaku_split/rev1/rev1.c b/keyboards/otaku_split/rev1/rev1.c
index 88b42eb95d3..8190319ff55 100644
--- a/keyboards/otaku_split/rev1/rev1.c
+++ b/keyboards/otaku_split/rev1/rev1.c
@@ -35,13 +35,6 @@ void matrix_scan_kb(void) {
   matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
   // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/pdxkbc/pdxkbc.c b/keyboards/pdxkbc/pdxkbc.c
index 26c2d2fe4fd..32ac0fc9874 100644
--- a/keyboards/pdxkbc/pdxkbc.c
+++ b/keyboards/pdxkbc/pdxkbc.c
@@ -35,13 +35,6 @@ void matrix_scan_kb(void) {
   matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
   // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/peiorisboards/ixora/ixora.c b/keyboards/peiorisboards/ixora/ixora.c
index 7996db629f2..075b7dbc427 100644
--- a/keyboards/peiorisboards/ixora/ixora.c
+++ b/keyboards/peiorisboards/ixora/ixora.c
@@ -18,11 +18,6 @@ void matrix_scan_kb(void) {
     matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-
-    return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
     if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
         writePinHigh(A10);
diff --git a/keyboards/percent/booster/booster.c b/keyboards/percent/booster/booster.c
index 3a298f58fff..d8847b5ddc5 100644
--- a/keyboards/percent/booster/booster.c
+++ b/keyboards/percent/booster/booster.c
@@ -35,13 +35,6 @@ void matrix_scan_kb(void) {
   matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
   // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/phantom/phantom.c b/keyboards/phantom/phantom.c
index 2bf1631b9c3..e8e49285562 100644
--- a/keyboards/phantom/phantom.c
+++ b/keyboards/phantom/phantom.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
     matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-    // put your per-action keyboard code here
-    // runs for every action, just before processing by the firmware
-
-    return process_record_user(keycode, record);
-}
-
 void led_init_ports(void) {
     DDRB |= (1<<6) | (1<<7); // OUT
 }
diff --git a/keyboards/pinky/pinky.c b/keyboards/pinky/pinky.c
index 9b98ea85d3f..32b9f843385 100644
--- a/keyboards/pinky/pinky.c
+++ b/keyboards/pinky/pinky.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/plaid/plaid.c b/keyboards/plaid/plaid.c
index 28f56d7f93c..41b7ff1ccf5 100644
--- a/keyboards/plaid/plaid.c
+++ b/keyboards/plaid/plaid.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/planck/ez/ez.c b/keyboards/planck/ez/ez.c
index 8369ce50c10..bffe55c0358 100644
--- a/keyboards/planck/ez/ez.c
+++ b/keyboards/planck/ez/ez.c
@@ -320,7 +320,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
             return false;
 #endif
     }
-    return process_record_user(keycode, record);
+    return true;
 }
 #endif
 
diff --git a/keyboards/planck/light/light.c b/keyboards/planck/light/light.c
index 896ec44587c..00706aa2cc1 100644
--- a/keyboards/planck/light/light.c
+++ b/keyboards/planck/light/light.c
@@ -105,11 +105,6 @@ void matrix_init_kb(void) {
     matrix_init_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record)
-{
-    return process_record_user(keycode, record);
-}
-
 uint8_t rgb_matrix_map_row_column_to_led_kb(uint8_t row, uint8_t column, uint8_t *led_i) {
     // Spacebar has 2 leds 41 & 42, so add 42 to the array here, and 41 will be added
     // by the default lookup code that runs after this
diff --git a/keyboards/primekb/prime_o/prime_o.c b/keyboards/primekb/prime_o/prime_o.c
index d603cc6c9e4..60a9578504d 100644
--- a/keyboards/primekb/prime_o/prime_o.c
+++ b/keyboards/primekb/prime_o/prime_o.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/primekb/prime_r/prime_r.c b/keyboards/primekb/prime_r/prime_r.c
index 845769dae36..083b6021580 100644
--- a/keyboards/primekb/prime_r/prime_r.c
+++ b/keyboards/primekb/prime_r/prime_r.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/quantrik/kyuu/kyuu.c b/keyboards/quantrik/kyuu/kyuu.c
index e9a72a5749a..025ee8dbcfe 100644
--- a/keyboards/quantrik/kyuu/kyuu.c
+++ b/keyboards/quantrik/kyuu/kyuu.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/rabbit/rabbit68/rabbit68.c b/keyboards/rabbit/rabbit68/rabbit68.c
index a9e4c6533d1..652d8417e74 100644
--- a/keyboards/rabbit/rabbit68/rabbit68.c
+++ b/keyboards/rabbit/rabbit68/rabbit68.c
@@ -14,38 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "rabbit68.h"
-
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-
-/*
-
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-
-  matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-  matrix_scan_user();
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
-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/reviung34/reviung34.c b/keyboards/reviung34/reviung34.c
index 9a10f96f56c..00862d73e9b 100755
--- a/keyboards/reviung34/reviung34.c
+++ b/keyboards/reviung34/reviung34.c
@@ -14,38 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "reviung34.h"
-
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-
-/*
-
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-
-  matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-  matrix_scan_user();
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
-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/reviung39/reviung39.c b/keyboards/reviung39/reviung39.c
index 1ea816e5ae2..0948106e9d8 100644
--- a/keyboards/reviung39/reviung39.c
+++ b/keyboards/reviung39/reviung39.c
@@ -14,38 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "reviung39.h"
-
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-
-/*
-
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-
-  matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-  matrix_scan_user();
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
-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/sck/m0116b/m0116b.c b/keyboards/sck/m0116b/m0116b.c
index 2e0a4ae2c75..368bc3eafd4 100644
--- a/keyboards/sck/m0116b/m0116b.c
+++ b/keyboards/sck/m0116b/m0116b.c
@@ -14,38 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "m0116b.h"
-
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-
-/*
-
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-
-  matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-  matrix_scan_user();
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
-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/sck/osa/osa.c b/keyboards/sck/osa/osa.c
index 138a28893b8..f55ca4de2bf 100644
--- a/keyboards/sck/osa/osa.c
+++ b/keyboards/sck/osa/osa.c
@@ -15,35 +15,6 @@
  */
 #include "osa.h"
 
-
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-
-/*
-
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-
-  matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-  matrix_scan_user();
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-*/
-
 void matrix_init_board(void){
     setPinOutput(C7);
     setPinOutput(C6);
diff --git a/keyboards/scythe/scythe.c b/keyboards/scythe/scythe.c
index e8060ac278e..c1f95e2f708 100644
--- a/keyboards/scythe/scythe.c
+++ b/keyboards/scythe/scythe.c
@@ -14,30 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "scythe.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();
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
-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/sentraq/number_pad/number_pad.c b/keyboards/sentraq/number_pad/number_pad.c
index 8c39efac58c..f3236487149 100644
--- a/keyboards/sentraq/number_pad/number_pad.c
+++ b/keyboards/sentraq/number_pad/number_pad.c
@@ -14,30 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "number_pad.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();
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
-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/sentraq/s60_x/default/default.c b/keyboards/sentraq/s60_x/default/default.c
index 253f5495c20..2a5bcfdd6de 100644
--- a/keyboards/sentraq/s60_x/default/default.c
+++ b/keyboards/sentraq/s60_x/default/default.c
@@ -1,28 +1 @@
 #include "default.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();
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
-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/shiro/shiro.c b/keyboards/shiro/shiro.c
index b30329d3395..3f92c54a0b6 100644
--- a/keyboards/shiro/shiro.c
+++ b/keyboards/shiro/shiro.c
@@ -14,38 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "shiro.h"
-
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-
-/*
-
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-
-  matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-  matrix_scan_user();
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
-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/snampad/snampad.c b/keyboards/snampad/snampad.c
index c7a94245c40..58413d0af59 100644
--- a/keyboards/snampad/snampad.c
+++ b/keyboards/snampad/snampad.c
@@ -14,30 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "snampad.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();
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
-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/spacetime/rev1/rev1.c b/keyboards/spacetime/rev1/rev1.c
index 6fde622c2ff..b9942a35112 100644
--- a/keyboards/spacetime/rev1/rev1.c
+++ b/keyboards/spacetime/rev1/rev1.c
@@ -14,27 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "rev1.h"
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  return process_record_user(keycode, record);
-}
-
-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/spacetime/rev2/rev2.c b/keyboards/spacetime/rev2/rev2.c
index 6b62c071e47..a98c90d0245 100644
--- a/keyboards/spacetime/rev2/rev2.c
+++ b/keyboards/spacetime/rev2/rev2.c
@@ -17,28 +17,8 @@
 
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
 #ifdef SSD1306OLED
-  return process_record_gfx(keycode,record) && process_record_user(keycode, record);
+  return process_record_gfx(keycode,record);
 #else
-  return process_record_user(keycode, record);
+  return true;
 #endif
 }
-
-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/speedo/speedo.c b/keyboards/speedo/speedo.c
index 74c97c841f2..96b99e5ca98 100644
--- a/keyboards/speedo/speedo.c
+++ b/keyboards/speedo/speedo.c
@@ -14,30 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "speedo.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();
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
-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/standaside/standaside.c b/keyboards/standaside/standaside.c
index 904e92d335c..718acf1e69f 100644
--- a/keyboards/standaside/standaside.c
+++ b/keyboards/standaside/standaside.c
@@ -1,14 +1,2 @@
 
 #include "standaside.h"
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
-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/suihankey/alpha/alpha.c b/keyboards/suihankey/alpha/alpha.c
index 3d2d1de7790..1c2936e1574 100644
--- a/keyboards/suihankey/alpha/alpha.c
+++ b/keyboards/suihankey/alpha/alpha.c
@@ -14,38 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "alpha.h"
-
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-
-/*
-
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-
-  matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-  matrix_scan_user();
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
-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/suihankey/rev1/rev1.c b/keyboards/suihankey/rev1/rev1.c
index f97e6caed42..40ff30e6202 100644
--- a/keyboards/suihankey/rev1/rev1.c
+++ b/keyboards/suihankey/rev1/rev1.c
@@ -14,38 +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();
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
-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/suihankey/split/alpha/alpha.c b/keyboards/suihankey/split/alpha/alpha.c
index 3d2d1de7790..1c2936e1574 100644
--- a/keyboards/suihankey/split/alpha/alpha.c
+++ b/keyboards/suihankey/split/alpha/alpha.c
@@ -14,38 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "alpha.h"
-
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-
-/*
-
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-
-  matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-  matrix_scan_user();
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
-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/suihankey/split/rev1/rev1.c b/keyboards/suihankey/split/rev1/rev1.c
index f97e6caed42..40ff30e6202 100644
--- a/keyboards/suihankey/split/rev1/rev1.c
+++ b/keyboards/suihankey/split/rev1/rev1.c
@@ -14,38 +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();
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
-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/tg4x/tg4x.c b/keyboards/tg4x/tg4x.c
index 9452d4d956e..fa7a970d5eb 100644
--- a/keyboards/tg4x/tg4x.c
+++ b/keyboards/tg4x/tg4x.c
@@ -14,38 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "tg4x.h"
-
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-
-/*
-
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-
-  matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-  matrix_scan_user();
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
-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/the_ruler/the_ruler.c b/keyboards/the_ruler/the_ruler.c
index 9686379eb8b..29a8248924d 100644
--- a/keyboards/the_ruler/the_ruler.c
+++ b/keyboards/the_ruler/the_ruler.c
@@ -1,22 +1 @@
 #include "the_ruler.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();
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
\ No newline at end of file
diff --git a/keyboards/thevankeyboards/bananasplit/bananasplit.c b/keyboards/thevankeyboards/bananasplit/bananasplit.c
index 1aa8fb1745b..5e28a5a7544 100644
--- a/keyboards/thevankeyboards/bananasplit/bananasplit.c
+++ b/keyboards/thevankeyboards/bananasplit/bananasplit.c
@@ -1,28 +1,2 @@
 #include "bananasplit.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();
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
-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/thevankeyboards/roadkit/roadkit.c b/keyboards/thevankeyboards/roadkit/roadkit.c
index 26e0c51ec5e..0f3d7f69169 100644
--- a/keyboards/thevankeyboards/roadkit/roadkit.c
+++ b/keyboards/thevankeyboards/roadkit/roadkit.c
@@ -1,28 +1 @@
 #include "roadkit.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();
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
-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/tkc1800/tkc1800.c b/keyboards/tkc1800/tkc1800.c
index bc6676846d2..d4f579dc16d 100644
--- a/keyboards/tkc1800/tkc1800.c
+++ b/keyboards/tkc1800/tkc1800.c
@@ -23,20 +23,6 @@ void matrix_init_kb(void) {
     matrix_init_user();
 }
 
-void matrix_scan_kb(void) {
-    // put your looping keyboard code here
-    // runs every cycle (a lot)
-
-    matrix_scan_user();
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-    // put your per-action keyboard code here
-    // runs for every action, just before processing by the firmware
-
-    return process_record_user(keycode, record);
-}
-
 void led_init_ports(void) {
 	DDRD |= (1<<2) | (1<<3) | (1<<4); // OUT
 	DDRB |= (1<<7); // OUT
@@ -44,8 +30,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 {
@@ -66,4 +51,5 @@ void led_set_kb(uint8_t usb_led) {
         // Turn scrolllock off
 		PORTD &= ~(1<<4);
     }
-}
\ No newline at end of file
+    led_set_user(usb_led);
+}
diff --git a/keyboards/tmo50/tmo50.c b/keyboards/tmo50/tmo50.c
index 4f6288133da..f477d067f2f 100644
--- a/keyboards/tmo50/tmo50.c
+++ b/keyboards/tmo50/tmo50.c
@@ -31,27 +31,7 @@ void matrix_init_kb(void) {
 	matrix_init_user();
 }
 
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
-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);
-}
-
-uint32_t layer_state_set_user(uint32_t state)
+uint32_t layer_state_set_kb(uint32_t state)
 {
   // if on layer 0, turn on B0 LED, otherwise off.
     if (biton32(state) == 0) {
@@ -80,5 +60,5 @@ uint32_t layer_state_set_user(uint32_t state)
         PORTB |= (1<<PB3);
     }
 
-    return state;
+    return layer_state_set_user(state);
 }
diff --git a/keyboards/treadstone32/treadstone32.c b/keyboards/treadstone32/treadstone32.c
index 9d27f86ffed..c7a9be8d7ac 100644
--- a/keyboards/treadstone32/treadstone32.c
+++ b/keyboards/treadstone32/treadstone32.c
@@ -14,30 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "treadstone32.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();
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
-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/treasure/type9/type9.c b/keyboards/treasure/type9/type9.c
index 58a9c8f52de..466f294672e 100644
--- a/keyboards/treasure/type9/type9.c
+++ b/keyboards/treasure/type9/type9.c
@@ -14,30 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "type9.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();
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
-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/uzu42/uzu42.c b/keyboards/uzu42/uzu42.c
index 0eb8c5f3aa3..df71734f7b8 100644
--- a/keyboards/uzu42/uzu42.c
+++ b/keyboards/uzu42/uzu42.c
@@ -1,5 +1 @@
 #include "uzu42.h"
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  return process_record_user(keycode, record);
-}
diff --git a/keyboards/v60_type_r/v60_type_r.c b/keyboards/v60_type_r/v60_type_r.c
index 871d9915d30..7af6b33fa6c 100644
--- a/keyboards/v60_type_r/v60_type_r.c
+++ b/keyboards/v60_type_r/v60_type_r.c
@@ -95,7 +95,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
 			return false;
 	}
 
-	return process_record_user(keycode, record);
+	return true;
 }
 
 
diff --git a/keyboards/vinta/vinta.c b/keyboards/vinta/vinta.c
index b5d40a16092..edd45511b49 100644
--- a/keyboards/vinta/vinta.c
+++ b/keyboards/vinta/vinta.c
@@ -1,18 +1 @@
 #include "vinta.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) {
-
-    matrix_scan_user();
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-
-    return process_record_user(keycode, record);
-}
\ No newline at end of file
diff --git a/keyboards/vision_division/vision_division.c b/keyboards/vision_division/vision_division.c
index a0e0f449c44..1656d3e9ec5 100644
--- a/keyboards/vision_division/vision_division.c
+++ b/keyboards/vision_division/vision_division.c
@@ -1,26 +1,5 @@
 #include "vision_division.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();
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/westfoxtrot/cyclops/cyclops.c b/keyboards/westfoxtrot/cyclops/cyclops.c
index aea51e6b349..f28d626e443 100644
--- a/keyboards/westfoxtrot/cyclops/cyclops.c
+++ b/keyboards/westfoxtrot/cyclops/cyclops.c
@@ -14,30 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "cyclops.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();
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
-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);
-}
\ No newline at end of file
diff --git a/keyboards/wilba_tech/wt_main.c b/keyboards/wilba_tech/wt_main.c
index 32721b654e8..1f9e41a53be 100644
--- a/keyboards/wilba_tech/wt_main.c
+++ b/keyboards/wilba_tech/wt_main.c
@@ -89,7 +89,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record)
     process_record_backlight(keycode, record);
 #endif // RGB_BACKLIGHT_ENABLED || MONO_BACKLIGHT_ENABLED
 
-    return process_record_user(keycode, record);
+    return true;
 }
 
 void led_set_kb(uint8_t usb_led)
diff --git a/keyboards/xbows/woody/woody.c b/keyboards/xbows/woody/woody.c
index 9821f5f6550..1d66c4b1563 100644
--- a/keyboards/xbows/woody/woody.c
+++ b/keyboards/xbows/woody/woody.c
@@ -97,15 +97,6 @@ led_config_t g_led_config = { {
 } };
 #endif
 
-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) {
-    return process_record_user(keycode, record);
-}
 void suspend_power_down_kb(void)
 {
     rgb_matrix_set_suspend_state(true);
diff --git a/keyboards/xd75/xd75.c b/keyboards/xd75/xd75.c
index dd0ec8a4330..66d4aad4616 100644
--- a/keyboards/xd75/xd75.c
+++ b/keyboards/xd75/xd75.c
@@ -32,26 +32,6 @@ void matrix_init_kb(void) {
 	matrix_init_user();
 }
 
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
-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 capslock_led_init(void) {
 	DDRB |= (1 << XD75_CAPSLOCK_LED);
 	capslock_led_off();
diff --git a/keyboards/xd87/xd87.c b/keyboards/xd87/xd87.c
index e14480b054a..94e64e6c609 100644
--- a/keyboards/xd87/xd87.c
+++ b/keyboards/xd87/xd87.c
@@ -22,20 +22,6 @@ void matrix_init_kb(void) {
   matrix_init_user();
 }
 
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-  matrix_scan_user();
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-  
-  return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
   // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/yd68/yd68.c b/keyboards/yd68/yd68.c
index f34661dd37c..55148315c47 100644
--- a/keyboards/yd68/yd68.c
+++ b/keyboards/yd68/yd68.c
@@ -42,20 +42,6 @@ void matrix_init_kb(void) {
 	matrix_init_user();
 }
 
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 	
diff --git a/keyboards/yosino58/yosino58.c b/keyboards/yosino58/yosino58.c
index ff3ec10e5a4..a8be2408281 100644
--- a/keyboards/yosino58/yosino58.c
+++ b/keyboards/yosino58/yosino58.c
@@ -3,8 +3,8 @@
 
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
 #ifdef SSD1306OLED
-  return process_record_gfx(keycode,record) && process_record_user(keycode, record);
+  return process_record_gfx(keycode,record);
 #else
-  return process_record_user(keycode, record);
+  return true;
 #endif
 }