479 files changed, 66 insertions, 8439 deletions
diff --git a/keyboards/1upkeyboards/1up60hse/1up60hse.c b/keyboards/1upkeyboards/1up60hse/1up60hse.c
index c04018d62..fa62f52e6 100644
--- a/keyboards/1upkeyboards/1up60hse/1up60hse.c
+++ b/keyboards/1upkeyboards/1up60hse/1up60hse.c
@@ -14,30 +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();
-}
-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/1upkeyboards/1up60rgb/keymaps/default/keymap.c b/keyboards/1upkeyboards/1up60rgb/keymaps/default/keymap.c
index 435a63181..15b7c9faa 100644
--- a/keyboards/1upkeyboards/1up60rgb/keymaps/default/keymap.c
+++ b/keyboards/1upkeyboards/1up60rgb/keymaps/default/keymap.c
@@ -18,46 +18,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-        return true;
-}
 void led_set_user(uint8_t usb_led) {
-        if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-        } else {
-        }
        if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-                DDRB |= (1 << 2); PORTB &= ~(1 << 2);
+                setPinOutput(B2);
-        } else {
+                writePinLow(B2);
-                DDRB &= ~(1 << 2); PORTB &= ~(1 << 2);
-        }
-        if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-        } else {
-        }
-        if (usb_led & (1 << USB_LED_COMPOSE)) {
        } else {
+                setPinInput(B2);
+                writePinLow(B2);
        }
-        if (usb_led & (1 << USB_LED_KANA)) {
-        } else {
-        }
 }
diff --git a/keyboards/1upkeyboards/1up60rgb/keymaps/iso/keymap.c b/keyboards/1upkeyboards/1up60rgb/keymaps/iso/keymap.c
index 39edd00ff..b67de0b0c 100644
--- a/keyboards/1upkeyboards/1up60rgb/keymaps/iso/keymap.c
+++ b/keyboards/1upkeyboards/1up60rgb/keymaps/iso/keymap.c
@@ -18,46 +18,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-        return true;
-}
 void led_set_user(uint8_t usb_led) {
-        if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-        } else {
-        }
        if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-                DDRB |= (1 << 2); PORTB &= ~(1 << 2);
+                setPinOutput(B2);
-        } else {
+                writePinLow(B2);
-                DDRB &= ~(1 << 2); PORTB &= ~(1 << 2);
-        }
-        if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-        } else {
-        }
-        if (usb_led & (1 << USB_LED_COMPOSE)) {
        } else {
+                setPinInput(B2);
+                writePinLow(B2);
        }
-        if (usb_led & (1 << USB_LED_KANA)) {
-        } else {
-        }
 }
diff --git a/keyboards/1upkeyboards/1up60rgb/keymaps/tsangan/keymap.c b/keyboards/1upkeyboards/1up60rgb/keymaps/tsangan/keymap.c
index 0b0b51d59..bd7e96aad 100644
--- a/keyboards/1upkeyboards/1up60rgb/keymaps/tsangan/keymap.c
+++ b/keyboards/1upkeyboards/1up60rgb/keymaps/tsangan/keymap.c
@@ -18,46 +18,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-        return true;
-}
 void led_set_user(uint8_t usb_led) {
-        if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-        } else {
-        }
        if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-                DDRB |= (1 << 2); PORTB &= ~(1 << 2);
+                setPinOutput(B2);
-        } else {
+                writePinLow(B2);
-                DDRB &= ~(1 << 2); PORTB &= ~(1 << 2);
-        }
-        if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-        } else {
-        }
-        if (usb_led & (1 << USB_LED_COMPOSE)) {
        } else {
+                setPinInput(B2);
+                writePinLow(B2);
        }
-        if (usb_led & (1 << USB_LED_KANA)) {
-        } else {
-        }
 }
diff --git a/keyboards/1upkeyboards/super16/keymaps/default/keymap.c b/keyboards/1upkeyboards/super16/keymaps/default/keymap.c
index 47889abae..4414a658c 100644
--- a/keyboards/1upkeyboards/super16/keymaps/default/keymap.c
+++ b/keyboards/1upkeyboards/super16/keymaps/default/keymap.c
@@ -23,19 +23,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    RGB_MOD,    KC_1,    KC_U,    KC_P
  ),
 };
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/40percentclub/25/25.c b/keyboards/40percentclub/25/25.c
index de1b038aa..8aff75653 100644
--- a/keyboards/40percentclub/25/25.c
+++ b/keyboards/40percentclub/25/25.c
@@ -15,33 +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();
-}
-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);
-}
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
 const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/40percentclub/25/keymaps/default/keymap.c b/keyboards/40percentclub/25/keymaps/default/keymap.c
index ccb54c82a..bea66ea5a 100644
--- a/keyboards/40percentclub/25/keymaps/default/keymap.c
+++ b/keyboards/40percentclub/25/keymaps/default/keymap.c
@@ -70,18 +70,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END   \
  ),
 };
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/40percentclub/25/keymaps/macro/keymap.c b/keyboards/40percentclub/25/keymaps/macro/keymap.c
index 80d227710..a1711a380 100644
--- a/keyboards/40percentclub/25/keymaps/macro/keymap.c
+++ b/keyboards/40percentclub/25/keymaps/macro/keymap.c
@@ -24,19 +24,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    KC_LCTL,  KC_LGUI, KC_LALT, KC_SPC,  KC_SPC \
  ),
 };
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/40percentclub/4pack/4pack.c b/keyboards/40percentclub/4pack/4pack.c
index 98f22a65a..4ab3575ca 100644
--- a/keyboards/40percentclub/4pack/4pack.c
+++ b/keyboards/40percentclub/4pack/4pack.c
@@ -29,26 +29,3 @@ void matrix_init_kb(void) {
  // 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();
-}
-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/40percentclub/4pack/keymaps/default/keymap.c b/keyboards/40percentclub/4pack/keymaps/default/keymap.c
index 19264651b..a812f4816 100644
--- a/keyboards/40percentclub/4pack/keymaps/default/keymap.c
+++ b/keyboards/40percentclub/4pack/keymaps/default/keymap.c
@@ -21,6 +21,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_A, KC_S, KC_D, KC_F
    ),
 };
-void matrix_init_user(void) { }
diff --git a/keyboards/40percentclub/4x4/4x4.c b/keyboards/40percentclub/4x4/4x4.c
index 963b6d00d..8510b358f 100644
--- a/keyboards/40percentclub/4x4/4x4.c
+++ b/keyboards/40percentclub/4x4/4x4.c
@@ -1,29 +1 @@
 #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();
-}
-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/40percentclub/4x4/keymaps/default/keymap.c b/keyboards/40percentclub/4x4/keymaps/default/keymap.c
index 1f52b2066..079f6caee 100644
--- a/keyboards/40percentclub/4x4/keymaps/default/keymap.c
+++ b/keyboards/40percentclub/4x4/keymaps/default/keymap.c
@@ -86,19 +86,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  ),
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/40percentclub/5x5/5x5.c b/keyboards/40percentclub/5x5/5x5.c
index 20e524609..b31fcd781 100644
--- a/keyboards/40percentclub/5x5/5x5.c
+++ b/keyboards/40percentclub/5x5/5x5.c
@@ -1,29 +1 @@
 #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();
-}
-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/40percentclub/5x5/keymaps/default/keymap.c b/keyboards/40percentclub/5x5/keymaps/default/keymap.c
index 56ddbb23f..5dfd72f7e 100644
--- a/keyboards/40percentclub/5x5/keymaps/default/keymap.c
+++ b/keyboards/40percentclub/5x5/keymaps/default/keymap.c
@@ -98,20 +98,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  ),
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/40percentclub/6lit/6lit.c b/keyboards/40percentclub/6lit/6lit.c
index 59d7e33bd..6c99973d1 100644
--- a/keyboards/40percentclub/6lit/6lit.c
+++ b/keyboards/40percentclub/6lit/6lit.c
@@ -15,33 +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();
-}
-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);
-}
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
 const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/40percentclub/6lit/keymaps/default/keymap.c b/keyboards/40percentclub/6lit/keymaps/default/keymap.c
index 6864c72f7..076d07b5c 100644
--- a/keyboards/40percentclub/6lit/keymaps/default/keymap.c
+++ b/keyboards/40percentclub/6lit/keymaps/default/keymap.c
@@ -21,19 +21,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    KC_F19,   KC_F20,   KC_F21,   KC_F22,   KC_F23,   KC_F24  \
  ),
 };
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/40percentclub/6lit/keymaps/macro/keymap.c b/keyboards/40percentclub/6lit/keymaps/macro/keymap.c
index 6b10ac133..f97288f51 100644
--- a/keyboards/40percentclub/6lit/keymaps/macro/keymap.c
+++ b/keyboards/40percentclub/6lit/keymaps/macro/keymap.c
@@ -21,19 +21,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    KC_F22,   KC_F23,   KC_F24  \
  ),
 };
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/40percentclub/foobar/foobar.c b/keyboards/40percentclub/foobar/foobar.c
index b0a1518df..fe4e06903 100644
--- a/keyboards/40percentclub/foobar/foobar.c
+++ b/keyboards/40percentclub/foobar/foobar.c
@@ -15,33 +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();
-}
-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);
-}
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
 const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/40percentclub/foobar/keymaps/default/keymap.c b/keyboards/40percentclub/foobar/keymaps/default/keymap.c
index 1be4b38dd..02e705998 100644
--- a/keyboards/40percentclub/foobar/keymaps/default/keymap.c
+++ b/keyboards/40percentclub/foobar/keymaps/default/keymap.c
@@ -73,19 +73,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    _______, _______, _______, _______, _______, RESET,   _______, _______, _______, _______
  ),
 };
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/40percentclub/foobar/keymaps/macro/keymap.c b/keyboards/40percentclub/foobar/keymaps/macro/keymap.c
index 1e7ec905f..a335b0a11 100644
--- a/keyboards/40percentclub/foobar/keymaps/macro/keymap.c
+++ b/keyboards/40percentclub/foobar/keymaps/macro/keymap.c
@@ -22,19 +22,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    KC_F21,   KC_F22,   KC_F23,   KC_F14,   KC_INT5  \
  ),
 };
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/40percentclub/half_n_half/half_n_half.c b/keyboards/40percentclub/half_n_half/half_n_half.c
index c4e6a4ce0..e49e54579 100644
--- a/keyboards/40percentclub/half_n_half/half_n_half.c
+++ b/keyboards/40percentclub/half_n_half/half_n_half.c
@@ -14,30 +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();
-}
-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/40percentclub/half_n_half/keymaps/default/keymap.c b/keyboards/40percentclub/half_n_half/keymaps/default/keymap.c
index 2ab9a8c98..323b903f0 100644
--- a/keyboards/40percentclub/half_n_half/keymaps/default/keymap.c
+++ b/keyboards/40percentclub/half_n_half/keymaps/default/keymap.c
@@ -51,15 +51,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 }
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/40percentclub/i75/i75.c b/keyboards/40percentclub/i75/i75.c
index 7efe3b454..28684e714 100644
--- a/keyboards/40percentclub/i75/i75.c
+++ b/keyboards/40percentclub/i75/i75.c
@@ -14,30 +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();
-}
-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/40percentclub/i75/keymaps/default/keymap.c b/keyboards/40percentclub/i75/keymaps/default/keymap.c
index 3054f8ebe..e4c48bca4 100644
--- a/keyboards/40percentclub/i75/keymaps/default/keymap.c
+++ b/keyboards/40percentclub/i75/keymaps/default/keymap.c
@@ -52,15 +52,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 }
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/40percentclub/mf68/mf68.c b/keyboards/40percentclub/mf68/mf68.c
index 1da522e7e..4abee8e0c 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 63e23545e..8761e8add 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/keymaps/macro/keymap.c b/keyboards/40percentclub/nori/keymaps/macro/keymap.c
index 14dc0b678..8c5fa9410 100644
--- a/keyboards/40percentclub/nori/keymaps/macro/keymap.c
+++ b/keyboards/40percentclub/nori/keymaps/macro/keymap.c
@@ -23,19 +23,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    KC_F21,   KC_F22,   KC_F23,   KC_F24   \
  ),
 };
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/40percentclub/nori/nori.c b/keyboards/40percentclub/nori/nori.c
index 9d27df7a5..f60cf98d8 100644
--- a/keyboards/40percentclub/nori/nori.c
+++ b/keyboards/40percentclub/nori/nori.c
@@ -14,30 +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();
-}
-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/40percentclub/tomato/keymaps/default/keymap.c b/keyboards/40percentclub/tomato/keymaps/default/keymap.c
index 01a868d7e..befdad0e2 100644
--- a/keyboards/40percentclub/tomato/keymaps/default/keymap.c
+++ b/keyboards/40percentclub/tomato/keymaps/default/keymap.c
@@ -97,47 +97,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    , _______,_______,_______,_______,RESET,  _______,_______,_______,_______,_______
    ),
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-        return true;
-}
-void led_set_user(uint8_t usb_led) {
-        if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-        } else {
-        }
-        if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-        } else {
-        }
-        if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-        } else {
-        }
-        if (usb_led & (1 << USB_LED_COMPOSE)) {
-        } else {
-        }
-        if (usb_led & (1 << USB_LED_KANA)) {
-        } else {
-        }
-}
diff --git a/keyboards/40percentclub/ut47/ut47.c b/keyboards/40percentclub/ut47/ut47.c
index f467fd130..9054335e5 100644
--- a/keyboards/40percentclub/ut47/ut47.c
+++ b/keyboards/40percentclub/ut47/ut47.c
@@ -18,20 +18,6 @@
  #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
@@ -42,9 +28,3 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
  }
        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/6ball/6ball.c b/keyboards/6ball/6ball.c
index 5060a5db4..1eddde9ba 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 ed8e91e73..bbbabb81c 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/keymaps/abstractkb/keymap.c b/keyboards/abstract/ellipse/keymaps/abstractkb/keymap.c
index 224de55b3..435042318 100644
--- a/keyboards/abstract/ellipse/keymaps/abstractkb/keymap.c
+++ b/keyboards/abstract/ellipse/keymaps/abstractkb/keymap.c
@@ -27,22 +27,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  )
 };
-/*bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}*/
-/*void matrix_init_user(void) {
-}*/
-/*void matrix_scan_user(void) {
-}*/
-/*void led_set_user(uint8_t usb_led) {
-}*/
 bool encoder_update_user(uint8_t index, bool clockwise) {
        if (index == 0) { /* First encoder */
                if (clockwise) {
diff --git a/keyboards/abstract/ellipse/keymaps/default/keymap.c b/keyboards/abstract/ellipse/keymaps/default/keymap.c
index 4fe1cf7cb..dbcba36f5 100644
--- a/keyboards/abstract/ellipse/keymaps/default/keymap.c
+++ b/keyboards/abstract/ellipse/keymaps/default/keymap.c
@@ -27,22 +27,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  )
 };
-/*bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}*/
-/*void matrix_init_user(void) {
-}*/
-/*void matrix_scan_user(void) {
-}*/
-/*void led_set_user(uint8_t usb_led) {
-}*/
 bool encoder_update_user(uint8_t index, bool clockwise) {
        if (index == 0) { /* First encoder */
                if (clockwise) {
diff --git a/keyboards/abstract/ellipse/rev1/rev1.c b/keyboards/abstract/ellipse/rev1/rev1.c
index ae7aa640e..f2a7e484c 100644
--- a/keyboards/abstract/ellipse/rev1/rev1.c
+++ b/keyboards/abstract/ellipse/rev1/rev1.c
@@ -14,30 +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();
-}
-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/acheron/shark/shark.c b/keyboards/acheron/shark/shark.c
index b15c8a270..ab607edae 100644
--- a/keyboards/acheron/shark/shark.c
+++ b/keyboards/acheron/shark/shark.c
@@ -14,38 +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();
-}
-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/adkb96/rev1/rev1.c b/keyboards/adkb96/rev1/rev1.c
index 872a7e08f..594c53299 100644
--- a/keyboards/adkb96/rev1/rev1.c
+++ b/keyboards/adkb96/rev1/rev1.c
@@ -1,15 +1 @@
 #include "adkb96.h"
-void matrix_init_kb(void) {
-    // // green led on
-    // DDRD |= (1<<5);
-    // PORTD &= ~(1<<5);
-    // // orange led on
-    // DDRB |= (1<<0);
-    // PORTB &= ~(1<<0);
-        matrix_init_user();
-};
diff --git a/keyboards/ai03/lunar/keymaps/default/keymap.c b/keyboards/ai03/lunar/keymaps/default/keymap.c
index 4705d00ec..e05775c2d 100644
--- a/keyboards/ai03/lunar/keymaps/default/keymap.c
+++ b/keyboards/ai03/lunar/keymaps/default/keymap.c
@@ -76,15 +76,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 }
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/ai03/lunar/lunar.c b/keyboards/ai03/lunar/lunar.c
index 37438c71e..9c7bf23a6 100644
--- a/keyboards/ai03/lunar/lunar.c
+++ b/keyboards/ai03/lunar/lunar.c
@@ -14,9 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "lunar.h"
-void led_set_kb(uint8_t usb_led) {
-        // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-        led_set_user(usb_led);
-}
diff --git a/keyboards/ai03/orbit/keymaps/default/keymap.c b/keyboards/ai03/orbit/keymaps/default/keymap.c
index d0c80d928..6d4eef27c 100644
--- a/keyboards/ai03/orbit/keymaps/default/keymap.c
+++ b/keyboards/ai03/orbit/keymaps/default/keymap.c
@@ -72,20 +72,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 }
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
-layer_state_t layer_state_set_user(layer_state_t state) {
-                
-        return state;
-}
diff --git a/keyboards/ai03/orbit/orbit.c b/keyboards/ai03/orbit/orbit.c
index b51ddbc6e..97553e318 100644
--- a/keyboards/ai03/orbit/orbit.c
+++ b/keyboards/ai03/orbit/orbit.c
@@ -172,20 +172,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
        
@@ -222,5 +208,3 @@ uint32_t layer_state_set_kb(uint32_t state) {
        
        return layer_state_set_user(state);
 }
diff --git a/keyboards/ai03/quasar/keymaps/default/keymap.c b/keyboards/ai03/quasar/keymaps/default/keymap.c
index 6de45951a..0d871d925 100644
--- a/keyboards/ai03/quasar/keymaps/default/keymap.c
+++ b/keyboards/ai03/quasar/keymaps/default/keymap.c
@@ -43,19 +43,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        _______,          _______,                                     _______,                                     _______,          _______,    _______, _______, _______  
  )
 };
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/ai03/quasar/quasar.c b/keyboards/ai03/quasar/quasar.c
index ac8b75177..75d77e355 100644
--- a/keyboards/ai03/quasar/quasar.c
+++ b/keyboards/ai03/quasar/quasar.c
@@ -14,38 +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();
-}
-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/ai03/soyuz/keymaps/default/keymap.c b/keyboards/ai03/soyuz/keymaps/default/keymap.c
index 62bb5c228..c145fc3b5 100644
--- a/keyboards/ai03/soyuz/keymaps/default/keymap.c
+++ b/keyboards/ai03/soyuz/keymaps/default/keymap.c
@@ -24,19 +24,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_P0,   KC_P0,   KC_PDOT, KC_PENT  \
  )
 };
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/ai03/soyuz/soyuz.c b/keyboards/ai03/soyuz/soyuz.c
index dc73f196e..e643d14ec 100644
--- a/keyboards/ai03/soyuz/soyuz.c
+++ b/keyboards/ai03/soyuz/soyuz.c
@@ -14,30 +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();
-}
-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/akb/eb46/eb46.c b/keyboards/akb/eb46/eb46.c
index 3417b4329..a2113d0fe 100644
--- a/keyboards/akb/eb46/eb46.c
+++ b/keyboards/akb/eb46/eb46.c
@@ -14,30 +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();
-}
-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/alf/dc60/keymaps/default/keymap.c b/keyboards/alf/dc60/keymaps/default/keymap.c
index acd9753ef..ddc488670 100644
--- a/keyboards/alf/dc60/keymaps/default/keymap.c
+++ b/keyboards/alf/dc60/keymaps/default/keymap.c
@@ -32,19 +32,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                  KC_TRNS, KC_TRNS, KC_TRNS
      ),
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/alf/x2/keymaps/default/keymap.c b/keyboards/alf/x2/keymaps/default/keymap.c
index eb3d7bd46..a119c7074 100644
--- a/keyboards/alf/x2/keymaps/default/keymap.c
+++ b/keyboards/alf/x2/keymaps/default/keymap.c
@@ -19,20 +19,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
 void led_set_user(uint8_t usb_led) {
  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-    DDRB |= (1 << 2); PORTB &= ~(1 << 2);
+    setPinOutput(B2);
+    writePinLow(B2);
  } else {
-    DDRB &= ~(1 << 2); PORTB &= ~(1 << 2);
+    setPinInput(B2);
+    writePinLow(B2);
  }
 }
diff --git a/keyboards/alpha/keymaps/default/keymap.c b/keyboards/alpha/keymaps/default/keymap.c
index c18790fe4..3632ecaea 100755
--- a/keyboards/alpha/keymaps/default/keymap.c
+++ b/keyboards/alpha/keymaps/default/keymap.c
@@ -41,9 +41,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
                KC_NO, KC_NO, KC_NO, TO(0), MACRO1, KC_NO, KC_NO, KC_NO),
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
diff --git a/keyboards/amj96/amj96.c b/keyboards/amj96/amj96.c
index 959e321c8..65fca6f12 100644
--- a/keyboards/amj96/amj96.c
+++ b/keyboards/amj96/amj96.c
@@ -14,30 +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();
-}
-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/amj96/keymaps/default/keymap.c b/keyboards/amj96/keymaps/default/keymap.c
index a520fdeb3..f670b3c4f 100644
--- a/keyboards/amj96/keymaps/default/keymap.c
+++ b/keyboards/amj96/keymaps/default/keymap.c
@@ -35,19 +35,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______,          _______, _______, _______  \
  )
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/amjkeyboard/amj66/amj66.c b/keyboards/amjkeyboard/amj66/amj66.c
index 05e29975b..6d77e43a0 100644
--- a/keyboards/amjkeyboard/amj66/amj66.c
+++ b/keyboards/amjkeyboard/amj66/amj66.c
@@ -14,30 +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();
-}
-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/angel17/alpha/alpha.c b/keyboards/angel17/alpha/alpha.c
index 3d2d1de77..1c2936e15 100644
--- a/keyboards/angel17/alpha/alpha.c
+++ b/keyboards/angel17/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/angel17/keymaps/default/keymap.c b/keyboards/angel17/keymaps/default/keymap.c
index 8f54b72b4..1b9f52846 100644
--- a/keyboards/angel17/keymaps/default/keymap.c
+++ b/keyboards/angel17/keymaps/default/keymap.c
@@ -36,19 +36,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        RGB_TOG,    KC_NO,         KC_NO
  ),
 };
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/angel17/rev1/rev1.c b/keyboards/angel17/rev1/rev1.c
index f97e6caed..40ff30e62 100644
--- a/keyboards/angel17/rev1/rev1.c
+++ b/keyboards/angel17/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/angel64/alpha/alpha.c b/keyboards/angel64/alpha/alpha.c
index 3d2d1de77..1c2936e15 100644
--- a/keyboards/angel64/alpha/alpha.c
+++ b/keyboards/angel64/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/angel64/rev1/rev1.c b/keyboards/angel64/rev1/rev1.c
index f97e6caed..40ff30e62 100644
--- a/keyboards/angel64/rev1/rev1.c
+++ b/keyboards/angel64/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/at101_bh/keymaps/default/keymap.c b/keyboards/at101_bh/keymaps/default/keymap.c
index 086c25e1c..1962dd747 100644
--- a/keyboards/at101_bh/keymaps/default/keymap.c
+++ b/keyboards/at101_bh/keymaps/default/keymap.c
@@ -19,35 +19,26 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                KC_TRNS, KC_TRNS, KC_TRNS,                                       KC_TRNS,                                                        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,                      KC_TRNS,          KC_TRNS),
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-        return true;
-}
 void led_set_user(uint8_t usb_led) {
-  DDRB |= (1 << 4);
+  setPinOutput(B4);
-  DDRD |= (1 << 6) | (1 << 7);
+  setPinOutput(D6);
+  setPinOutput(D7);
  if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-    PORTD |= (1 << 7);
+    writePinHigh(D7);
  } else {
-    PORTD &= ~(1 << 7);
+    writePinLow(D7);
  }
  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-    PORTB |= (1 << 4);
+    writePinHigh(B4);
  } else {
-    PORTB &= ~(1 << 4);
+    writePinLow(B4);
  }
  if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-    PORTD |= (1 << 6);
+    writePinHigh(D6);
  } else {
-    PORTD &= ~(1 << 6);
+    writePinLow(D6);
  }
-}
-\ No newline at end of file
+}
diff --git a/keyboards/baguette/baguette.c b/keyboards/baguette/baguette.c
index 751a31725..99305cf2d 100644
--- a/keyboards/baguette/baguette.c
+++ b/keyboards/baguette/baguette.c
@@ -49,23 +49,3 @@ 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);
-}
diff --git a/keyboards/baguette/keymaps/default/keymap.c b/keyboards/baguette/keymaps/default/keymap.c
index 4dfcb837a..1ad100000 100644
--- a/keyboards/baguette/keymaps/default/keymap.c
+++ b/keyboards/baguette/keymaps/default/keymap.c
@@ -30,21 +30,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    KC_TRNS,  KC_TRNS,  BL_TOGG,  BL_STEP,  BL_BRTG,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,          \
                        KC_TRNS,  KC_TRNS,                                KC_TRNS,                                KC_RCTL,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS),
 };
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/baguette/keymaps/iso/keymap.c b/keyboards/baguette/keymaps/iso/keymap.c
index ea8baf08e..fb6d472d6 100644
--- a/keyboards/baguette/keymaps/iso/keymap.c
+++ b/keyboards/baguette/keymaps/iso/keymap.c
@@ -30,21 +30,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    KC_TRNS,  KC_TRNS,  BL_TOGG,  BL_STEP,  BL_BRTG,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,          \
              KC_TRNS,  KC_TRNS,                                KC_TRNS,                                KC_RCTL,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS),
 };
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/bigseries/1key/keymaps/default/keymap.c b/keyboards/bigseries/1key/keymaps/default/keymap.c
index 781205d42..830093af5 100755
--- a/keyboards/bigseries/1key/keymaps/default/keymap.c
+++ b/keyboards/bigseries/1key/keymaps/default/keymap.c
@@ -39,9 +39,6 @@ void matrix_init_user(void) {
    }
 }
-void matrix_scan_user(void) {
-}
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  switch (keycode) {
  case KC_A:
@@ -53,37 +50,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 }
-void led_set_user(uint8_t usb_led) {
-  if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_COMPOSE)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_KANA)) {
-  } else {
-  }
-}
diff --git a/keyboards/bigseries/1key/keymaps/tester/keymap.c b/keyboards/bigseries/1key/keymaps/tester/keymap.c
index bfecdb38b..8248ae789 100755
--- a/keyboards/bigseries/1key/keymaps/tester/keymap.c
+++ b/keyboards/bigseries/1key/keymaps/tester/keymap.c
@@ -42,9 +42,6 @@ void matrix_init_user(void) {
    }
 }
-void matrix_scan_user(void) {
-}
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  switch (keycode) {
  case KC_A:
@@ -56,37 +53,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 }
-void led_set_user(uint8_t usb_led) {
-  if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_COMPOSE)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_KANA)) {
-  } else {
-  }
-}
diff --git a/keyboards/bigseries/2key/keymaps/default/keymap.c b/keyboards/bigseries/2key/keymaps/default/keymap.c
index de430d24d..128a3e9c8 100755
--- a/keyboards/bigseries/2key/keymaps/default/keymap.c
+++ b/keyboards/bigseries/2key/keymaps/default/keymap.c
@@ -40,44 +40,3 @@ void matrix_init_user(void) {
    initialized = 1;
  }
 }
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void led_set_user(uint8_t usb_led) {
-  if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_COMPOSE)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_KANA)) {
-  } else {
-  }
-}
diff --git a/keyboards/bigseries/2key/keymaps/lock/keymap.c b/keyboards/bigseries/2key/keymaps/lock/keymap.c
index 6acf62d48..3646fb40d 100755
--- a/keyboards/bigseries/2key/keymaps/lock/keymap.c
+++ b/keyboards/bigseries/2key/keymaps/lock/keymap.c
@@ -42,44 +42,3 @@ void matrix_init_user(void) {
      initialized = 1;
    }
 }
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void led_set_user(uint8_t usb_led) {
-  if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_COMPOSE)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_KANA)) {
-  } else {
-  }
-}
diff --git a/keyboards/bigseries/2key/keymaps/tester/keymap.c b/keyboards/bigseries/2key/keymaps/tester/keymap.c
index 025fd7349..8938b1b40 100755
--- a/keyboards/bigseries/2key/keymaps/tester/keymap.c
+++ b/keyboards/bigseries/2key/keymaps/tester/keymap.c
@@ -41,44 +41,3 @@ void matrix_init_user(void) {
      initialized = 1;
    }
 }
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void led_set_user(uint8_t usb_led) {
-  if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_COMPOSE)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_KANA)) {
-  } else {
-  }
-}
diff --git a/keyboards/bigseries/3key/keymaps/default/keymap.c b/keyboards/bigseries/3key/keymaps/default/keymap.c
index 3d3f4923d..855c7c3ec 100755
--- a/keyboards/bigseries/3key/keymaps/default/keymap.c
+++ b/keyboards/bigseries/3key/keymaps/default/keymap.c
@@ -41,9 +41,6 @@ void matrix_init_user(void) {
    }
 }
-void matrix_scan_user(void) {
-}
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  switch (keycode) {
  case KC_A:
@@ -55,37 +52,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 }
-void led_set_user(uint8_t usb_led) {
-  if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_COMPOSE)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_KANA)) {
-  } else {
-  }
-}
diff --git a/keyboards/bigseries/3key/keymaps/tester/keymap.c b/keyboards/bigseries/3key/keymaps/tester/keymap.c
index a201acd7e..7ee0d7a41 100755
--- a/keyboards/bigseries/3key/keymaps/tester/keymap.c
+++ b/keyboards/bigseries/3key/keymaps/tester/keymap.c
@@ -41,44 +41,3 @@ void matrix_init_user(void) {
      initialized = 1;
    }
 }
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void led_set_user(uint8_t usb_led) {
-  if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_COMPOSE)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_KANA)) {
-  } else {
-  }
-}
diff --git a/keyboards/bigseries/4key/4key.c b/keyboards/bigseries/4key/4key.c
index 891f11bbb..fdb9a9251 100755
--- a/keyboards/bigseries/4key/4key.c
+++ b/keyboards/bigseries/4key/4key.c
@@ -15,9 +15,3 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "4key.h"
-void matrix_scan_kb(void) {
-  // Looping keyboard code goes here
-  // This runs every cycle (a lot)
-  matrix_scan_user();
-};
diff --git a/keyboards/bigseries/4key/keymaps/default/keymap.c b/keyboards/bigseries/4key/keymaps/default/keymap.c
index 4d662a27b..5674bc619 100755
--- a/keyboards/bigseries/4key/keymaps/default/keymap.c
+++ b/keyboards/bigseries/4key/keymaps/default/keymap.c
@@ -40,46 +40,9 @@ void matrix_init_user(void) {
    }
 }
-void matrix_scan_user(void) {
-}
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  if (record->event.pressed) {
    rgblight_step();
  }
  return true;
 }
-void led_set_user(uint8_t usb_led) {
-  if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_COMPOSE)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_KANA)) {
-  } else {
-  }
-}
diff --git a/keyboards/bigseries/4key/keymaps/tester/keymap.c b/keyboards/bigseries/4key/keymaps/tester/keymap.c
index 021c7c4b6..eb2e42b7a 100755
--- a/keyboards/bigseries/4key/keymaps/tester/keymap.c
+++ b/keyboards/bigseries/4key/keymaps/tester/keymap.c
@@ -41,44 +41,3 @@ void matrix_init_user(void) {
      initialized = 1;
    }
 }
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void led_set_user(uint8_t usb_led) {
-  if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_COMPOSE)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_KANA)) {
-  } else {
-  }
-}
diff --git a/keyboards/blockey/keymaps/default/keymap.c b/keyboards/blockey/keymaps/default/keymap.c
index 82366501a..804500cd0 100644
--- a/keyboards/blockey/keymaps/default/keymap.c
+++ b/keyboards/blockey/keymaps/default/keymap.c
@@ -37,19 +37,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  ),
 };
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/boston_meetup/2019/keymaps/default/keymap.c b/keyboards/boston_meetup/2019/keymaps/default/keymap.c
index 8e729ca71..637559945 100644
--- a/keyboards/boston_meetup/2019/keymaps/default/keymap.c
+++ b/keyboards/boston_meetup/2019/keymaps/default/keymap.c
@@ -156,10 +156,3 @@ bool music_mask_user(uint16_t keycode) {
      return true;
  }
 }
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
diff --git a/keyboards/bpiphany/kitten_paw/keymaps/default/keymap.c b/keyboards/bpiphany/kitten_paw/keymaps/default/keymap.c
index bd909c288..8f229c8ba 100644
--- a/keyboards/bpiphany/kitten_paw/keymaps/default/keymap.c
+++ b/keyboards/bpiphany/kitten_paw/keymaps/default/keymap.c
@@ -13,19 +13,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      KC_LSFT,KC_NUBS,   KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,KC_COMM, KC_DOT,KC_SLSH,        KC_RSFT,            KC_UP,            KC_P1,  KC_P2,  KC_P3,KC_PENT, \
      KC_LCTL,KC_LGUI,KC_LALT,                 KC_SPC,                                KC_RALT,KC_RGUI, KC_APP,KC_RCTL,  KC_LEFT,KC_DOWN,KC_RGHT,    KC_P0,KC_PDOT)
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/bpiphany/pegasushoof/2013/2013.c b/keyboards/bpiphany/pegasushoof/2013/2013.c
index 7a489b22a..c9bd01a99 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/2015/2015.c b/keyboards/bpiphany/pegasushoof/2015/2015.c
index 62841e7af..401dc2633 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 87a739454..e95a06f16 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/unloved_bastard/keymaps/default_ansi/keymap.c b/keyboards/bpiphany/unloved_bastard/keymaps/default_ansi/keymap.c
index 783e37196..a65346d8a 100644
--- a/keyboards/bpiphany/unloved_bastard/keymaps/default_ansi/keymap.c
+++ b/keyboards/bpiphany/unloved_bastard/keymaps/default_ansi/keymap.c
@@ -24,19 +24,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                 KC_LSFT,        KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,          KC_RSFT,            KC_UP, \
                 KC_LCTL,KC_LGUI,KC_LALT,                KC_SPC,                                 KC_RALT,KC_RGUI, KC_APP,  KC_RCTL,   KC_LEFT, KC_DOWN, KC_RGHT  )
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/bpiphany/unloved_bastard/keymaps/default_iso/keymap.c b/keyboards/bpiphany/unloved_bastard/keymaps/default_iso/keymap.c
index b6b78c2c5..30dee23ad 100644
--- a/keyboards/bpiphany/unloved_bastard/keymaps/default_iso/keymap.c
+++ b/keyboards/bpiphany/unloved_bastard/keymaps/default_iso/keymap.c
@@ -24,19 +24,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                 KC_LSFT,KC_NUBS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,          KC_RSFT,            KC_UP, \
                 KC_LCTL,KC_LGUI,KC_LALT,                KC_SPC,                                 KC_RALT,KC_RGUI, KC_APP,  KC_RCTL,   KC_LEFT, KC_DOWN, KC_RGHT  )
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/bthlabs/geekpad/geekpad.c b/keyboards/bthlabs/geekpad/geekpad.c
index e52507c93..6b8edd31c 100644
--- a/keyboards/bthlabs/geekpad/geekpad.c
+++ b/keyboards/bthlabs/geekpad/geekpad.c
@@ -14,30 +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();
-}
-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/business_card/alpha/alpha.c b/keyboards/business_card/alpha/alpha.c
index 3d2d1de77..1c2936e15 100644
--- a/keyboards/business_card/alpha/alpha.c
+++ b/keyboards/business_card/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/business_card/alpha/keymaps/default/keymap.c b/keyboards/business_card/alpha/keymaps/default/keymap.c
index d238d651c..6bf201655 100644
--- a/keyboards/business_card/alpha/keymaps/default/keymap.c
+++ b/keyboards/business_card/alpha/keymaps/default/keymap.c
@@ -26,10 +26,6 @@ LAYOUT(/* Base */
 ),
 };
-bool process_record_user(uint16_t keycode, keyrecord_t *record) { return true; }
-void led_set_user(uint8_t usb_led) {}
 void keyboard_post_init_user(void) {
    rgblight_enable_noeeprom();
    rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_MOOD);
diff --git a/keyboards/business_card/beta/beta.c b/keyboards/business_card/beta/beta.c
index c43be6c16..7a9aa1b9b 100644
--- a/keyboards/business_card/beta/beta.c
+++ b/keyboards/business_card/beta/beta.c
@@ -14,38 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "beta.h"
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-/*
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-  matrix_init_user();
-}
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-  matrix_scan_user();
-}
-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/business_card/beta/keymaps/default/keymap.c b/keyboards/business_card/beta/keymaps/default/keymap.c
index 8f8f84e57..beff48d98 100644
--- a/keyboards/business_card/beta/keymaps/default/keymap.c
+++ b/keyboards/business_card/beta/keymaps/default/keymap.c
@@ -25,19 +25,11 @@ LAYOUT(/* Base */
 ),
 };
-bool process_record_user(uint16_t keycode, keyrecord_t *record) { return true; }
 void matrix_init_user(void) {
    rgblight_enable_noeeprom();
    rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_MOOD);
 }
-void matrix_scan_user(void) {}
-void led_set_user(uint8_t usb_led) {}
-void keyboard_post_init_user(void) {}
 #ifdef OLED_ENABLE
 static void render_logo(void) {
    static const char PROGMEM qmk_logo[] = {0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94,
diff --git a/keyboards/business_card/business_card.c b/keyboards/business_card/business_card.c
index a57c00457..01beb2822 100644
--- a/keyboards/business_card/business_card.c
+++ b/keyboards/business_card/business_card.c
@@ -14,38 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "business_card.h"
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-/*
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-  matrix_init_user();
-}
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-  matrix_scan_user();
-}
-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/butterstick/butterstick.c b/keyboards/butterstick/butterstick.c
index 431e93fa1..3bcbcbe8b 100644
--- a/keyboards/butterstick/butterstick.c
+++ b/keyboards/butterstick/butterstick.c
@@ -15,20 +15,6 @@
 */
 #include "butterstick.h"
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-/*
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-  matrix_init_user();
-}
-*/
 void matrix_scan_kb(void) {
 #ifdef DEBUG_MATRIX
    for (uint8_t c = 0; c < MATRIX_COLS; c++)
@@ -38,19 +24,3 @@ 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/cassette42/keymaps/default/keymap.c b/keyboards/cassette42/keymaps/default/keymap.c
index a04626db9..b678ccf9b 100644
--- a/keyboards/cassette42/keymaps/default/keymap.c
+++ b/keyboards/cassette42/keymaps/default/keymap.c
@@ -110,8 +110,6 @@ void oled_task_user(void) {
 }
 #endif
-void led_set_user(uint8_t usb_led) {}
 bool encoder_update_user(uint8_t index, bool clockwise) {
    oled_on();
    if (index == 0) { /* left encoder */
diff --git a/keyboards/christmas_tree/christmas_tree.c b/keyboards/christmas_tree/christmas_tree.c
index 04d41c1db..c03670a3a 100644
--- a/keyboards/christmas_tree/christmas_tree.c
+++ b/keyboards/christmas_tree/christmas_tree.c
@@ -1,5 +1 @@
 #include "christmas_tree.h"
-void matrix_init_kb(void) {
-        matrix_init_user();
-}
diff --git a/keyboards/ckeys/nakey/keymaps/default/keymap.c b/keyboards/ckeys/nakey/keymaps/default/keymap.c
index be147b2d8..4ecacc731 100644
--- a/keyboards/ckeys/nakey/keymaps/default/keymap.c
+++ b/keyboards/ckeys/nakey/keymaps/default/keymap.c
@@ -24,19 +24,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    KC_P0,              KC_PDOT, KC_PENT \
  ),
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/ckeys/nakey/nakey.c b/keyboards/ckeys/nakey/nakey.c
index ba2fb90eb..84c0b03ff 100644
--- a/keyboards/ckeys/nakey/nakey.c
+++ b/keyboards/ckeys/nakey/nakey.c
@@ -13,30 +13,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "nakey.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-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/ckeys/obelus/obelus.c b/keyboards/ckeys/obelus/obelus.c
index 2905f0724..fc6b961f2 100644
--- a/keyboards/ckeys/obelus/obelus.c
+++ b/keyboards/ckeys/obelus/obelus.c
@@ -9,20 +9,3 @@ 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);
-}
diff --git a/keyboards/ckeys/thedora/thedora.c b/keyboards/ckeys/thedora/thedora.c
index 438320ef1..68d0a9af5 100755
--- a/keyboards/ckeys/thedora/thedora.c
+++ b/keyboards/ckeys/thedora/thedora.c
@@ -1,28 +1 @@
 #include "thedora.h"
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-  // Turn status LED on
-  //DDRD |= (1<<6);
-  //PORTD |= (1<<6);
-  matrix_init_user();
-}
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-  matrix_scan_user();
-}
-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/clueboard/60/60.c b/keyboards/clueboard/60/60.c
index aac4e94c3..90d166139 100644
--- a/keyboards/clueboard/60/60.c
+++ b/keyboards/clueboard/60/60.c
@@ -14,11 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "60.h"
-void matrix_init_kb(void) {
-}
-void matrix_scan_kb(void) {
-}
diff --git a/keyboards/clueboard/card/keymaps/default/keymap.c b/keyboards/clueboard/card/keymaps/default/keymap.c
index 0d94eb46c..23ff1c4ec 100644
--- a/keyboards/clueboard/card/keymaps/default/keymap.c
+++ b/keyboards/clueboard/card/keymaps/default/keymap.c
@@ -29,13 +29,6 @@ float music_scale[][2] = SONG(MUSIC_SCALE_SOUND);
 float tone_goodbye[][2] = SONG(GOODBYE_SOUND);
 #endif
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  switch (keycode) {
 #ifdef AUDIO_ENABLE
@@ -64,6 +57,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
      return true;
  }
 }
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/clueboard/card/keymaps/rgb_effects/keymap.c b/keyboards/clueboard/card/keymaps/rgb_effects/keymap.c
index 92d39aef5..c30e50820 100644
--- a/keyboards/clueboard/card/keymaps/rgb_effects/keymap.c
+++ b/keyboards/clueboard/card/keymaps/rgb_effects/keymap.c
@@ -12,17 +12,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 const uint8_t RGBLED_SNAKE_INTERVALS[] PROGMEM = {255, 170, 85};
 const uint8_t RGBLED_KNIGHT_INTERVALS[] PROGMEM = {255, 170, 85};
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/coarse/ixora/keymaps/default/keymap.c b/keyboards/coarse/ixora/keymaps/default/keymap.c
index 85a646851..65daf5c21 100644
--- a/keyboards/coarse/ixora/keymaps/default/keymap.c
+++ b/keyboards/coarse/ixora/keymaps/default/keymap.c
@@ -28,15 +28,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  RESET,    KC_2,    KC_3,
  KC_CAPS, KC_NLCK, KC_SLCK)
 };
-void matrix_init_user(void) {
-  //user initialization
-}
-void matrix_scan_user(void) {
-  //user matrix
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    return true;
-}
diff --git a/keyboards/coarse/vinta/keymaps/default/keymap.c b/keyboards/coarse/vinta/keymaps/default/keymap.c
index 80499d73f..58a8f7ab5 100644
--- a/keyboards/coarse/vinta/keymaps/default/keymap.c
+++ b/keyboards/coarse/vinta/keymaps/default/keymap.c
@@ -37,15 +37,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  KC_LSFT, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT, KC_SLSH,          KC_RSFT,          KC_UP,   KC_END, \
  KC_LCTL, KC_LGUI,KC_LALT,                KC_SPC,                         KC_RALT, RESET,            KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
 };
-void matrix_init_user(void) {
-  //user initialization
-}
-void matrix_scan_user(void) {
-  //user matrix
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
diff --git a/keyboards/coarse/vinta/vinta.c b/keyboards/coarse/vinta/vinta.c
index 112e44fb8..edd45511b 100644
--- a/keyboards/coarse/vinta/vinta.c
+++ b/keyboards/coarse/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);
-}
diff --git a/keyboards/cocoa40/cocoa40.c b/keyboards/cocoa40/cocoa40.c
index 22d19828d..fdc9f9c0e 100644
--- a/keyboards/cocoa40/cocoa40.c
+++ b/keyboards/cocoa40/cocoa40.c
@@ -14,30 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "cocoa40.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-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/converter/modelm101/keymaps/default/keymap.c b/keyboards/converter/modelm101/keymaps/default/keymap.c
index 644e9a5ef..3f01f2c65 100644
--- a/keyboards/converter/modelm101/keymaps/default/keymap.c
+++ b/keyboards/converter/modelm101/keymaps/default/keymap.c
@@ -25,19 +25,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    KC_LCTL,          KC_LALT,                           KC_SPC,                                      KC_RALT,          KC_RCTL,   KC_LEFT, KC_DOWN, KC_RGHT,   KC_P0,            KC_PDOT
  ),
 };
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/converter/modelm101/modelm101.c b/keyboards/converter/modelm101/modelm101.c
index c2204bea6..708259cab 100644
--- a/keyboards/converter/modelm101/modelm101.c
+++ b/keyboards/converter/modelm101/modelm101.c
@@ -25,27 +25,6 @@ void keyboard_pre_init_kb(void) {
  writePinHigh(B6);
 }
-void matrix_init_kb(void) {
-  /* put your keyboard start-up code here
-   * runs once when the firmware starts up */
-  matrix_init_user();
-}
-void matrix_scan_kb(void) {
-  /* put your looping keyboard code here
-   * runs every cycle (a lot) */
-  matrix_scan_user();
-}
-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_NUM_LOCK)) {
    writePinLow(B4);
diff --git a/keyboards/converter/numeric_keypad_IIe/keymaps/default/keymap.c b/keyboards/converter/numeric_keypad_IIe/keymaps/default/keymap.c
index a8f455355..d4aed559f 100644
--- a/keyboards/converter/numeric_keypad_IIe/keymaps/default/keymap.c
+++ b/keyboards/converter/numeric_keypad_IIe/keymaps/default/keymap.c
@@ -40,23 +40,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    KC_SPACE,   KC_KP_0,  KC_KP_COMMA,  KC_KP_DOT,  KC_RETURN,      KC_QUESTION  \
  ),
 };
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void keyboard_post_init_user(void) {
-}
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/converter/numeric_keypad_IIe/numeric_keypad_IIe.c b/keyboards/converter/numeric_keypad_IIe/numeric_keypad_IIe.c
index c29d85d48..a2f8a5bd6 100644
--- a/keyboards/converter/numeric_keypad_IIe/numeric_keypad_IIe.c
+++ b/keyboards/converter/numeric_keypad_IIe/numeric_keypad_IIe.c
@@ -14,30 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "numeric_keypad_IIe.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-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/converter/siemens_tastatur/keymaps/default/keymap.c b/keyboards/converter/siemens_tastatur/keymaps/default/keymap.c
index 70edf94d7..0ce8a64ab 100644
--- a/keyboards/converter/siemens_tastatur/keymaps/default/keymap.c
+++ b/keyboards/converter/siemens_tastatur/keymaps/default/keymap.c
@@ -51,10 +51,6 @@ void matrix_init_user(void) {
  writePinLow(B0);
 }
-void matrix_scan_user(void) {
-}
 void led_set_user(uint8_t usb_led) {
    if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
        writePinHigh(B0);
diff --git a/keyboards/converter/siemens_tastatur/siemens_tastatur.c b/keyboards/converter/siemens_tastatur/siemens_tastatur.c
index 298f24c36..21d00c8c3 100644
--- a/keyboards/converter/siemens_tastatur/siemens_tastatur.c
+++ b/keyboards/converter/siemens_tastatur/siemens_tastatur.c
@@ -15,31 +15,3 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "siemens_tastatur.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-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/copenhagen_click/click_pad_v1/keymaps/default/keymap.c b/keyboards/copenhagen_click/click_pad_v1/keymaps/default/keymap.c
index a11872782..17549dd09 100755
--- a/keyboards/copenhagen_click/click_pad_v1/keymaps/default/keymap.c
+++ b/keyboards/copenhagen_click/click_pad_v1/keymaps/default/keymap.c
@@ -43,11 +43,3 @@ void matrix_init_user(void) {
  breathing_enable();
 }
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/coseyfannitutti/mullet/mullet.c b/keyboards/coseyfannitutti/mullet/mullet.c
index 4f451f3db..18445a6c9 100644
--- a/keyboards/coseyfannitutti/mullet/mullet.c
+++ b/keyboards/coseyfannitutti/mullet/mullet.c
@@ -14,10 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "mullet.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
diff --git a/keyboards/coseyfannitutti/mulletpad/mulletpad.c b/keyboards/coseyfannitutti/mulletpad/mulletpad.c
index be335cc54..72bb19c30 100644
--- a/keyboards/coseyfannitutti/mulletpad/mulletpad.c
+++ b/keyboards/coseyfannitutti/mulletpad/mulletpad.c
@@ -14,10 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "mulletpad.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
diff --git a/keyboards/crawlpad/keymaps/default/keymap.c b/keyboards/crawlpad/keymaps/default/keymap.c
index ec985739f..c81bb56bd 100755
--- a/keyboards/crawlpad/keymaps/default/keymap.c
+++ b/keyboards/crawlpad/keymaps/default/keymap.c
@@ -76,40 +76,3 @@ void matrix_init_user(void) {
  DDRB |= (1 << 4) | (1 << 5) | (1 << 6) | (1 << 7);
  PORTB &= ~(1 << 4) & ~(1 << 5) & ~(1 << 6) & ~(1 << 7);
 }
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-  if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_COMPOSE)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_KANA)) {
-  } else {
-  }
-}
diff --git a/keyboards/cu75/cu75.c b/keyboards/cu75/cu75.c
index 43600efad..273dd0927 100644
--- a/keyboards/cu75/cu75.c
+++ b/keyboards/cu75/cu75.c
@@ -163,13 +163,6 @@ void reset_keyboard_kb(){
    reset_keyboard();
 }
-void led_set_kb(uint8_t usb_led)
-{
-    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-    led_set_user(usb_led);
-}
 // LFK lighting info
 const uint8_t switch_matrices[] = {0, 1};
 const uint8_t rgb_matrices[] = {6, 7};
diff --git a/keyboards/cu75/keymaps/default/keymap.c b/keyboards/cu75/keymaps/default/keymap.c
index c78c5cd12..923faf97d 100644
--- a/keyboards/cu75/keymaps/default/keymap.c
+++ b/keyboards/cu75/keymaps/default/keymap.c
@@ -57,19 +57,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    _______, _______, _______,          _______,          _______,          _______,          _______, _______, _______, RGB_SAD, RGB_HUD, RGB_SAI  \
  ),
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/cu75/keymaps/iso/keymap.c b/keyboards/cu75/keymaps/iso/keymap.c
index 18bd9a59a..60c06905f 100644
--- a/keyboards/cu75/keymaps/iso/keymap.c
+++ b/keyboards/cu75/keymaps/iso/keymap.c
@@ -56,19 +56,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    _______, _______, _______,          _______,          _______,          _______,          _______, _______, _______, RGB_SAD, RGB_HUD, RGB_SAI  \
  ),
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/cutie_club/wraith/keymaps/default/keymap.c b/keyboards/cutie_club/wraith/keymaps/default/keymap.c
index 342a411ef..74a6bff26 100644
--- a/keyboards/cutie_club/wraith/keymaps/default/keymap.c
+++ b/keyboards/cutie_club/wraith/keymaps/default/keymap.c
@@ -40,11 +40,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  )
 };
-void matrix_init_user(void) {
-}
 void matrix_scan_user(void) {
  // escape LED on layer 1
  if (IS_LAYER_ON(1)) {
@@ -53,7 +48,3 @@ void matrix_scan_user(void) {
    writePinHigh(B0);
  }
 }
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/cutie_club/wraith/keymaps/timer/keymap.c b/keyboards/cutie_club/wraith/keymaps/timer/keymap.c
index e57c62103..8b79709b3 100644
--- a/keyboards/cutie_club/wraith/keymaps/timer/keymap.c
+++ b/keyboards/cutie_club/wraith/keymaps/timer/keymap.c
@@ -42,11 +42,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  )
 };
-void matrix_init_user(void) {
-}
 void matrix_scan_user(void) {
  layer_time_remaining -= timer_read()-prev_loop_time; //amount of time elapsed since the start of the previous loop
  prev_loop_time = timer_read(); //start counting the time to check at the next iteration
@@ -84,7 +79,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 };
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/dm9records/ergoinu/ergoinu.c b/keyboards/dm9records/ergoinu/ergoinu.c
index b43ab17c8..c6d099a14 100644
--- a/keyboards/dm9records/ergoinu/ergoinu.c
+++ b/keyboards/dm9records/ergoinu/ergoinu.c
@@ -1,5 +1 @@
 #include "ergoinu.h"
-void matrix_init_kb(void) {
-        matrix_init_user();
-};
diff --git a/keyboards/dm9records/ergoinu/keymaps/default/keymap.c b/keyboards/dm9records/ergoinu/keymaps/default/keymap.c
index 7f1be4796..3192b0f22 100644
--- a/keyboards/dm9records/ergoinu/keymaps/default/keymap.c
+++ b/keyboards/dm9records/ergoinu/keymaps/default/keymap.c
@@ -96,6 +96,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  return true;
 }
-void matrix_init_user(void) {
-}
diff --git a/keyboards/dm9records/ergoinu/keymaps/default_jis/keymap.c b/keyboards/dm9records/ergoinu/keymaps/default_jis/keymap.c
index 3a1a88f47..e161145f4 100644
--- a/keyboards/dm9records/ergoinu/keymaps/default_jis/keymap.c
+++ b/keyboards/dm9records/ergoinu/keymaps/default_jis/keymap.c
@@ -96,6 +96,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  #endif
    return true;
 }
-void matrix_init_user(void) {
-}
diff --git a/keyboards/dm9records/plaid/plaid.c b/keyboards/dm9records/plaid/plaid.c
index 28f56d7f9..50da81950 100644
--- a/keyboards/dm9records/plaid/plaid.c
+++ b/keyboards/dm9records/plaid/plaid.c
@@ -14,30 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "plaid.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-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/donutcables/scrabblepad/keymaps/random/keymap.c b/keyboards/donutcables/scrabblepad/keymaps/random/keymap.c
index 8e7825966..462e06875 100644
--- a/keyboards/donutcables/scrabblepad/keymaps/random/keymap.c
+++ b/keyboards/donutcables/scrabblepad/keymaps/random/keymap.c
@@ -60,16 +60,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY, RND_KEY
 ),
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/dozen0/dozen0.c b/keyboards/dozen0/dozen0.c
index 8b52aa898..42872a210 100644
--- a/keyboards/dozen0/dozen0.c
+++ b/keyboards/dozen0/dozen0.c
@@ -14,30 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "dozen0.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-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/dozen0/keymaps/default/keymap.c b/keyboards/dozen0/keymaps/default/keymap.c
index fdc344f66..a869c6e93 100644
--- a/keyboards/dozen0/keymaps/default/keymap.c
+++ b/keyboards/dozen0/keymaps/default/keymap.c
@@ -120,11 +120,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 }
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/duck/eagle_viper/v2/v2.c b/keyboards/duck/eagle_viper/v2/v2.c
index a60acb978..d3e1368de 100644
--- a/keyboards/duck/eagle_viper/v2/v2.c
+++ b/keyboards/duck/eagle_viper/v2/v2.c
@@ -59,7 +59,3 @@ void led_set_kb(uint8_t usb_led) {
  indicator_leds_set(status);
 }
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  return process_record_user(keycode, record);
-}
diff --git a/keyboards/duck/jetfire/jetfire.c b/keyboards/duck/jetfire/jetfire.c
index 0662489c6..9bb02ca22 100644
--- a/keyboards/duck/jetfire/jetfire.c
+++ b/keyboards/duck/jetfire/jetfire.c
@@ -121,16 +121,6 @@ void backlight_set(uint8_t level)
  backlight_toggle_rgb(level & BACKLIGHT_RGB);
 }
-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 backlight_update_state()
 {
  cli();
diff --git a/keyboards/duck/jetfire/keymaps/default/keymap.c b/keyboards/duck/jetfire/keymaps/default/keymap.c
index 9377ef002..fc5fd39ea 100644
--- a/keyboards/duck/jetfire/keymaps/default/keymap.c
+++ b/keyboards/duck/jetfire/keymaps/default/keymap.c
@@ -25,19 +25,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    KC_LSFT, KC_Z,    KC_X,    KC_C,   KC_V,  KC_B,  KC_N,   KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
    KC_LCTL, KC_LGUI, KC_LALT,                       KC_SPC,                 KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0,   KC_COMM),
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/duck/lightsaver/lightsaver.c b/keyboards/duck/lightsaver/lightsaver.c
index 75e35b28b..e0fe918e7 100644
--- a/keyboards/duck/lightsaver/lightsaver.c
+++ b/keyboards/duck/lightsaver/lightsaver.c
@@ -54,7 +54,3 @@ void led_set_kb(uint8_t usb_led) {
  led_set_user(usb_led);
 }
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  return process_record_user(keycode, record);
-}
diff --git a/keyboards/duck/octagon/v1/v1.c b/keyboards/duck/octagon/v1/v1.c
index 258688229..e9e88c70d 100644
--- a/keyboards/duck/octagon/v1/v1.c
+++ b/keyboards/duck/octagon/v1/v1.c
@@ -44,7 +44,3 @@ void led_set_kb(uint8_t usb_led) {
  backlight_os_state & (1<<USB_LED_CAPS_LOCK) ? (PORTB &= ~0b00000001) : (PORTB |= 0b00000001);
  backlight_os_state & (1<<USB_LED_SCROLL_LOCK) ? (PORTB &= ~0b00010000) : (PORTB |= 0b00010000);
 }
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  return process_record_user(keycode, record);
-}
diff --git a/keyboards/duck/octagon/v2/v2.c b/keyboards/duck/octagon/v2/v2.c
index 52653b37e..23e92b276 100644
--- a/keyboards/duck/octagon/v2/v2.c
+++ b/keyboards/duck/octagon/v2/v2.c
@@ -111,7 +111,3 @@ void led_set_kb(uint8_t usb_led) {
  backlight_os_state & (1<<USB_LED_CAPS_LOCK) ? (PORTB &= ~0b00000001) : (PORTB |= 0b00000001);
  backlight_os_state & (1<<USB_LED_SCROLL_LOCK) ? (PORTB &= ~0b00010000) : (PORTB |= 0b00010000);
 }
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  return process_record_user(keycode, record);
-}
diff --git a/keyboards/duck/orion/v3/v3.c b/keyboards/duck/orion/v3/v3.c
index ca5c512ce..2e8f85a11 100644
--- a/keyboards/duck/orion/v3/v3.c
+++ b/keyboards/duck/orion/v3/v3.c
@@ -37,7 +37,3 @@ bool led_update_kb(led_t led_state) {
    }
    return true;
 }
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  return process_record_user(keycode, record);
-}
diff --git a/keyboards/duck/tcv3/tcv3.c b/keyboards/duck/tcv3/tcv3.c
index 063f55ad3..4d52d22c1 100644
--- a/keyboards/duck/tcv3/tcv3.c
+++ b/keyboards/duck/tcv3/tcv3.c
@@ -115,10 +115,6 @@ void backlight_set(uint8_t level) {
 //   backlight_os_state & (1<<USB_LED_SCROLL_LOCK) ? (PORTB &= ~0b00010000) : (PORTB |= 0b00010000);
 // }
-// bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-//   return process_record_user(keycode, record);
-// }
 // U5 Pin 1, 2, 3 connected to top left LEDs
 // U6 Pin 1, 2, 3 connected to bottom right leds col of 3
@@ -131,4 +127,4 @@ void backlight_set(uint8_t level) {
 // U5, U6, U7 Pin 8 VCC
 // U5, U6, U7 Pin 4 GRND
-// U5 Pin 6 connected to atmega32u4 D4
-\ No newline at end of file
+// U5 Pin 6 connected to atmega32u4 D4
diff --git a/keyboards/ep/40/40.c b/keyboards/ep/40/40.c
index 7c235f3ce..fad78a794 100644
--- a/keyboards/ep/40/40.c
+++ b/keyboards/ep/40/40.c
@@ -14,30 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "40.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-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/ep/96/96.c b/keyboards/ep/96/96.c
index 9fdd51977..70b48aa41 100644
--- a/keyboards/ep/96/96.c
+++ b/keyboards/ep/96/96.c
@@ -14,30 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "96.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-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/ep/96/keymaps/default/keymap.c b/keyboards/ep/96/keymaps/default/keymap.c
index d51204153..c3892148e 100644
--- a/keyboards/ep/96/keymaps/default/keymap.c
+++ b/keyboards/ep/96/keymaps/default/keymap.c
@@ -53,15 +53,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 }
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/ep/comsn/hs68/hs68.c b/keyboards/ep/comsn/hs68/hs68.c
index fdde3ad78..16595739c 100644
--- a/keyboards/ep/comsn/hs68/hs68.c
+++ b/keyboards/ep/comsn/hs68/hs68.c
@@ -14,30 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "hs68.h"
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-  matrix_init_user();
-}
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-  matrix_scan_user();
-}
-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/ep/comsn/mollydooker/keymaps/default/keymap.c b/keyboards/ep/comsn/mollydooker/keymaps/default/keymap.c
index a213973cd..1858cedf7 100644
--- a/keyboards/ep/comsn/mollydooker/keymaps/default/keymap.c
+++ b/keyboards/ep/comsn/mollydooker/keymaps/default/keymap.c
@@ -45,11 +45,3 @@ void matrix_init_user(void) {
  };
 }
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/ep/comsn/mollydooker/mollydooker.c b/keyboards/ep/comsn/mollydooker/mollydooker.c
index d0d6f302e..3657ac964 100644
--- a/keyboards/ep/comsn/mollydooker/mollydooker.c
+++ b/keyboards/ep/comsn/mollydooker/mollydooker.c
@@ -14,30 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "mollydooker.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-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/ep/comsn/tf_longeboye/tf__longeboye.c b/keyboards/ep/comsn/tf_longeboye/tf__longeboye.c
index 9e8141772..ee8db1e52 100644
--- a/keyboards/ep/comsn/tf_longeboye/tf__longeboye.c
+++ b/keyboards/ep/comsn/tf_longeboye/tf__longeboye.c
@@ -14,30 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "tf_longeboye.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-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/ergodash/mini/mini.c b/keyboards/ergodash/mini/mini.c
index 89b821297..3aa9e74cc 100644
--- a/keyboards/ergodash/mini/mini.c
+++ b/keyboards/ergodash/mini/mini.c
@@ -4,10 +4,3 @@
    float tone_startup[][2] = SONG(STARTUP_SOUND);
    float tone_goodbye[][2] = SONG(GOODBYE_SOUND);
 #endif
-#ifdef SSD1306OLED
-void led_set_kb(uint8_t usb_led) {
-    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-    led_set_user(usb_led);
-}
-#endif
diff --git a/keyboards/ergodash/rev1/rev1.c b/keyboards/ergodash/rev1/rev1.c
index 5e787921c..00f81cae1 100644
--- a/keyboards/ergodash/rev1/rev1.c
+++ b/keyboards/ergodash/rev1/rev1.c
@@ -5,13 +5,6 @@
    float tone_goodbye[][2] = SONG(GOODBYE_SOUND);
 #endif
-#ifdef SSD1306OLED
-void led_set_kb(uint8_t usb_led) {
-    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-    led_set_user(usb_led);
-}
-#endif
 void matrix_init_kb(void) {
    #ifdef AUDIO_ENABLE
diff --git a/keyboards/ergodox_ez/keymaps/default_osx/keymap.c b/keyboards/ergodox_ez/keymaps/default_osx/keymap.c
index 3f52528f8..73b1077b8 100644
--- a/keyboards/ergodox_ez/keymaps/default_osx/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/default_osx/keymap.c
@@ -138,11 +138,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 };
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-};
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
diff --git a/keyboards/ergodox_infinity/ergodox_infinity.c b/keyboards/ergodox_infinity/ergodox_infinity.c
index 90aa52242..8f5b068a7 100644
--- a/keyboards/ergodox_infinity/ergodox_infinity.c
+++ b/keyboards/ergodox_infinity/ergodox_infinity.c
@@ -137,13 +137,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();
-}
 __attribute__ ((weak)) void ergodox_board_led_on(void) {}
 __attribute__ ((weak)) void ergodox_right_led_1_on(void) {}
diff --git a/keyboards/ergodox_infinity/keymaps/default/keymap.c b/keyboards/ergodox_infinity/keymaps/default/keymap.c
index ce8a3661e..cd6500180 100644
--- a/keyboards/ergodox_infinity/keymaps/default/keymap.c
+++ b/keyboards/ergodox_infinity/keymaps/default/keymap.c
@@ -164,12 +164,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  return true;
 }
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-}
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
diff --git a/keyboards/ergotaco/keymaps/default/keymap.c b/keyboards/ergotaco/keymaps/default/keymap.c
index be1267ef0..8de5ea637 100644
--- a/keyboards/ergotaco/keymaps/default/keymap.c
+++ b/keyboards/ergotaco/keymaps/default/keymap.c
@@ -32,11 +32,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
 ),
 */
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-};
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-};
diff --git a/keyboards/ergotravel/rev1/rev1.c b/keyboards/ergotravel/rev1/rev1.c
index 609c479eb..520a869e5 100644
--- a/keyboards/ergotravel/rev1/rev1.c
+++ b/keyboards/ergotravel/rev1/rev1.c
@@ -1,22 +1 @@
 #include "rev1.h"
-#ifdef SSD1306OLED
-void led_set_kb(uint8_t usb_led) {
-    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-    led_set_user(usb_led);
-}
-#endif
-void matrix_init_kb(void) {
-    // // green led on
-    // DDRD |= (1<<5);
-    // PORTD &= ~(1<<5);
-    // // orange led on
-    // DDRB |= (1<<0);
-    // PORTB &= ~(1<<0);
-        matrix_init_user();
-};
diff --git a/keyboards/evyd13/ta65/ta65.c b/keyboards/evyd13/ta65/ta65.c
index 4f67a0203..ca9aafb1b 100644
--- a/keyboards/evyd13/ta65/ta65.c
+++ b/keyboards/evyd13/ta65/ta65.c
@@ -1,13 +1 @@
 #include "ta65.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-};
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-};
diff --git a/keyboards/exclusive/e6v2/oe/oe.c b/keyboards/exclusive/e6v2/oe/oe.c
index 10cd59f0c..3c6627894 100644
--- a/keyboards/exclusive/e6v2/oe/oe.c
+++ b/keyboards/exclusive/e6v2/oe/oe.c
@@ -1,26 +1,5 @@
 #include "oe.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-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
        DDRB |= (1<<6);
diff --git a/keyboards/exclusive/e7v1se/e7v1se.c b/keyboards/exclusive/e7v1se/e7v1se.c
index 36cfccc2f..69248f01d 100644
--- a/keyboards/exclusive/e7v1se/e7v1se.c
+++ b/keyboards/exclusive/e7v1se/e7v1se.c
@@ -15,36 +15,3 @@
 */
 #include "e7v1se.h"
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-/*
-void matrix_init_kb(void) {
-    // put your keyboard start-up code here
-    // runs once when the firmware starts up
-    matrix_init_user();
-}
-void matrix_scan_kb(void) {
-    // put your looping keyboard code here
-    // runs every cycle (a lot)
-    matrix_scan_user();
-}
-bool 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);
-}
-bool led_update_kb(led_t led_state) {
-    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-    return led_update_user(led_state);
-}
-*/
diff --git a/keyboards/flehrad/downbubble/keymaps/default/keymap.c b/keyboards/flehrad/downbubble/keymaps/default/keymap.c
index 48303900f..6abe3d532 100644
--- a/keyboards/flehrad/downbubble/keymaps/default/keymap.c
+++ b/keyboards/flehrad/downbubble/keymaps/default/keymap.c
@@ -89,15 +89,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 }
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/flehrad/numbrero/keymaps/default/keymap.c b/keyboards/flehrad/numbrero/keymaps/default/keymap.c
index 903ed8d88..35bc8cdc3 100644
--- a/keyboards/flehrad/numbrero/keymaps/default/keymap.c
+++ b/keyboards/flehrad/numbrero/keymaps/default/keymap.c
@@ -18,13 +18,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-        return true;
-}
diff --git a/keyboards/flehrad/snagpad/keymaps/default/keymap.c b/keyboards/flehrad/snagpad/keymaps/default/keymap.c
index 7645b435c..28c980a44 100644
--- a/keyboards/flehrad/snagpad/keymaps/default/keymap.c
+++ b/keyboards/flehrad/snagpad/keymaps/default/keymap.c
@@ -16,48 +16,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                KC_P1, KC_P2, KC_P3,  
                KC_P0,        KC_PDOT, KC_PENT),
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-        return true;
-}
-void led_set_user(uint8_t usb_led) {
-        if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-                
-        } else {
-                
-        }
-        if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-                
-        } else {
-                
-        }
-        if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-                
-        } else {
-                
-        }
-        if (usb_led & (1 << USB_LED_COMPOSE)) {
-                
-        } else {
-                
-        }
-        if (usb_led & (1 << USB_LED_KANA)) {
-                
-        } else {
-                
-        }
-}
diff --git a/keyboards/flehrad/snagpad/keymaps/via/keymap.c b/keyboards/flehrad/snagpad/keymaps/via/keymap.c
index 7fa226de7..c657f49be 100644
--- a/keyboards/flehrad/snagpad/keymaps/via/keymap.c
+++ b/keyboards/flehrad/snagpad/keymaps/via/keymap.c
@@ -29,48 +29,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
                KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-        return true;
-}
-void led_set_user(uint8_t usb_led) {
-        if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-                
-        } else {
-                
-        }
-        if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-                
-        } else {
-                
-        }
-        if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-                
-        } else {
-                
-        }
-        if (usb_led & (1 << USB_LED_COMPOSE)) {
-                
-        } else {
-                
-        }
-        if (usb_led & (1 << USB_LED_KANA)) {
-                
-        } else {
-                
-        }
-}
diff --git a/keyboards/fleuron/fleuron.c b/keyboards/fleuron/fleuron.c
index 12f950f36..babdb23c5 100644
--- a/keyboards/fleuron/fleuron.c
+++ b/keyboards/fleuron/fleuron.c
@@ -14,30 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "fleuron.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-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/fleuron/keymaps/default/keymap.c b/keyboards/fleuron/keymaps/default/keymap.c
index 367ee4895..6240312b3 100644
--- a/keyboards/fleuron/keymaps/default/keymap.c
+++ b/keyboards/fleuron/keymaps/default/keymap.c
@@ -151,15 +151,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 }
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/flx/virgo/virgo.c b/keyboards/flx/virgo/virgo.c
index 142ddf3eb..679f90fb6 100644
--- a/keyboards/flx/virgo/virgo.c
+++ b/keyboards/flx/virgo/virgo.c
@@ -25,20 +25,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);
-}
 bool led_update_kb(led_t led_state) {
    if(led_update_user(led_state)) {
        writePin(E6, !led_state.caps_lock);
diff --git a/keyboards/foxlab/leaf60/hotswap/keymaps/default/keymap.c b/keyboards/foxlab/leaf60/hotswap/keymaps/default/keymap.c
index 3f9ea1b49..f2f5f0c97 100644
--- a/keyboards/foxlab/leaf60/hotswap/keymaps/default/keymap.c
+++ b/keyboards/foxlab/leaf60/hotswap/keymaps/default/keymap.c
@@ -32,15 +32,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/foxlab/leaf60/universal/keymaps/default/keymap.c b/keyboards/foxlab/leaf60/universal/keymaps/default/keymap.c
index ff84fa399..3f823ba04 100644
--- a/keyboards/foxlab/leaf60/universal/keymaps/default/keymap.c
+++ b/keyboards/foxlab/leaf60/universal/keymaps/default/keymap.c
@@ -32,15 +32,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/geekboards/tester/keymaps/default/keymap.c b/keyboards/geekboards/tester/keymaps/default/keymap.c
index e68f15f63..acf63cb36 100644
--- a/keyboards/geekboards/tester/keymaps/default/keymap.c
+++ b/keyboards/geekboards/tester/keymaps/default/keymap.c
@@ -9,15 +9,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    KC_F4,   KC_F5,     KC_F6,     KC_F7
    ),
 };
-void matrix_init_user(void) {
-  //user initialization
-}
-void matrix_scan_user(void) {
-  //user matrix
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
diff --git a/keyboards/geekboards/tester/tester.c b/keyboards/geekboards/tester/tester.c
index 0c5c056cc..532df7a53 100644
--- a/keyboards/geekboards/tester/tester.c
+++ b/keyboards/geekboards/tester/tester.c
@@ -29,28 +29,12 @@ led_config_t g_led_config = {
 } 
 };
+void suspend_power_down_kb(void) {
-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);
-        suspend_power_down_user();
+    suspend_power_down_user();
 }
-void suspend_wakeup_init_kb(void)
+void suspend_wakeup_init_kb(void) {
-{
    rgb_matrix_set_suspend_state(false);
    suspend_wakeup_init_user();
 }
diff --git a/keyboards/gray_studio/cod67/cod67.c b/keyboards/gray_studio/cod67/cod67.c
index b6c04a3e5..494e06da7 100644
--- a/keyboards/gray_studio/cod67/cod67.c
+++ b/keyboards/gray_studio/cod67/cod67.c
@@ -14,30 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "cod67.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-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/gray_studio/cod67/keymaps/default/keymap.c b/keyboards/gray_studio/cod67/keymaps/default/keymap.c
index 5403bf406..b84e073f7 100644
--- a/keyboards/gray_studio/cod67/keymaps/default/keymap.c
+++ b/keyboards/gray_studio/cod67/keymaps/default/keymap.c
@@ -25,19 +25,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                KC_LCTL, KC_LGUI, KC_LALT, KC_TRNS, KC_TRNS, KC_SPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT)
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/gray_studio/space65/keymaps/default/keymap.c b/keyboards/gray_studio/space65/keymaps/default/keymap.c
index 17f44b3b6..7979bba1c 100644
--- a/keyboards/gray_studio/space65/keymaps/default/keymap.c
+++ b/keyboards/gray_studio/space65/keymaps/default/keymap.c
@@ -59,15 +59,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 }
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/gray_studio/think65/solder/solder.c b/keyboards/gray_studio/think65/solder/solder.c
index 48ed25b19..619aa2db8 100644
--- a/keyboards/gray_studio/think65/solder/solder.c
+++ b/keyboards/gray_studio/think65/solder/solder.c
@@ -28,13 +28,6 @@ void matrix_init_kb(void) {
  matrix_init_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);
-}
 bool led_update_kb(led_t led_state) {
  if(led_update_user(led_state)) {
    writePin(C7, !led_state.caps_lock);
diff --git a/keyboards/grid600/press/keymaps/default/keymap.c b/keyboards/grid600/press/keymaps/default/keymap.c
index f253c6921..ab42853e5 100644
--- a/keyboards/grid600/press/keymaps/default/keymap.c
+++ b/keyboards/grid600/press/keymaps/default/keymap.c
@@ -20,15 +20,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    KC_G,  KC_R,  KC_I, KC_D
  ),
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/gskt00/keymaps/default/keymap.c b/keyboards/gskt00/keymaps/default/keymap.c
index 792ba2f41..225d0224e 100755
--- a/keyboards/gskt00/keymaps/default/keymap.c
+++ b/keyboards/gskt00/keymaps/default/keymap.c
@@ -35,48 +35,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, KC_TRNS, RGB_TOG)
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-        return true;
-}
-void led_set_user(uint8_t usb_led) {
-        if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-                
-        } else {
-                
-        }
-        if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-                
-        } else {
-                
-        }
-        if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-                
-        } else {
-                
-        }
-        if (usb_led & (1 << USB_LED_COMPOSE)) {
-                
-        } else {
-                
-        }
-        if (usb_led & (1 << USB_LED_KANA)) {
-                
-        } else {
-                
-        }
-}
diff --git a/keyboards/hadron/ver2/ver2.c b/keyboards/hadron/ver2/ver2.c
index 739f06567..f00b4f26d 100644
--- a/keyboards/hadron/ver2/ver2.c
+++ b/keyboards/hadron/ver2/ver2.c
@@ -1,26 +1 @@
 #include "ver2.h"
-void matrix_init_kb(void) {
-        matrix_init_user();
-}
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-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/hadron/ver3/keymaps/default/keymap.c b/keyboards/hadron/ver3/keymaps/default/keymap.c
index e8082eb71..cec43e95d 100644
--- a/keyboards/hadron/ver3/keymaps/default/keymap.c
+++ b/keyboards/hadron/ver3/keymaps/default/keymap.c
@@ -260,10 +260,3 @@ bool music_mask_user(uint16_t keycode) {
      return true;
  }
 }
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
diff --git a/keyboards/halberd/halberd.c b/keyboards/halberd/halberd.c
index 8b59310a7..8ce55ca3e 100644
--- a/keyboards/halberd/halberd.c
+++ b/keyboards/halberd/halberd.c
@@ -14,30 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "halberd.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-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/halberd/keymaps/default/keymap.c b/keyboards/halberd/keymaps/default/keymap.c
index c79a81def..d9a872c1b 100644
--- a/keyboards/halberd/keymaps/default/keymap.c
+++ b/keyboards/halberd/keymaps/default/keymap.c
@@ -146,15 +146,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 }
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/handwired/412_64/412_64.c b/keyboards/handwired/412_64/412_64.c
index eaec54ade..4a8cc0069 100644
--- a/keyboards/handwired/412_64/412_64.c
+++ b/keyboards/handwired/412_64/412_64.c
@@ -1,29 +1 @@
 #include "412_64.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-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/handwired/412_64/keymaps/default/keymap.c b/keyboards/handwired/412_64/keymaps/default/keymap.c
index 27966eb9a..ac8f47bd0 100644
--- a/keyboards/handwired/412_64/keymaps/default/keymap.c
+++ b/keyboards/handwired/412_64/keymaps/default/keymap.c
@@ -70,19 +70,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  ),
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/handwired/aranck/aranck.c b/keyboards/handwired/aranck/aranck.c
index 2e67ec1da..62e36bdb4 100644
--- a/keyboards/handwired/aranck/aranck.c
+++ b/keyboards/handwired/aranck/aranck.c
@@ -14,30 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "aranck.h"
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-  matrix_init_user();
-}
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-  matrix_scan_user();
-}
-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/handwired/cmd60/cmd60.c b/keyboards/handwired/cmd60/cmd60.c
index 91bbbd453..20c359e5e 100644
--- a/keyboards/handwired/cmd60/cmd60.c
+++ b/keyboards/handwired/cmd60/cmd60.c
@@ -1,8 +1 @@
 #include "cmd60.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
diff --git a/keyboards/handwired/co60/keymaps/all_keys/keymap.c b/keyboards/handwired/co60/keymaps/all_keys/keymap.c
index 797b7ece3..b6124800e 100644
--- a/keyboards/handwired/co60/keymaps/all_keys/keymap.c
+++ b/keyboards/handwired/co60/keymaps/all_keys/keymap.c
@@ -30,19 +30,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    KC_LCTL, KC_LGUI, KC_LALT,          KC_ENT,           KC_HOME, KC_END, KC_INS,         KC_RALT, KC_RGUI,    KC_RIGHT, KC_RCTL
  )
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/handwired/co60/keymaps/default/keymap.c b/keyboards/handwired/co60/keymaps/default/keymap.c
index 35151c421..5736e9313 100644
--- a/keyboards/handwired/co60/keymaps/default/keymap.c
+++ b/keyboards/handwired/co60/keymaps/default/keymap.c
@@ -36,19 +36,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    _______, _______, _______,                            _______,                              _______,   _______,    _______,  _______
  )
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/handwired/co60/rev1/rev1.c b/keyboards/handwired/co60/rev1/rev1.c
index abdfa884d..6c68c515f 100644
--- a/keyboards/handwired/co60/rev1/rev1.c
+++ b/keyboards/handwired/co60/rev1/rev1.c
@@ -14,33 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "rev1.h"
-__attribute__ ((weak))
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
-__attribute__ ((weak))
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-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);
-}
-__attribute__ ((weak))
-void led_set_kb(uint8_t usb_led) {
-        // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-        led_set_user(usb_led);
-}
diff --git a/keyboards/handwired/dactyl/keymaps/default/keymap.c b/keyboards/handwired/dactyl/keymaps/default/keymap.c
index 47f5ba96b..3e013b19a 100644
--- a/keyboards/handwired/dactyl/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl/keymaps/default/keymap.c
@@ -148,12 +148,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 }
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-};
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {};
diff --git a/keyboards/handwired/dactyl_left/dactyl_left.c b/keyboards/handwired/dactyl_left/dactyl_left.c
index e6fe3402d..51a31afbd 100644
--- a/keyboards/handwired/dactyl_left/dactyl_left.c
+++ b/keyboards/handwired/dactyl_left/dactyl_left.c
@@ -14,38 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "dactyl_left.h"
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-/*
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-  matrix_init_user();
-}
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-  matrix_scan_user();
-}
-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/handwired/dactyl_left/keymaps/default/keymap.c b/keyboards/handwired/dactyl_left/keymaps/default/keymap.c
index 708a38089..631a979ef 100644
--- a/keyboards/handwired/dactyl_left/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_left/keymaps/default/keymap.c
@@ -49,9 +49,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
    }
    return true;
 }
-void matrix_init_user(void) {}
-void matrix_scan_user(void) {}
-void led_set_user(uint8_t usb_led) {}
diff --git a/keyboards/handwired/dactyl_promicro/dactyl_promicro.c b/keyboards/handwired/dactyl_promicro/dactyl_promicro.c
index 5d708cf48..23f4b13f4 100644
--- a/keyboards/handwired/dactyl_promicro/dactyl_promicro.c
+++ b/keyboards/handwired/dactyl_promicro/dactyl_promicro.c
@@ -1,12 +1 @@
 #include "dactyl_promicro.h"
-#ifdef SSD1306OLED
-void led_set_kb(uint8_t usb_led) {
-    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-    led_set_user(usb_led);
-}
-#endif
-void matrix_init_kb(void) {
-        matrix_init_user();
-};
-\ No newline at end of file
diff --git a/keyboards/handwired/daishi/daishi.c b/keyboards/handwired/daishi/daishi.c
index dcd2cd0d1..0442fc0dc 100644
--- a/keyboards/handwired/daishi/daishi.c
+++ b/keyboards/handwired/daishi/daishi.c
@@ -1,22 +1 @@
 #include "daishi.h"
-void matrix_init_kb(void) {     
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-  matrix_init_user();
-}
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-  matrix_scan_user();
-}
-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/handwired/datahand/keymaps/default/keymap.c b/keyboards/handwired/datahand/keymaps/default/keymap.c
index 8f4453559..fda9cc50a 100644
--- a/keyboards/handwired/datahand/keymaps/default/keymap.c
+++ b/keyboards/handwired/datahand/keymaps/default/keymap.c
@@ -302,10 +302,6 @@ void matrix_init_user(void) {
 #endif
 }
-void matrix_scan_user(void) {
-}
 void led_set_user(uint8_t usb_led) {
  lock_led_set(usb_led & (1<<USB_LED_NUM_LOCK), LED_NUM_LOCK);
  lock_led_set(usb_led & (1<<USB_LED_CAPS_LOCK), LED_CAPS_LOCK);
diff --git a/keyboards/handwired/datahand/matrix.c b/keyboards/handwired/datahand/matrix.c
index c3f6bd42f..d276c47b2 100644
--- a/keyboards/handwired/datahand/matrix.c
+++ b/keyboards/handwired/datahand/matrix.c
@@ -82,10 +82,6 @@ void matrix_print(void) {
  }
 }
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  return process_record_user(keycode, record);
-}
 static void select_row(uint8_t row) {
  /* Original 8051: P1 bits 0-3 (pins 1-4)
   * Teensy++: PE0, PB7, PD0, PD1
diff --git a/keyboards/handwired/evk/v1_3/v1_3.c b/keyboards/handwired/evk/v1_3/v1_3.c
index 62800bc88..718a33612 100644
--- a/keyboards/handwired/evk/v1_3/v1_3.c
+++ b/keyboards/handwired/evk/v1_3/v1_3.c
@@ -28,20 +28,6 @@ void matrix_init_kb(void) {
    matrix_init_user();
 }
-// looping keyboard codes
-// runs every cycle (a lot)
-/*void matrix_scan_kb(void) {
-    matrix_scan_user();
-}*/
-// per-action keyboard codes
-// runs for every key-press action, just before processing by the firmware
-/*bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-    return process_record_user(keycode, record);
-}*/
 // Set LED based on layer
 __attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) {
    writePin(D5, layer_state_cmp(state, 1));
diff --git a/keyboards/handwired/fivethirteen/fivethirteen.c b/keyboards/handwired/fivethirteen/fivethirteen.c
index 4c16e72eb..2d71560bf 100644
--- a/keyboards/handwired/fivethirteen/fivethirteen.c
+++ b/keyboards/handwired/fivethirteen/fivethirteen.c
@@ -1,8 +1 @@
 #include "fivethirteen.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
diff --git a/keyboards/handwired/frenchdev/keymaps/default/keymap.c b/keyboards/handwired/frenchdev/keymaps/default/keymap.c
index 2ef10ca11..1ead4e50e 100644
--- a/keyboards/handwired/frenchdev/keymaps/default/keymap.c
+++ b/keyboards/handwired/frenchdev/keymaps/default/keymap.c
@@ -205,9 +205,6 @@ void press_underscore(void) {
  if(shift_count > 0) register_code (KC_LSHIFT);
 }
-void matrix_init_user(void) {
-}
 // Bleah globals need to be initialized.
 uint8_t old_layer=_BASE;
diff --git a/keyboards/handwired/fruity60/fruity60.c b/keyboards/handwired/fruity60/fruity60.c
index d68b17955..064038267 100644
--- a/keyboards/handwired/fruity60/fruity60.c
+++ b/keyboards/handwired/fruity60/fruity60.c
@@ -14,38 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "fruity60.h"
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-/*
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-  matrix_init_user();
-}
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-  matrix_scan_user();
-}
-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/handwired/hacked_motospeed/hacked_motospeed.c b/keyboards/handwired/hacked_motospeed/hacked_motospeed.c
index 21643895d..f6a394b73 100644
--- a/keyboards/handwired/hacked_motospeed/hacked_motospeed.c
+++ b/keyboards/handwired/hacked_motospeed/hacked_motospeed.c
@@ -14,30 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "hacked_motospeed.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-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/handwired/hacked_motospeed/keymaps/default/keymap.c b/keyboards/handwired/hacked_motospeed/keymaps/default/keymap.c
index bdec8f246..be3d5fdbd 100644
--- a/keyboards/handwired/hacked_motospeed/keymaps/default/keymap.c
+++ b/keyboards/handwired/hacked_motospeed/keymaps/default/keymap.c
@@ -51,15 +51,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 }
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
-\ No newline at end of file
diff --git a/keyboards/handwired/hexon38/keymaps/default/keymap.c b/keyboards/handwired/hexon38/keymaps/default/keymap.c
index 65dfb4ca0..38ae903ec 100644
--- a/keyboards/handwired/hexon38/keymaps/default/keymap.c
+++ b/keyboards/handwired/hexon38/keymaps/default/keymap.c
@@ -187,8 +187,6 @@ void matrix_init_user(void) {
    g_pending.head = NULL;
 }
-void matrix_scan_user(void) {}
 /*
 a_ a-: emit a
 a_ b_ b- a-: emit SHIFT+b
diff --git a/keyboards/handwired/hnah40/hnah40.c b/keyboards/handwired/hnah40/hnah40.c
index 0f08136c2..88c81b7d4 100644
--- a/keyboards/handwired/hnah40/hnah40.c
+++ b/keyboards/handwired/hnah40/hnah40.c
@@ -14,30 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "hnah40.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-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/handwired/ibm122m/ibm122m.c b/keyboards/handwired/ibm122m/ibm122m.c
index 1c52b94ec..7ee099d25 100644
--- a/keyboards/handwired/ibm122m/ibm122m.c
+++ b/keyboards/handwired/ibm122m/ibm122m.c
@@ -14,30 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "ibm122m.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-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/handwired/ibm122m/keymaps/default/keymap.c b/keyboards/handwired/ibm122m/keymaps/default/keymap.c
index fc383498a..53cdcc1c1 100644
--- a/keyboards/handwired/ibm122m/keymaps/default/keymap.c
+++ b/keyboards/handwired/ibm122m/keymaps/default/keymap.c
@@ -27,20 +27,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    KC_NO,  KC_NO,   KC_LCTL, KC_LALT,                                        KC_SPC,                           KC_RALT, KC_RCTL,                     KC_DOWN,             KC_P0,            KC_PDOT
  ),
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/handwired/jn68m/jn68m.c b/keyboards/handwired/jn68m/jn68m.c
index b61b17aa9..415645f1b 100644
--- a/keyboards/handwired/jn68m/jn68m.c
+++ b/keyboards/handwired/jn68m/jn68m.c
@@ -14,24 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "jn68m.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-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/handwired/jn68m/keymaps/default/keymap.c b/keyboards/handwired/jn68m/keymaps/default/keymap.c
index 98eede94c..3860901dd 100644
--- a/keyboards/handwired/jn68m/keymaps/default/keymap.c
+++ b/keyboards/handwired/jn68m/keymaps/default/keymap.c
@@ -61,15 +61,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 }
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/handwired/jot50/jot50.c b/keyboards/handwired/jot50/jot50.c
index a1d2258a5..da04e862e 100644
--- a/keyboards/handwired/jot50/jot50.c
+++ b/keyboards/handwired/jot50/jot50.c
@@ -1,6 +1 @@
 #include "jot50.h"
-void matrix_init_kb(void) {
-        matrix_init_user();
-}
diff --git a/keyboards/handwired/jot50/keymaps/default/keymap.c b/keyboards/handwired/jot50/keymaps/default/keymap.c
index 7b674af52..2693fbff3 100644
--- a/keyboards/handwired/jot50/keymaps/default/keymap.c
+++ b/keyboards/handwired/jot50/keymaps/default/keymap.c
@@ -77,6 +77,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 layer_state_t layer_state_set_user(layer_state_t state) {
  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
 }
-void matrix_init_user(void) {
-}
diff --git a/keyboards/handwired/jotanck/jotanck.c b/keyboards/handwired/jotanck/jotanck.c
index caf0ad014..af650b129 100644
--- a/keyboards/handwired/jotanck/jotanck.c
+++ b/keyboards/handwired/jotanck/jotanck.c
@@ -1,9 +1,5 @@
 #include "jotanck.h"
-void matrix_init_kb(void) {
-    matrix_init_user();
-}
 void keyboard_pre_init_kb() {
    setPinOutput(JOTANCK_LED1);
    setPinOutput(JOTANCK_LED2);
diff --git a/keyboards/handwired/jotpad16/jotpad16.c b/keyboards/handwired/jotpad16/jotpad16.c
index 2f112a610..dfff7e167 100644
--- a/keyboards/handwired/jotpad16/jotpad16.c
+++ b/keyboards/handwired/jotpad16/jotpad16.c
@@ -1,10 +1,5 @@
 #include "jotpad16.h"
-void matrix_init_kb(void) {
-        matrix_init_user();
-}
 void keyboard_pre_init_kb() {
    setPinOutput(JOTPAD16_LED1);
    setPinOutput(JOTPAD16_LED2);
diff --git a/keyboards/handwired/kbod/kbod.c b/keyboards/handwired/kbod/kbod.c
index 9a12cae0d..c229d267b 100644
--- a/keyboards/handwired/kbod/kbod.c
+++ b/keyboards/handwired/kbod/kbod.c
@@ -1,28 +1 @@
 #include "kbod.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-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/handwired/lovelive9/lovelive9.c b/keyboards/handwired/lovelive9/lovelive9.c
index 1ec8ae052..c0198a8ea 100644
--- a/keyboards/handwired/lovelive9/lovelive9.c
+++ b/keyboards/handwired/lovelive9/lovelive9.c
@@ -1,7 +1 @@
 #include "lovelive9.h"
-void matrix_init_kb(void) {
-        matrix_init_user();
-}
diff --git a/keyboards/handwired/magicforce61/magicforce61.c b/keyboards/handwired/magicforce61/magicforce61.c
index 379395366..420bbb80f 100644
--- a/keyboards/handwired/magicforce61/magicforce61.c
+++ b/keyboards/handwired/magicforce61/magicforce61.c
@@ -1,8 +1 @@
 #include "magicforce61.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
diff --git a/keyboards/handwired/magicforce68/magicforce68.c b/keyboards/handwired/magicforce68/magicforce68.c
index 84b1007e2..8d74f1438 100644
--- a/keyboards/handwired/magicforce68/magicforce68.c
+++ b/keyboards/handwired/magicforce68/magicforce68.c
@@ -1,8 +1 @@
 #include "magicforce68.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
diff --git a/keyboards/handwired/mechboards_micropad/keymaps/default/keymap.c b/keyboards/handwired/mechboards_micropad/keymaps/default/keymap.c
index 41784c520..7d8371841 100644
--- a/keyboards/handwired/mechboards_micropad/keymaps/default/keymap.c
+++ b/keyboards/handwired/mechboards_micropad/keymaps/default/keymap.c
@@ -74,11 +74,3 @@ void matrix_init_user(void) {
  setPinOutput(F6);
  writePinLow(F6);
 }
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/handwired/mechboards_micropad/mechboards_micropad.c b/keyboards/handwired/mechboards_micropad/mechboards_micropad.c
index d4c8fa9b9..662af8815 100644
--- a/keyboards/handwired/mechboards_micropad/mechboards_micropad.c
+++ b/keyboards/handwired/mechboards_micropad/mechboards_micropad.c
@@ -14,30 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "mechboards_micropad.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-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/handwired/ms_sculpt_mobile/keymaps/default/keymap.c b/keyboards/handwired/ms_sculpt_mobile/keymaps/default/keymap.c
index d4d0f33e9..860f6d311 100644
--- a/keyboards/handwired/ms_sculpt_mobile/keymaps/default/keymap.c
+++ b/keyboards/handwired/ms_sculpt_mobile/keymaps/default/keymap.c
@@ -26,19 +26,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, RSFT(KC_1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT  \
  )
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/handwired/numpad20/numpad20.c b/keyboards/handwired/numpad20/numpad20.c
index 101cf2cb4..50766b785 100644
--- a/keyboards/handwired/numpad20/numpad20.c
+++ b/keyboards/handwired/numpad20/numpad20.c
@@ -1,8 +1 @@
 #include "numpad20.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
diff --git a/keyboards/handwired/ortho5x13/ortho5x13.c b/keyboards/handwired/ortho5x13/ortho5x13.c
index cf8352cc4..525e1ba11 100644
--- a/keyboards/handwired/ortho5x13/ortho5x13.c
+++ b/keyboards/handwired/ortho5x13/ortho5x13.c
@@ -1,8 +1 @@
 #include "ortho5x13.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
diff --git a/keyboards/handwired/owlet60/keymaps/default/keymap.c b/keyboards/handwired/owlet60/keymaps/default/keymap.c
index b4d0360db..7dfc7bcaf 100644
--- a/keyboards/handwired/owlet60/keymaps/default/keymap.c
+++ b/keyboards/handwired/owlet60/keymaps/default/keymap.c
@@ -60,15 +60,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 }
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/handwired/owlet60/keymaps/oled_testing/keymap.c b/keyboards/handwired/owlet60/keymaps/oled_testing/keymap.c
index 9e9697658..27a54d80f 100644
--- a/keyboards/handwired/owlet60/keymaps/oled_testing/keymap.c
+++ b/keyboards/handwired/owlet60/keymaps/oled_testing/keymap.c
@@ -61,18 +61,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  return true;
 }
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
 #ifdef OLED_ENABLE
 oled_rotation_t oled_init_user(oled_rotation_t rotation) {
  //return OLED_ROTATION_180;
diff --git a/keyboards/handwired/owlet60/owlet60.c b/keyboards/handwired/owlet60/owlet60.c
index 42d24a291..079beb8e4 100644
--- a/keyboards/handwired/owlet60/owlet60.c
+++ b/keyboards/handwired/owlet60/owlet60.c
@@ -14,40 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "owlet60.h"
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-/*
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-  matrix_init_user();
-  
-}
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-  matrix_scan_user();
-  oled_task_user();
-}
-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/handwired/pilcrow/keymaps/default/keymap.c b/keyboards/handwired/pilcrow/keymaps/default/keymap.c
index 617ff4f6c..33a5c2ac1 100644
--- a/keyboards/handwired/pilcrow/keymaps/default/keymap.c
+++ b/keyboards/handwired/pilcrow/keymaps/default/keymap.c
@@ -52,19 +52,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    _______, _______, _______, _______, KC_BTN1, KC_BTN2, _______, _______, _______, _______  \
  )
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void led_set_user(uint8_t usb_led) {
-}
-\ No newline at end of file
diff --git a/keyboards/handwired/pilcrow/pilcrow.c b/keyboards/handwired/pilcrow/pilcrow.c
index c8243df7b..03db58bb2 100644
--- a/keyboards/handwired/pilcrow/pilcrow.c
+++ b/keyboards/handwired/pilcrow/pilcrow.c
@@ -1,28 +1 @@
 #include "pilcrow.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-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/handwired/prime_exl/keymaps/default/keymap.c b/keyboards/handwired/prime_exl/keymaps/default/keymap.c
index 7cf919708..324d60014 100644
--- a/keyboards/handwired/prime_exl/keymaps/default/keymap.c
+++ b/keyboards/handwired/prime_exl/keymaps/default/keymap.c
@@ -106,11 +106,6 @@ void matrix_init_user(void) {
  writePinHigh(B5);
 }
-void matrix_scan_user(void) {
-}
 void led_set_user(uint8_t usb_led) {
  if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) {
    writePinHigh(B6);
diff --git a/keyboards/handwired/prime_exl/keymaps/via/keymap.c b/keyboards/handwired/prime_exl/keymaps/via/keymap.c
index c707e8a20..0e6802996 100644
--- a/keyboards/handwired/prime_exl/keymaps/via/keymap.c
+++ b/keyboards/handwired/prime_exl/keymaps/via/keymap.c
@@ -64,11 +64,6 @@ void matrix_init_user(void) {
  writePinHigh(B5);
 }
-void matrix_scan_user(void) {
-}
 void led_set_user(uint8_t usb_led) {
  if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) {
    writePinHigh(B6);
diff --git a/keyboards/handwired/prime_exl/prime_exl.c b/keyboards/handwired/prime_exl/prime_exl.c
index bae606ffb..e85991c53 100644
--- a/keyboards/handwired/prime_exl/prime_exl.c
+++ b/keyboards/handwired/prime_exl/prime_exl.c
@@ -14,31 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "prime_exl.h"
-/*
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-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/handwired/promethium/promethium.c b/keyboards/handwired/promethium/promethium.c
index 96bcf3ce1..8eb1680d8 100644
--- a/keyboards/handwired/promethium/promethium.c
+++ b/keyboards/handwired/promethium/promethium.c
@@ -22,10 +22,6 @@ __attribute__ ((weak))
 void battery_poll(uint8_t level) {
 }
-void matrix_init_kb(void) {
-        matrix_init_user();
-}
 void matrix_scan_kb(void) {
    static uint16_t counter = BATTERY_POLL;
    counter++;
@@ -37,12 +33,3 @@ void matrix_scan_kb(void) {
    matrix_scan_user();
 }
-void led_set_kb(uint8_t usb_led) {
-    led_set_user(usb_led);
-}
-__attribute__ ((weak))
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/handwired/qc60/proto/proto.c b/keyboards/handwired/qc60/proto/proto.c
index a6031d772..fe08df859 100644
--- a/keyboards/handwired/qc60/proto/proto.c
+++ b/keyboards/handwired/qc60/proto/proto.c
@@ -15,7 +15,3 @@
 */
 #include "qc60.h"
-void matrix_init_kb(void) {
-    matrix_init_user();
-};
diff --git a/keyboards/handwired/reddot/reddot.c b/keyboards/handwired/reddot/reddot.c
index 4e1efc06c..1c4720b5c 100755
--- a/keyboards/handwired/reddot/reddot.c
+++ b/keyboards/handwired/reddot/reddot.c
@@ -1,7 +1 @@
 #include "reddot.h"
-void matrix_init_kb(void) {
-        matrix_init_user();
-}
diff --git a/keyboards/handwired/sick68/keymaps/default/keymap.c b/keyboards/handwired/sick68/keymaps/default/keymap.c
index f25be1907..6d6030582 100644
--- a/keyboards/handwired/sick68/keymaps/default/keymap.c
+++ b/keyboards/handwired/sick68/keymaps/default/keymap.c
@@ -64,18 +64,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        _______, _______, _______,                            _______,                   _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
    ),
 };
-/*
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool led_update_user(led_t led_state) {
-    return true;
-}
-*/
diff --git a/keyboards/handwired/space_oddity/keymaps/default/keymap.c b/keyboards/handwired/space_oddity/keymaps/default/keymap.c
index 8adb15cfd..8a6f24587 100644
--- a/keyboards/handwired/space_oddity/keymaps/default/keymap.c
+++ b/keyboards/handwired/space_oddity/keymaps/default/keymap.c
@@ -143,12 +143,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  )
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
 // Simple macro ideas follow. Each of them is designed to give you a quick way to create pairs of
 // delimiters and then position the cursor between them, much like Emacs' ParEdit does. This way,
 // you can have some convenient coding "helpers" even when not using Emacs. It is also nice for
@@ -186,37 +180,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  return true;
 }
-void led_set_user(uint8_t usb_led) {
-  if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_COMPOSE)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_KANA)) {
-  } else {
-  }
-}
diff --git a/keyboards/handwired/steamvan/keymaps/default/keymap.c b/keyboards/handwired/steamvan/keymaps/default/keymap.c
index e796f0940..4f11844a4 100644
--- a/keyboards/handwired/steamvan/keymaps/default/keymap.c
+++ b/keyboards/handwired/steamvan/keymaps/default/keymap.c
@@ -75,19 +75,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    _______, KC_LSFT, KC_B,                      KC_SPC,  KC_C,                      _______, _______, _______
  )
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/handwired/sticc14/sticc14.c b/keyboards/handwired/sticc14/sticc14.c
index 8edd2bda6..50c3a4a4b 100644
--- a/keyboards/handwired/sticc14/sticc14.c
+++ b/keyboards/handwired/sticc14/sticc14.c
@@ -14,38 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "sticc14.h"
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-/*
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-  matrix_init_user();
-}
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-  matrix_scan_user();
-}
-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/handwired/tennie/tennie.c b/keyboards/handwired/tennie/tennie.c
index e1ceaf153..508430ba0 100644
--- a/keyboards/handwired/tennie/tennie.c
+++ b/keyboards/handwired/tennie/tennie.c
@@ -15,31 +15,7 @@
 */
 #include "tennie.h"
-void matrix_init_kb(void) {
-        matrix_init_user();
-}
 void matrix_post_init(void) {
        rgblight_enable_noeeprom();
        keyboard_post_init_user();
 }
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-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/handwired/terminus_mini/keymaps/default/keymap.c b/keyboards/handwired/terminus_mini/keymaps/default/keymap.c
index 78578a33e..352ab99db 100644
--- a/keyboards/handwired/terminus_mini/keymaps/default/keymap.c
+++ b/keyboards/handwired/terminus_mini/keymaps/default/keymap.c
@@ -265,16 +265,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 }
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/handwired/terminus_mini/terminus_mini.c b/keyboards/handwired/terminus_mini/terminus_mini.c
index 58edca768..295fa4c5a 100644
--- a/keyboards/handwired/terminus_mini/terminus_mini.c
+++ b/keyboards/handwired/terminus_mini/terminus_mini.c
@@ -14,30 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "terminus_mini.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-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/handwired/trackpoint/trackpoint.c b/keyboards/handwired/trackpoint/trackpoint.c
index 124995a64..e1b144241 100644
--- a/keyboards/handwired/trackpoint/trackpoint.c
+++ b/keyboards/handwired/trackpoint/trackpoint.c
@@ -1,5 +1 @@
 #include "trackpoint.h"
-void matrix_init_kb(void) {
-}
diff --git a/keyboards/handwired/wulkan/wulkan.c b/keyboards/handwired/wulkan/wulkan.c
index 5409fa5b5..72024175d 100644
--- a/keyboards/handwired/wulkan/wulkan.c
+++ b/keyboards/handwired/wulkan/wulkan.c
@@ -1,6 +1 @@
 #include "wulkan.h"
-void matrix_init_kb(void) {
-  matrix_init_user();
-}
diff --git a/keyboards/handwired/xealous/rev1/rev1.c b/keyboards/handwired/xealous/rev1/rev1.c
index 3e51421d8..ad9f298c1 100644
--- a/keyboards/handwired/xealous/rev1/rev1.c
+++ b/keyboards/handwired/xealous/rev1/rev1.c
@@ -1,6 +1,2 @@
 #include "quantum.h"
 #include "rev1.h"
-void matrix_init_kb(void) {
-        matrix_init_user();
-}
diff --git a/keyboards/handwired/xealousbrown/xealousbrown.c b/keyboards/handwired/xealousbrown/xealousbrown.c
index 57c69bd31..dbfa85342 100644
--- a/keyboards/handwired/xealousbrown/xealousbrown.c
+++ b/keyboards/handwired/xealousbrown/xealousbrown.c
@@ -15,15 +15,6 @@
 */
 #include "xealousbrown.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
 #ifdef BENCHMARK_MATRIX
 #    include "timer.h"
 #    include <stdint.h>
diff --git a/keyboards/hecomi/hecomi.c b/keyboards/hecomi/hecomi.c
index 9d0d93fa1..d52754711 100644
--- a/keyboards/hecomi/hecomi.c
+++ b/keyboards/hecomi/hecomi.c
@@ -15,30 +15,3 @@
 */
 #include "hecomi.h"
 #include "split_util.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-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/hecomi/keymaps/default/keymap.c b/keyboards/hecomi/keymaps/default/keymap.c
index 312799f73..465b4ae5c 100644
--- a/keyboards/hecomi/keymaps/default/keymap.c
+++ b/keyboards/hecomi/keymaps/default/keymap.c
@@ -91,15 +91,3 @@ layer_state_t layer_state_set_user(layer_state_t state)
        }
        return state;
 }
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/helix/pico/pico.c b/keyboards/helix/pico/pico.c
index 12b8ae9ef..315b35a7a 100644
--- a/keyboards/helix/pico/pico.c
+++ b/keyboards/helix/pico/pico.c
@@ -11,11 +11,6 @@ uint8_t is_master = false;
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
        return process_record_gfx(keycode,record) && 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);
-}
 #endif
 void matrix_init_kb(void) {
diff --git a/keyboards/helix/rev1/rev1.c b/keyboards/helix/rev1/rev1.c
index 309cca010..d053f0de1 100644
--- a/keyboards/helix/rev1/rev1.c
+++ b/keyboards/helix/rev1/rev1.c
@@ -7,22 +7,4 @@
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
        return process_record_gfx(keycode,record) && 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);
-}
 #endif
-void matrix_init_kb(void) {
-    // // green led on
-    // DDRD |= (1<<5);
-    // PORTD &= ~(1<<5);
-    // // orange led on
-    // DDRB |= (1<<0);
-    // PORTB &= ~(1<<0);
-        matrix_init_user();
-};
diff --git a/keyboards/helix/rev2/rev2.c b/keyboards/helix/rev2/rev2.c
index d2b3143d8..b92580f9f 100644
--- a/keyboards/helix/rev2/rev2.c
+++ b/keyboards/helix/rev2/rev2.c
@@ -11,11 +11,6 @@ uint8_t is_master = false;
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
        return process_record_gfx(keycode,record) && 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);
-}
 #endif
 bool is_mac_mode(void) {
diff --git a/keyboards/helix/rev3_4rows/keymaps/default/keymap.c b/keyboards/helix/rev3_4rows/keymaps/default/keymap.c
index 1544a4fff..408e7125c 100644
--- a/keyboards/helix/rev3_4rows/keymaps/default/keymap.c
+++ b/keyboards/helix/rev3_4rows/keymaps/default/keymap.c
@@ -178,17 +178,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 }
-/*
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool led_update_user(led_t led_state) {
-    return true;
-}
-*/
diff --git a/keyboards/helix/rev3_4rows/keymaps/via/keymap.c b/keyboards/helix/rev3_4rows/keymaps/via/keymap.c
index 2cfb1152c..6cc9aedb0 100644
--- a/keyboards/helix/rev3_4rows/keymaps/via/keymap.c
+++ b/keyboards/helix/rev3_4rows/keymaps/via/keymap.c
@@ -165,17 +165,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 }
-/*
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool led_update_user(led_t led_state) {
-    return true;
-}
-*/
diff --git a/keyboards/helix/rev3_5rows/keymaps/default/keymap.c b/keyboards/helix/rev3_5rows/keymaps/default/keymap.c
index 6dde7fed5..09132f75e 100644
--- a/keyboards/helix/rev3_5rows/keymaps/default/keymap.c
+++ b/keyboards/helix/rev3_5rows/keymaps/default/keymap.c
@@ -188,17 +188,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 }
-/*
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool led_update_user(led_t led_state) {
-    return true;
-}
-*/
diff --git a/keyboards/helix/rev3_5rows/keymaps/via/keymap.c b/keyboards/helix/rev3_5rows/keymaps/via/keymap.c
index 8097141dd..b1d17c50f 100644
--- a/keyboards/helix/rev3_5rows/keymaps/via/keymap.c
+++ b/keyboards/helix/rev3_5rows/keymaps/via/keymap.c
@@ -175,17 +175,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 }
-/*
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool led_update_user(led_t led_state) {
-    return true;
-}
-*/
diff --git a/keyboards/hineybush/h87a/h87a.c b/keyboards/hineybush/h87a/h87a.c
index a3f511ffc..37c172569 100644
--- a/keyboards/hineybush/h87a/h87a.c
+++ b/keyboards/hineybush/h87a/h87a.c
@@ -23,26 +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_set_kb(uint8_t usb_led) {
-        // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-        led_set_user(usb_led);
-}
 bool led_update_kb(led_t led_state) {
    if(led_update_user(led_state)) {
        writePin(D5, !led_state.caps_lock);
diff --git a/keyboards/hineybush/h87a/keymaps/default/keymap.c b/keyboards/hineybush/h87a/keymaps/default/keymap.c
index abca0b199..c26a54527 100644
--- a/keyboards/hineybush/h87a/keymaps/default/keymap.c
+++ b/keyboards/hineybush/h87a/keymaps/default/keymap.c
@@ -34,15 +34,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
diff --git a/keyboards/hineybush/h88/h88.c b/keyboards/hineybush/h88/h88.c
index adfb64bef..b88722db6 100644
--- a/keyboards/hineybush/h88/h88.c
+++ b/keyboards/hineybush/h88/h88.c
@@ -23,26 +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_set_kb(uint8_t usb_led) {
-        // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-        led_set_user(usb_led);
-}
 bool led_update_kb(led_t led_state) {
    if(led_update_user(led_state)) {
        writePin(D5, !led_state.caps_lock);
diff --git a/keyboards/hineybush/h88/keymaps/default/keymap.c b/keyboards/hineybush/h88/keymaps/default/keymap.c
index 2e0251ee2..c4f1cf4e9 100644
--- a/keyboards/hineybush/h88/keymaps/default/keymap.c
+++ b/keyboards/hineybush/h88/keymaps/default/keymap.c
@@ -34,17 +34,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
diff --git a/keyboards/hineybush/hbcp/hbcp.c b/keyboards/hineybush/hbcp/hbcp.c
index e2513023e..562dbb3e9 100644
--- a/keyboards/hineybush/hbcp/hbcp.c
+++ b/keyboards/hineybush/hbcp/hbcp.c
@@ -34,39 +34,6 @@
 // #define HSV_custom_color H, S, V
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-  matrix_init_user();
-}
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-  matrix_scan_user();
-}
-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 eeconfig_init_kb(void) {  // EEPROM is getting reset!
  rgblight_enable(); // Enable RGB by default
  rgblight_sethsv(0, 255, 128);  // Set default HSV - red hue, full saturation, medium brightness
diff --git a/keyboards/hineybush/hbcp/keymaps/default/keymap.c b/keyboards/hineybush/hbcp/keymaps/default/keymap.c
index b8ab480ba..9bc9ec8e8 100644
--- a/keyboards/hineybush/hbcp/keymaps/default/keymap.c
+++ b/keyboards/hineybush/hbcp/keymaps/default/keymap.c
@@ -74,11 +74,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 }
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
diff --git a/keyboards/hineybush/hineyg80/keymaps/default/keymap.c b/keyboards/hineybush/hineyg80/keymaps/default/keymap.c
index 13d0c8955..c87dd24bd 100644
--- a/keyboards/hineybush/hineyg80/keymaps/default/keymap.c
+++ b/keyboards/hineybush/hineyg80/keymaps/default/keymap.c
@@ -40,19 +40,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    KC_TRNS,   KC_TRNS,   KC_TRNS,          KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                               KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS          
    ),
 };
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/hineybush/hineyg80/keymaps/wkl/keymap.c b/keyboards/hineybush/hineyg80/keymaps/wkl/keymap.c
index a1255e9cc..d5664a97e 100644
--- a/keyboards/hineybush/hineyg80/keymaps/wkl/keymap.c
+++ b/keyboards/hineybush/hineyg80/keymaps/wkl/keymap.c
@@ -42,19 +42,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    ______,      ______,          ______,  ______,    ______,                               ______,   ______,   ______,    ______,    ______          
    ),
 };
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
-\ No newline at end of file
diff --git a/keyboards/hineybush/sm68/sm68.c b/keyboards/hineybush/sm68/sm68.c
index 5aa3c85bb..54fd8ab0a 100644
--- a/keyboards/hineybush/sm68/sm68.c
+++ b/keyboards/hineybush/sm68/sm68.c
@@ -15,36 +15,3 @@
 */
 #include "sm68.h"
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-/*
-void matrix_init_kb(void) {
-    // put your keyboard start-up code here
-    // runs once when the firmware starts up
-    matrix_init_user();
-}
-void matrix_scan_kb(void) {
-    // put your looping keyboard code here
-    // runs every cycle (a lot)
-    matrix_scan_user();
-}
-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/hotdox/keymaps/default/keymap.c b/keyboards/hotdox/keymaps/default/keymap.c
index daba6c300..3d6f040f3 100644
--- a/keyboards/hotdox/keymaps/default/keymap.c
+++ b/keyboards/hotdox/keymaps/default/keymap.c
@@ -160,12 +160,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  return true;
 }
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-};
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
diff --git a/keyboards/hotdox/keymaps/via/keymap.c b/keyboards/hotdox/keymaps/via/keymap.c
index 0a3d41cf7..5cfad55dd 100644
--- a/keyboards/hotdox/keymaps/via/keymap.c
+++ b/keyboards/hotdox/keymaps/via/keymap.c
@@ -162,12 +162,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  return true;
 }
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-};
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
diff --git a/keyboards/hs60/v1/keymaps/ansi/keymap.c b/keyboards/hs60/v1/keymaps/ansi/keymap.c
index 923af9e2c..bf3d4aea2 100644
--- a/keyboards/hs60/v1/keymaps/ansi/keymap.c
+++ b/keyboards/hs60/v1/keymaps/ansi/keymap.c
@@ -32,15 +32,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    KC_TRNS,            RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  RGB_SPI,  RGB_SPD,            KC_TRNS,\
    KC_VOLU,  KC_VOLD,  KC_MUTE,                                KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS),
 };
-void matrix_init_user(void) {
-  //user initialization
-}
-void matrix_scan_user(void) {
-  //user matrix
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-\ No newline at end of file
diff --git a/keyboards/hs60/v1/keymaps/default/keymap.c b/keyboards/hs60/v1/keymaps/default/keymap.c
index 953172c73..d30ce56ae 100644
--- a/keyboards/hs60/v1/keymaps/default/keymap.c
+++ b/keyboards/hs60/v1/keymaps/default/keymap.c
@@ -32,15 +32,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    KC_TRNS,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  RGB_SPI,  RGB_SPD,  KC_TRNS,            KC_TRNS,\
    KC_VOLU,  KC_VOLD,  KC_MUTE,                                KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS),
 };
-void matrix_init_user(void) {
-  //user initialization
-}
-void matrix_scan_user(void) {
-  //user matrix
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
diff --git a/keyboards/hs60/v1/v1.c b/keyboards/hs60/v1/v1.c
index 58b19b640..d2bb8011f 100644
--- a/keyboards/hs60/v1/v1.c
+++ b/keyboards/hs60/v1/v1.c
@@ -378,20 +378,6 @@ 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 led_set_kb(uint8_t usb_led) {
-        //backlight_set_indicator_state(usb_led);
-}
 void suspend_power_down_kb(void)
 {
    rgb_matrix_set_suspend_state(true);
diff --git a/keyboards/hs60/v2/ansi/keymaps/default/keymap.c b/keyboards/hs60/v2/ansi/keymaps/default/keymap.c
index ba649470b..5ccc97795 100644
--- a/keyboards/hs60/v2/ansi/keymaps/default/keymap.c
+++ b/keyboards/hs60/v2/ansi/keymaps/default/keymap.c
@@ -46,15 +46,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,\
    KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS),
 };
-void matrix_init_user(void) {
-  //user initialization
-}
-void matrix_scan_user(void) {
-  //user matrix
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-\ No newline at end of file
diff --git a/keyboards/hs60/v2/ansi/keymaps/via/keymap.c b/keyboards/hs60/v2/ansi/keymaps/via/keymap.c
index ba649470b..5ccc97795 100644
--- a/keyboards/hs60/v2/ansi/keymaps/via/keymap.c
+++ b/keyboards/hs60/v2/ansi/keymaps/via/keymap.c
@@ -46,15 +46,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,\
    KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS),
 };
-void matrix_init_user(void) {
-  //user initialization
-}
-void matrix_scan_user(void) {
-  //user matrix
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-\ No newline at end of file
diff --git a/keyboards/hs60/v2/hhkb/keymaps/default/keymap.c b/keyboards/hs60/v2/hhkb/keymaps/default/keymap.c
index 9641eedb4..7c48d0bc2 100644
--- a/keyboards/hs60/v2/hhkb/keymaps/default/keymap.c
+++ b/keyboards/hs60/v2/hhkb/keymaps/default/keymap.c
@@ -46,15 +46,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,\
    KC_TRNS, KC_TRNS, KC_TRNS,                 KC_TRNS,                                        KC_TRNS,  KC_TRNS,            KC_TRNS          ),
 };
-void matrix_init_user(void) {
-  //user initialization
-}
-void matrix_scan_user(void) {
-  //user matrix
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-\ No newline at end of file
diff --git a/keyboards/hs60/v2/hhkb/keymaps/via/keymap.c b/keyboards/hs60/v2/hhkb/keymaps/via/keymap.c
index 9641eedb4..7c48d0bc2 100644
--- a/keyboards/hs60/v2/hhkb/keymaps/via/keymap.c
+++ b/keyboards/hs60/v2/hhkb/keymaps/via/keymap.c
@@ -46,15 +46,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,\
    KC_TRNS, KC_TRNS, KC_TRNS,                 KC_TRNS,                                        KC_TRNS,  KC_TRNS,            KC_TRNS          ),
 };
-void matrix_init_user(void) {
-  //user initialization
-}
-void matrix_scan_user(void) {
-  //user matrix
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-\ No newline at end of file
diff --git a/keyboards/hs60/v2/iso/keymaps/default/keymap.c b/keyboards/hs60/v2/iso/keymaps/default/keymap.c
index c1e575769..1b1e5ea4e 100644
--- a/keyboards/hs60/v2/iso/keymaps/default/keymap.c
+++ b/keyboards/hs60/v2/iso/keymaps/default/keymap.c
@@ -46,15 +46,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,\
    KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS),
 };
-void matrix_init_user(void) {
-  //user initialization
-}
-void matrix_scan_user(void) {
-  //user matrix
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-\ No newline at end of file
diff --git a/keyboards/hs60/v2/iso/keymaps/via/keymap.c b/keyboards/hs60/v2/iso/keymaps/via/keymap.c
index c1e575769..1b1e5ea4e 100644
--- a/keyboards/hs60/v2/iso/keymaps/via/keymap.c
+++ b/keyboards/hs60/v2/iso/keymaps/via/keymap.c
@@ -46,15 +46,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,\
    KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS),
 };
-void matrix_init_user(void) {
-  //user initialization
-}
-void matrix_scan_user(void) {
-  //user matrix
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-\ No newline at end of file
diff --git a/keyboards/idobo/idobo.c b/keyboards/idobo/idobo.c
index 3f870835e..ccf654f87 100644
--- a/keyboards/idobo/idobo.c
+++ b/keyboards/idobo/idobo.c
@@ -14,30 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "idobo.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-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/idobo/keymaps/default/keymap.c b/keyboards/idobo/keymaps/default/keymap.c
index f54e3359b..1aadfb452 100644
--- a/keyboards/idobo/keymaps/default/keymap.c
+++ b/keyboards/idobo/keymaps/default/keymap.c
@@ -52,15 +52,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 }
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/illuminati/is0/is0.c b/keyboards/illuminati/is0/is0.c
index 920277e6c..770a47f0e 100644
--- a/keyboards/illuminati/is0/is0.c
+++ b/keyboards/illuminati/is0/is0.c
@@ -14,38 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "is0.h"
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-/*
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-  matrix_init_user();
-}
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-  matrix_scan_user();
-}
-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/illuminati/is0/keymaps/ctrlaltdel/keymap.c b/keyboards/illuminati/is0/keymaps/ctrlaltdel/keymap.c
index e38df1e22..4ba60a995 100644
--- a/keyboards/illuminati/is0/keymaps/ctrlaltdel/keymap.c
+++ b/keyboards/illuminati/is0/keymaps/ctrlaltdel/keymap.c
@@ -20,19 +20,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    LCTL(LALT(KC_DEL))
  ),
 };
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/illuminati/is0/keymaps/default/keymap.c b/keyboards/illuminati/is0/keymaps/default/keymap.c
index e82a965d9..99971f3a6 100644
--- a/keyboards/illuminati/is0/keymaps/default/keymap.c
+++ b/keyboards/illuminati/is0/keymaps/default/keymap.c
@@ -38,15 +38,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 }
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/ivy/keymaps/default/keymap.c b/keyboards/ivy/keymaps/default/keymap.c
index c250fbdf8..0215a3e6c 100644
--- a/keyboards/ivy/keymaps/default/keymap.c
+++ b/keyboards/ivy/keymaps/default/keymap.c
@@ -39,7 +39,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 )
 };
-void matrix_init_user(void) {
-}
diff --git a/keyboards/ivy/rev1/rev1.c b/keyboards/ivy/rev1/rev1.c
index c099e32c4..007ef6725 100644
--- a/keyboards/ivy/rev1/rev1.c
+++ b/keyboards/ivy/rev1/rev1.c
@@ -1,5 +1 @@
 #include "ivy.h"
-void matrix_init_kb(void) {
-        matrix_init_user();
-};
diff --git a/keyboards/jae/j01/j01.c b/keyboards/jae/j01/j01.c
index 351ddc495..8763f8f0d 100644
--- a/keyboards/jae/j01/j01.c
+++ b/keyboards/jae/j01/j01.c
@@ -29,20 +29,6 @@ void matrix_init_kb(void) {
    setPinOutput(E6);
 }
-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);
-}
 bool led_update_kb(led_t led_state) {
    if(led_update_user(led_state)) {
        writePin(E6, !led_state.caps_lock);
diff --git a/keyboards/kagamidget/kagamidget.c b/keyboards/kagamidget/kagamidget.c
index 1f790c9e7..e68235701 100644
--- a/keyboards/kagamidget/kagamidget.c
+++ b/keyboards/kagamidget/kagamidget.c
@@ -14,30 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "kagamidget.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-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/kagamidget/keymaps/default/keymap.c b/keyboards/kagamidget/keymaps/default/keymap.c
index 3d9a95470..cb1ee4c63 100644
--- a/keyboards/kagamidget/keymaps/default/keymap.c
+++ b/keyboards/kagamidget/keymaps/default/keymap.c
@@ -100,19 +100,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
  )
 };
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/kbdfans/kbd19x/keymaps/default/keymap.c b/keyboards/kbdfans/kbd19x/keymaps/default/keymap.c
index c80607211..e06948fcc 100644
--- a/keyboards/kbdfans/kbd19x/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbd19x/keymaps/default/keymap.c
@@ -34,19 +34,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    _______, _______, _______,                            _______,                   _______, _______, _______,       _______, _______, _______,    _______, _______           \
  ),
 };
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/kbdfans/kbd4x/kbd4x.c b/keyboards/kbdfans/kbd4x/kbd4x.c
index 84ada250d..c7e579793 100644
--- a/keyboards/kbdfans/kbd4x/kbd4x.c
+++ b/keyboards/kbdfans/kbd4x/kbd4x.c
@@ -14,30 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "kbd4x.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-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/kbd4x/keymaps/default/keymap.c b/keyboards/kbdfans/kbd4x/keymaps/default/keymap.c
index ad49b3799..1a79d7391 100644
--- a/keyboards/kbdfans/kbd4x/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbd4x/keymaps/default/keymap.c
@@ -37,16 +37,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    ___,      ___,     ___,     ___,     ___,     ___,        ___,  ___,  ___,  ___,  ___
  ),
 };
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/kbdfans/kbd66/kbd66.c b/keyboards/kbdfans/kbd66/kbd66.c
index 7a84b6368..c4f56c171 100644
--- a/keyboards/kbdfans/kbd66/kbd66.c
+++ b/keyboards/kbdfans/kbd66/kbd66.c
@@ -14,30 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "kbd66.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-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/kbd66/keymaps/ansi/keymap.c b/keyboards/kbdfans/kbd66/keymaps/ansi/keymap.c
index 984d68971..7900a2ebe 100644
--- a/keyboards/kbdfans/kbd66/keymaps/ansi/keymap.c
+++ b/keyboards/kbdfans/kbd66/keymaps/ansi/keymap.c
@@ -65,19 +65,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 )
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/kbdfans/kbd66/keymaps/default/keymap.c b/keyboards/kbdfans/kbd66/keymaps/default/keymap.c
index 60ef36390..d878ed151 100644
--- a/keyboards/kbdfans/kbd66/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbd66/keymaps/default/keymap.c
@@ -65,19 +65,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 )
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/kbdfans/kbd66/keymaps/iso/keymap.c b/keyboards/kbdfans/kbd66/keymaps/iso/keymap.c
index b330abaf9..86f0bbbfd 100644
--- a/keyboards/kbdfans/kbd66/keymaps/iso/keymap.c
+++ b/keyboards/kbdfans/kbd66/keymaps/iso/keymap.c
@@ -65,19 +65,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 )
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/kbdfans/kbd67/hotswap/hotswap.c b/keyboards/kbdfans/kbd67/hotswap/hotswap.c
index e6999f6af..60808979c 100644
--- a/keyboards/kbdfans/kbd67/hotswap/hotswap.c
+++ b/keyboards/kbdfans/kbd67/hotswap/hotswap.c
@@ -14,30 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "hotswap.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-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/kbd67/hotswap/keymaps/default/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/default/keymap.c
index 536963011..4c645c7cd 100644
--- a/keyboards/kbdfans/kbd67/hotswap/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/default/keymap.c
@@ -58,15 +58,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 }
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/mkii_soldered.c b/keyboards/kbdfans/kbd67/mkii_soldered/mkii_soldered.c
index c36a84e75..b685fa824 100644
--- a/keyboards/kbdfans/kbd67/mkii_soldered/mkii_soldered.c
+++ b/keyboards/kbdfans/kbd67/mkii_soldered/mkii_soldered.c
@@ -14,35 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "mkii_soldered.h"
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-/*
-void matrix_init_kb(void) {  
-  matrix_init_user();
-}
-void led_set_kb(uint8_t usb_led) {
-  
-  led_set_user(usb_led);
-}
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-  matrix_scan_user();
-}
-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/keymaps/default/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/default/keymap.c
index 99556b7ef..0109e924a 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/default/keymap.c
@@ -15,17 +15,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                    KC_LSFT,       KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          KC_VOLU,  KC_MUTE,\
                    KC_TRNS,       KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_MPRV,          KC_VOLD,  KC_MNXT),
 };
-void matrix_init_user(void)
-{
-  //user initialization
-}
-void matrix_scan_user(void)
-{
-  //user matrix
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record)
-{
-          return true;
-}
diff --git a/keyboards/kbdfans/kbd67/rev1/keymaps/default/keymap.c b/keyboards/kbdfans/kbd67/rev1/keymaps/default/keymap.c
index 9e0065ff2..0f674c3ad 100644
--- a/keyboards/kbdfans/kbd67/rev1/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbd67/rev1/keymaps/default/keymap.c
@@ -85,15 +85,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 }
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/default/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/default/keymap.c
index 9e0065ff2..0f674c3ad 100644
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbd67/rev2/keymaps/default/keymap.c
@@ -85,15 +85,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 }
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/kbdfans/kbd6x/keymaps/default/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/default/keymap.c
index e2e96fc63..0aae1f906 100644
--- a/keyboards/kbdfans/kbd6x/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbd6x/keymaps/default/keymap.c
@@ -32,17 +32,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
      ),
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
diff --git a/keyboards/kbdfans/kbd8x_mk2/keymaps/ansi_7/keymap.c b/keyboards/kbdfans/kbd8x_mk2/keymaps/ansi_7/keymap.c
index 99496e21f..3213dabc9 100644
--- a/keyboards/kbdfans/kbd8x_mk2/keymaps/ansi_7/keymap.c
+++ b/keyboards/kbdfans/kbd8x_mk2/keymaps/ansi_7/keymap.c
@@ -26,19 +26,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_LCTL, KC_LGUI, KC_LALT,                           KC_SPC,                                       KC_NO,   KC_RALT, KC_RGUI, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT  \
  ),
 };
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/kbdfans/kbd8x_mk2/keymaps/default/keymap.c b/keyboards/kbdfans/kbd8x_mk2/keymaps/default/keymap.c
index 1064c141d..3c7255a28 100644
--- a/keyboards/kbdfans/kbd8x_mk2/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbd8x_mk2/keymaps/default/keymap.c
@@ -26,19 +26,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_LCTL, KC_LGUI, KC_LALT,                           KC_SPC,                                       KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT  \
  ),
 };
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/kbdfans/kbd8x_mk2/keymaps/iso_625/keymap.c b/keyboards/kbdfans/kbd8x_mk2/keymaps/iso_625/keymap.c
index 01c4a03af..cd7a23428 100644
--- a/keyboards/kbdfans/kbd8x_mk2/keymaps/iso_625/keymap.c
+++ b/keyboards/kbdfans/kbd8x_mk2/keymaps/iso_625/keymap.c
@@ -26,19 +26,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_LCTL, KC_LGUI, KC_LALT,                           KC_SPC,                                       KC_ALGR, KC_RGUI, KC_APP,  KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT  \
  ),
 };
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/kbdfans/kbd8x_mk2/keymaps/iso_7/keymap.c b/keyboards/kbdfans/kbd8x_mk2/keymaps/iso_7/keymap.c
index 4087b5984..45e0cf0fe 100644
--- a/keyboards/kbdfans/kbd8x_mk2/keymaps/iso_7/keymap.c
+++ b/keyboards/kbdfans/kbd8x_mk2/keymaps/iso_7/keymap.c
@@ -26,19 +26,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_LCTL, KC_LGUI, KC_LALT,                           KC_SPC,                                       KC_NO,   KC_ALGR, KC_RGUI, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT  \
  ),
 };
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/kbdfans/kbd8x_mk2/keymaps/tester/keymap.c b/keyboards/kbdfans/kbd8x_mk2/keymaps/tester/keymap.c
index dc742bcfa..3a7b80ca4 100644
--- a/keyboards/kbdfans/kbd8x_mk2/keymaps/tester/keymap.c
+++ b/keyboards/kbdfans/kbd8x_mk2/keymaps/tester/keymap.c
@@ -26,19 +26,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_LCTL, KC_LGUI, KC_LALT,                           KC_SPC,                                       KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT  \
  ),
 };
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/kbdfans/kbdpad_mk2/keymaps/default/keymap.c b/keyboards/kbdfans/kbdpad_mk2/keymaps/default/keymap.c
index 841db90ca..767fceec3 100644
--- a/keyboards/kbdfans/kbdpad_mk2/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbdpad_mk2/keymaps/default/keymap.c
@@ -26,19 +26,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_P0,   KC_P0,   KC_PDOT, KC_PENT  \
  ),
 };
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/kbdfans/kbdpad_mk2/keymaps/tester/keymap.c b/keyboards/kbdfans/kbdpad_mk2/keymaps/tester/keymap.c
index 04c301fee..f4675ce56 100644
--- a/keyboards/kbdfans/kbdpad_mk2/keymaps/tester/keymap.c
+++ b/keyboards/kbdfans/kbdpad_mk2/keymaps/tester/keymap.c
@@ -26,19 +26,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_P0,   KC_P0,   KC_PDOT, KC_PENT  \
  ),
 };
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/keebio/ergodicity/keymaps/default/keymap.c b/keyboards/keebio/ergodicity/keymaps/default/keymap.c
index b33031ca5..b25562784 100644
--- a/keyboards/keebio/ergodicity/keymaps/default/keymap.c
+++ b/keyboards/keebio/ergodicity/keymaps/default/keymap.c
@@ -59,15 +59,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 }
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/keebio/iris/rev1/rev1.c b/keyboards/keebio/iris/rev1/rev1.c
index 6249d2f0a..369af1bae 100644
--- a/keyboards/keebio/iris/rev1/rev1.c
+++ b/keyboards/keebio/iris/rev1/rev1.c
@@ -1,12 +1,5 @@
 #include "rev1.h"
-#ifdef SSD1306OLED
-void led_set_kb(uint8_t usb_led) {
-    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-    led_set_user(usb_led);
-}
-#endif
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
 // swap-hands action needs a matrix to define the swap
diff --git a/keyboards/keebio/iris/rev1_led/rev1_led.c b/keyboards/keebio/iris/rev1_led/rev1_led.c
index c330189c7..0ba10f1db 100644
--- a/keyboards/keebio/iris/rev1_led/rev1_led.c
+++ b/keyboards/keebio/iris/rev1_led/rev1_led.c
@@ -1,12 +1,5 @@
 #include "rev1_led.h"
-#ifdef SSD1306OLED
-void led_set_kb(uint8_t usb_led) {
-    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-    led_set_user(usb_led);
-}
-#endif
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
 // swap-hands action needs a matrix to define the swap
diff --git a/keyboards/keebio/levinson/rev1/rev1.c b/keyboards/keebio/levinson/rev1/rev1.c
index 573fa787b..72df88710 100644
--- a/keyboards/keebio/levinson/rev1/rev1.c
+++ b/keyboards/keebio/levinson/rev1/rev1.c
@@ -1,22 +1 @@
 #include "levinson.h"
-#ifdef SSD1306OLED
-void led_set_kb(uint8_t usb_led) {
-    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-    led_set_user(usb_led);
-}
-#endif
-void matrix_init_kb(void) {
-    // // green led on
-    // DDRD |= (1<<5);
-    // PORTD &= ~(1<<5);
-    // // orange led on
-    // DDRB |= (1<<0);
-    // PORTB &= ~(1<<0);
-        matrix_init_user();
-};
diff --git a/keyboards/keebio/nyquist/rev1/rev1.c b/keyboards/keebio/nyquist/rev1/rev1.c
index 5f4cd32f6..520a869e5 100644
--- a/keyboards/keebio/nyquist/rev1/rev1.c
+++ b/keyboards/keebio/nyquist/rev1/rev1.c
@@ -1,22 +1 @@
 #include "rev1.h"
-#ifdef SSD1306OLED
-void led_set_kb(uint8_t usb_led) {
-    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-    led_set_user(usb_led);
-}
-#endif
-void matrix_init_kb(void) {
-    // // green led on
-    // DDRD |= (1<<5);
-    // PORTD &= ~(1<<5);
-    // // orange led on
-    // DDRB |= (1<<0);
-    // PORTB &= ~(1<<0);
-        matrix_init_user();
-};
diff --git a/keyboards/keebio/rorschach/rev1/rev1.c b/keyboards/keebio/rorschach/rev1/rev1.c
index cd7f935ca..520a869e5 100644
--- a/keyboards/keebio/rorschach/rev1/rev1.c
+++ b/keyboards/keebio/rorschach/rev1/rev1.c
@@ -1,14 +1 @@
 #include "rev1.h"
-void matrix_init_kb(void) {
-    // // green led on
-    // DDRD |= (1<<5);
-    // PORTD &= ~(1<<5);
-    // // orange led on
-    // DDRB |= (1<<0);
-    // PORTB &= ~(1<<0);
-        matrix_init_user();
-};
diff --git a/keyboards/keebio/tragicforce68/tragicforce68.c b/keyboards/keebio/tragicforce68/tragicforce68.c
index 327197d25..42df8ec29 100644
--- a/keyboards/keebio/tragicforce68/tragicforce68.c
+++ b/keyboards/keebio/tragicforce68/tragicforce68.c
@@ -1,8 +1 @@
 #include "tragicforce68.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
diff --git a/keyboards/keebio/wavelet/wavelet.c b/keyboards/keebio/wavelet/wavelet.c
index 68011e266..466b4fe72 100644
--- a/keyboards/keebio/wavelet/wavelet.c
+++ b/keyboards/keebio/wavelet/wavelet.c
@@ -1,18 +1,5 @@
 #include "wavelet.h"
-void matrix_init_kb(void) {
-    // // green led on
-    // DDRD |= (1<<5);
-    // PORTD &= ~(1<<5);
-    // // orange led on
-    // DDRB |= (1<<0);
-    // PORTB &= ~(1<<0);
-        matrix_init_user();
-};
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
 const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/keyboardio/model01/model01.c b/keyboards/keyboardio/model01/model01.c
index d9fac1cf0..3644f0451 100644
--- a/keyboards/keyboardio/model01/model01.c
+++ b/keyboards/keyboardio/model01/model01.c
@@ -23,16 +23,3 @@ void matrix_init_kb(void) {
  set_all_leds_to(0, 0, 0);
  matrix_init_user();
 }
-void matrix_scan_kb(void) {
-  matrix_scan_user();
-}
-__attribute__ ((weak))
-void matrix_scan_user(void) {
-}
-__attribute__ ((weak))
-void matrix_init_user(void) {
-}
diff --git a/keyboards/keyhive/maypad/keymaps/default/keymap.c b/keyboards/keyhive/maypad/keymaps/default/keymap.c
index 466a13f41..f4689c012 100644
--- a/keyboards/keyhive/maypad/keymaps/default/keymap.c
+++ b/keyboards/keyhive/maypad/keymaps/default/keymap.c
@@ -25,16 +25,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                 KC_P0,            KC_PDOT, KC_PENT  
        ),
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/keyhive/maypad/maypad.c b/keyboards/keyhive/maypad/maypad.c
index 825d8c4a5..426575b3d 100644
--- a/keyboards/keyhive/maypad/maypad.c
+++ b/keyboards/keyhive/maypad/maypad.c
@@ -14,38 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "maypad.h"
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-/*
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-  matrix_init_user();
-}
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-  matrix_scan_user();
-}
-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/kinesis/alvicstep/alvicstep.c b/keyboards/kinesis/alvicstep/alvicstep.c
index fba9f5136..735032d6a 100644
--- a/keyboards/kinesis/alvicstep/alvicstep.c
+++ b/keyboards/kinesis/alvicstep/alvicstep.c
@@ -70,21 +70,6 @@ void blink_all_leds(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
@@ -101,5 +86,3 @@ void led_set_kb(uint8_t usb_led) {
        led_set_user(usb_led);
 }
diff --git a/keyboards/kinesis/keymaps/default/keymap.c b/keyboards/kinesis/keymaps/default/keymap.c
index b116386ce..2d43aad07 100644
--- a/keyboards/kinesis/keymaps/default/keymap.c
+++ b/keyboards/kinesis/keymaps/default/keymap.c
@@ -51,19 +51,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
           KC_PGDN,KC_ENTER ,KC_SPC
    )
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/kinesis/keymaps/default_pretty/keymap.c b/keyboards/kinesis/keymaps/default_pretty/keymap.c
index d5cb69071..9c01b222a 100644
--- a/keyboards/kinesis/keymaps/default_pretty/keymap.c
+++ b/keyboards/kinesis/keymaps/default_pretty/keymap.c
@@ -44,19 +44,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  )
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/kira75/keymaps/default/keymap.c b/keyboards/kira75/keymaps/default/keymap.c
index 74fa1ed84..b98de1d39 100644
--- a/keyboards/kira75/keymaps/default/keymap.c
+++ b/keyboards/kira75/keymaps/default/keymap.c
@@ -25,19 +25,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT \
 ),
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/kira75/kira75.c b/keyboards/kira75/kira75.c
index 4b53290be..bf9afcc8f 100644
--- a/keyboards/kira75/kira75.c
+++ b/keyboards/kira75/kira75.c
@@ -14,30 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "kira75.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-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/kmac/keymaps/default/keymap.c b/keyboards/kmac/keymaps/default/keymap.c
index a67a4d10d..70f3a5a36 100644
--- a/keyboards/kmac/keymaps/default/keymap.c
+++ b/keyboards/kmac/keymaps/default/keymap.c
@@ -79,9 +79,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
    }
    return true;
 };
-void matrix_init_user(void) {}
-void matrix_scan_user(void) {}
-void led_set_user(uint8_t usb_led) {}
diff --git a/keyboards/kmac/keymaps/default_tkl_ansi/keymap.c b/keyboards/kmac/keymaps/default_tkl_ansi/keymap.c
index a67a4d10d..70f3a5a36 100644
--- a/keyboards/kmac/keymaps/default_tkl_ansi/keymap.c
+++ b/keyboards/kmac/keymaps/default_tkl_ansi/keymap.c
@@ -79,9 +79,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
    }
    return true;
 };
-void matrix_init_user(void) {}
-void matrix_scan_user(void) {}
-void led_set_user(uint8_t usb_led) {}
diff --git a/keyboards/kmac/keymaps/default_tkl_ansi_wkl/keymap.c b/keyboards/kmac/keymaps/default_tkl_ansi_wkl/keymap.c
index 6b4958556..316fc7c0f 100644
--- a/keyboards/kmac/keymaps/default_tkl_ansi_wkl/keymap.c
+++ b/keyboards/kmac/keymaps/default_tkl_ansi_wkl/keymap.c
@@ -79,9 +79,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
    }
    return true;
 };
-void matrix_init_user(void) {}
-void matrix_scan_user(void) {}
-void led_set_user(uint8_t usb_led) {}
diff --git a/keyboards/kmini/keymaps/default/keymap.c b/keyboards/kmini/keymaps/default/keymap.c
index 6f793a019..3feaff5bf 100755
--- a/keyboards/kmini/keymaps/default/keymap.c
+++ b/keyboards/kmini/keymaps/default/keymap.c
@@ -41,17 +41,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 void led_set_user(uint8_t usb_led) {
    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
-        PORTB &= ~(1<<1); // LO
+        writePinLow(B1);
    } else {
-        PORTB |= (1<<1); // HI
+        writePinHigh(B1);
    }
 }
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-\ No newline at end of file
diff --git a/keyboards/kmini/kmini.c b/keyboards/kmini/kmini.c
index cd8cd68a9..1ffd30475 100755
--- a/keyboards/kmini/kmini.c
+++ b/keyboards/kmini/kmini.c
@@ -26,7 +26,3 @@ void led_init_ports(void) {
 * Side1: Low B3
 * Side2: Low B2
 */
-void led_set_kb(uint8_t usb_led) {
-    led_set_user(usb_led);
-}
diff --git a/keyboards/knops/mini/keymaps/default/keymap.c b/keyboards/knops/mini/keymaps/default/keymap.c
index ee6a0741c..46ce7e49d 100644
--- a/keyboards/knops/mini/keymaps/default/keymap.c
+++ b/keyboards/knops/mini/keymaps/default/keymap.c
@@ -199,44 +199,6 @@ void matrix_init_user(void) {
        set_layer_led(0);
 }
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-        if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-        } else {
-        }
-        if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-        } else {
-        }
-        if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-        } else {
-        }
-        if (usb_led & (1 << USB_LED_COMPOSE)) {
-        } else {
-        }
-        if (usb_led & (1 << USB_LED_KANA)) {
-        } else {
-        }
-}
 /*
 *   NOTE:
 *
diff --git a/keyboards/knops/mini/mini.c b/keyboards/knops/mini/mini.c
index ccfd4331b..f378cc5d5 100644
--- a/keyboards/knops/mini/mini.c
+++ b/keyboards/knops/mini/mini.c
@@ -14,31 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "mini.h"
-/*
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-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/keymaps/ansi/keymap.c b/keyboards/kona_classic/keymaps/ansi/keymap.c
index e6ae4ce47..5aa483d28 100644
--- a/keyboards/kona_classic/keymaps/ansi/keymap.c
+++ b/keyboards/kona_classic/keymaps/ansi/keymap.c
@@ -44,18 +44,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  )
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  switch (keycode) {
    case SFT_ESC:
diff --git a/keyboards/kona_classic/keymaps/ansi_arrows/keymap.c b/keyboards/kona_classic/keymaps/ansi_arrows/keymap.c
index 021cce832..d3fcde5b2 100644
--- a/keyboards/kona_classic/keymaps/ansi_arrows/keymap.c
+++ b/keyboards/kona_classic/keymaps/ansi_arrows/keymap.c
@@ -44,18 +44,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  )
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  switch (keycode) {
    case SFT_ESC:
diff --git a/keyboards/kona_classic/keymaps/ansi_arrows_lcap/keymap.c b/keyboards/kona_classic/keymaps/ansi_arrows_lcap/keymap.c
index fde23ba94..950203be5 100644
--- a/keyboards/kona_classic/keymaps/ansi_arrows_lcap/keymap.c
+++ b/keyboards/kona_classic/keymaps/ansi_arrows_lcap/keymap.c
@@ -44,18 +44,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  )
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  switch (keycode) {
    case SFT_ESC:
diff --git a/keyboards/kona_classic/keymaps/ansi_split/keymap.c b/keyboards/kona_classic/keymaps/ansi_split/keymap.c
index 01e049c7b..109152135 100644
--- a/keyboards/kona_classic/keymaps/ansi_split/keymap.c
+++ b/keyboards/kona_classic/keymaps/ansi_split/keymap.c
@@ -44,18 +44,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  )
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  switch (keycode) {
    case SFT_ESC:
diff --git a/keyboards/kona_classic/keymaps/ansi_split_arrows/keymap.c b/keyboards/kona_classic/keymaps/ansi_split_arrows/keymap.c
index eba565bb4..60c8b1536 100644
--- a/keyboards/kona_classic/keymaps/ansi_split_arrows/keymap.c
+++ b/keyboards/kona_classic/keymaps/ansi_split_arrows/keymap.c
@@ -44,18 +44,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  )
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  switch (keycode) {
    case SFT_ESC:
diff --git a/keyboards/kona_classic/keymaps/default/keymap.c b/keyboards/kona_classic/keymaps/default/keymap.c
index a42e93680..60c2b91bc 100644
--- a/keyboards/kona_classic/keymaps/default/keymap.c
+++ b/keyboards/kona_classic/keymaps/default/keymap.c
@@ -44,18 +44,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  )
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  switch (keycode) {
    case SFT_ESC:
diff --git a/keyboards/kona_classic/keymaps/iso/keymap.c b/keyboards/kona_classic/keymaps/iso/keymap.c
index 1486a8b75..c4c9f41f3 100644
--- a/keyboards/kona_classic/keymaps/iso/keymap.c
+++ b/keyboards/kona_classic/keymaps/iso/keymap.c
@@ -44,18 +44,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  )
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  switch (keycode) {
    case SFT_ESC:
diff --git a/keyboards/kona_classic/keymaps/iso_arrows/keymap.c b/keyboards/kona_classic/keymaps/iso_arrows/keymap.c
index 96adc3482..072785bf8 100644
--- a/keyboards/kona_classic/keymaps/iso_arrows/keymap.c
+++ b/keyboards/kona_classic/keymaps/iso_arrows/keymap.c
@@ -44,18 +44,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  )
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  switch (keycode) {
    case SFT_ESC:
diff --git a/keyboards/kona_classic/keymaps/iso_split/keymap.c b/keyboards/kona_classic/keymaps/iso_split/keymap.c
index 278b4cd32..a0830fc8d 100644
--- a/keyboards/kona_classic/keymaps/iso_split/keymap.c
+++ b/keyboards/kona_classic/keymaps/iso_split/keymap.c
@@ -44,18 +44,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  )
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  switch (keycode) {
    case SFT_ESC:
diff --git a/keyboards/kona_classic/keymaps/iso_split_arrows/keymap.c b/keyboards/kona_classic/keymaps/iso_split_arrows/keymap.c
index 1e8bc0418..29ce3375f 100644
--- a/keyboards/kona_classic/keymaps/iso_split_arrows/keymap.c
+++ b/keyboards/kona_classic/keymaps/iso_split_arrows/keymap.c
@@ -44,18 +44,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  )
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  switch (keycode) {
    case SFT_ESC:
diff --git a/keyboards/kprepublic/bm16a/bm16a.c b/keyboards/kprepublic/bm16a/bm16a.c
index 3d616f29e..9676b5011 100644
--- a/keyboards/kprepublic/bm16a/bm16a.c
+++ b/keyboards/kprepublic/bm16a/bm16a.c
@@ -14,30 +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();
-}
-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/kprepublic/bm43a/bm43a.c b/keyboards/kprepublic/bm43a/bm43a.c
index 36543e372..47e42864e 100644
--- a/keyboards/kprepublic/bm43a/bm43a.c
+++ b/keyboards/kprepublic/bm43a/bm43a.c
@@ -14,38 +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();
-}
-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/kprepublic/bm60rgb/bm60rgb.c b/keyboards/kprepublic/bm60rgb/bm60rgb.c
index cbd020faf..1b4840934 100644
--- a/keyboards/kprepublic/bm60rgb/bm60rgb.c
+++ b/keyboards/kprepublic/bm60rgb/bm60rgb.c
@@ -15,33 +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();
-}
-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);
-}
 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/ktec/ergodone/keymaps/default/keymap.c b/keyboards/ktec/ergodone/keymaps/default/keymap.c
index 2fc534401..ca3da7ec5 100644
--- a/keyboards/ktec/ergodone/keymaps/default/keymap.c
+++ b/keyboards/ktec/ergodone/keymaps/default/keymap.c
@@ -168,12 +168,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  return true;
 }
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-};
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
diff --git a/keyboards/kudox/rev1/rev1.c b/keyboards/kudox/rev1/rev1.c
index 3b39ee764..abcdf4843 100644
--- a/keyboards/kudox/rev1/rev1.c
+++ b/keyboards/kudox/rev1/rev1.c
@@ -1,22 +1 @@
 #include "kudox.h"
-#ifdef SSD1306OLED
-void led_set_kb(uint8_t usb_led) {
-    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-    led_set_user(usb_led);
-}
-#endif
-void matrix_init_kb(void) {
-    // // green led on
-    // DDRD |= (1<<5);
-    // PORTD &= ~(1<<5);
-    // // orange led on
-    // DDRB |= (1<<0);
-    // PORTB &= ~(1<<0);
-        matrix_init_user();
-};
diff --git a/keyboards/kudox_game/rev1/rev1.c b/keyboards/kudox_game/rev1/rev1.c
index 8f1b8b2b6..32356f8a4 100644
--- a/keyboards/kudox_game/rev1/rev1.c
+++ b/keyboards/kudox_game/rev1/rev1.c
@@ -1,22 +1 @@
 #include "kudox_game.h"
-#ifdef SSD1306OLED
-void led_set_kb(uint8_t usb_led) {
-    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-    led_set_user(usb_led);
-}
-#endif
-void matrix_init_kb(void) {
-    // // green led on
-    // DDRD |= (1<<5);
-    // PORTD &= ~(1<<5);
-    // // orange led on
-    // DDRB |= (1<<0);
-    // PORTB &= ~(1<<0);
-        matrix_init_user();
-};
diff --git a/keyboards/launchpad/keymaps/default/keymap.c b/keyboards/launchpad/keymaps/default/keymap.c
index 8ebc98159..560f7e858 100644
--- a/keyboards/launchpad/keymaps/default/keymap.c
+++ b/keyboards/launchpad/keymaps/default/keymap.c
@@ -53,7 +53,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 )
 };
-void matrix_init_user(void) {
-}
diff --git a/keyboards/launchpad/rev1/rev1.c b/keyboards/launchpad/rev1/rev1.c
index cff4edf9f..cc2812a76 100644
--- a/keyboards/launchpad/rev1/rev1.c
+++ b/keyboards/launchpad/rev1/rev1.c
@@ -1,9 +1 @@
 #include "launchpad.h"
-void matrix_init_kb(void) {
-        // Undo init of RX LED, we use that port currently
-        //DDRB &= ~(1<<0);
-        
-        matrix_init_user();
-        
-};
diff --git a/keyboards/lets_split/rev1/rev1.c b/keyboards/lets_split/rev1/rev1.c
index c243f71bc..3caa114c2 100644
--- a/keyboards/lets_split/rev1/rev1.c
+++ b/keyboards/lets_split/rev1/rev1.c
@@ -1,15 +1 @@
 #include "lets_split.h"
-void matrix_init_kb(void) {
-    // // green led on
-    // DDRD |= (1<<5);
-    // PORTD &= ~(1<<5);
-    // // orange led on
-    // DDRB |= (1<<0);
-    // PORTB &= ~(1<<0);
-        matrix_init_user();
-};
diff --git a/keyboards/lets_split/rev2/rev2.c b/keyboards/lets_split/rev2/rev2.c
index 3ae967c07..3caa114c2 100644
--- a/keyboards/lets_split/rev2/rev2.c
+++ b/keyboards/lets_split/rev2/rev2.c
@@ -1,23 +1 @@
 #include "lets_split.h"
-#ifdef SSD1306OLED
-void led_set_kb(uint8_t usb_led) {
-    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-    led_set_user(usb_led);
-}
-#endif
-void matrix_init_kb(void) {
-    // // green led on
-    // DDRD |= (1<<5);
-    // PORTD &= ~(1<<5);
-    // // orange led on
-    // DDRB |= (1<<0);
-    // PORTB &= ~(1<<0);
-        matrix_init_user();
-};
diff --git a/keyboards/lets_split/sockets/sockets.c b/keyboards/lets_split/sockets/sockets.c
index d50678560..3caa114c2 100644
--- a/keyboards/lets_split/sockets/sockets.c
+++ b/keyboards/lets_split/sockets/sockets.c
@@ -1,22 +1 @@
 #include "lets_split.h"
-#ifdef SSD1306OLED
-void led_set_kb(uint8_t usb_led) {
-    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-    led_set_user(usb_led);
-}
-#endif
-void matrix_init_kb(void) {
-    // // green led on
-    // DDRD |= (1<<5);
-    // PORTD &= ~(1<<5);
-    // // orange led on
-    // DDRB |= (1<<0);
-    // PORTB &= ~(1<<0);
-        matrix_init_user();
-};
diff --git a/keyboards/lfkeyboards/lfk65_hs/keymaps/default/keymap.c b/keyboards/lfkeyboards/lfk65_hs/keymaps/default/keymap.c
index 02f2f98a9..cced607b0 100644
--- a/keyboards/lfkeyboards/lfk65_hs/keymaps/default/keymap.c
+++ b/keyboards/lfkeyboards/lfk65_hs/keymaps/default/keymap.c
@@ -52,19 +52,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    F(5),    F(2),F(4), KC_TR, KC_TR, KC_TR, KC_TR, MU_TOG, RGB_VAD, RGB_VAI, KC_TR, KC_TR,        RGB_HUI,  KC_TR,
    KC_TR, KC_TR, KC_TR,         KC_TR,       KC_TR, KC_TR, KC_TR, RGB_SAD, RGB_HUD,  RGB_SAI),
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.c b/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.c
index 26ab883a4..86573ce17 100644
--- a/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.c
+++ b/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.c
@@ -4,17 +4,6 @@
 #include "lfk65_hs.h"
 #include "keymap.h"
-void matrix_init_kb(void)
-{
-    matrix_init_user();
-}
-void matrix_scan_kb(void)
-{
-    matrix_scan_user();
-}
 bool process_record_kb(uint16_t keycode, keyrecord_t* record)
 {
    if (keycode == RESET) {
diff --git a/keyboards/lfkeyboards/lfk87/keymaps/default/keymap.c b/keyboards/lfkeyboards/lfk87/keymaps/default/keymap.c
index 8988870db..8d0dadcf8 100644
--- a/keyboards/lfkeyboards/lfk87/keymaps/default/keymap.c
+++ b/keyboards/lfkeyboards/lfk87/keymaps/default/keymap.c
@@ -107,15 +107,3 @@ void matrix_init_user(void) {
        default_layer_set(1);
    }
 }
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/lfkeyboards/lfk87/keymaps/iso/keymap.c b/keyboards/lfkeyboards/lfk87/keymaps/iso/keymap.c
index 54ef1aadb..b9d46df2b 100644
--- a/keyboards/lfkeyboards/lfk87/keymaps/iso/keymap.c
+++ b/keyboards/lfkeyboards/lfk87/keymaps/iso/keymap.c
@@ -107,15 +107,3 @@ void matrix_init_user(void) {
        default_layer_set(1);
    }
 }
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c b/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c
index ba3d95be2..364bf06c3 100644
--- a/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c
+++ b/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c
@@ -107,15 +107,3 @@ void matrix_init_user(void) {
        default_layer_set(1);
    }
 }
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/lily58/lily58.c b/keyboards/lily58/lily58.c
index 03975057f..6108d70b9 100644
--- a/keyboards/lily58/lily58.c
+++ b/keyboards/lily58/lily58.c
@@ -1,5 +1 @@
 #include "lily58.h"
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  return process_record_user(keycode, record);
-}
diff --git a/keyboards/lily58/rev1/rev1.c b/keyboards/lily58/rev1/rev1.c
index e78f2ccfa..6108d70b9 100644
--- a/keyboards/lily58/rev1/rev1.c
+++ b/keyboards/lily58/rev1/rev1.c
@@ -1,8 +1 @@
 #include "lily58.h"
-#ifdef SSD1306OLED
-void led_set_kb(uint8_t usb_led) {
-    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-    //led_set_user(usb_led);
-}
-#endif
-\ No newline at end of file
diff --git a/keyboards/marksard/rhymestone/rev1/rev1.c b/keyboards/marksard/rhymestone/rev1/rev1.c
index a4dadd55c..d41694c1d 100644
--- a/keyboards/marksard/rhymestone/rev1/rev1.c
+++ b/keyboards/marksard/rhymestone/rev1/rev1.c
@@ -58,51 +58,3 @@ led_config_t g_led_config = { {
    4, 4, 4, 4
 } };
 #endif
-__attribute__((weak))
-void matrix_init_user(void) {}
-void matrix_init_kb(void) {
-#ifdef RGB_MATRIX_ENABLE
-    // if (!is_keyboard_master()) {
-    //     g_led_config = (led_config_t){ {
-    //         {  30,  31,  32,  33,  20 },
-    //         {  29,  38,  39,  34,  21 },
-    //         {  28,  37,  36,  35,  22 },
-    //         {  27,  26,  25,  24,  23 },
-    //         {  10,  11,  12,  13,   0 },
-    //         {   9,  18,  19,  14,   1 },
-    //         {   8,  17,  16,  15,   2 },
-    //         {   7,   6,   5,   4,   3 }
-    //     }, {
-    //         { 125,   0 }, { 125,  21 }, { 125,  43 }, { 125,  64 },
-    //         { 150,  64 }, { 175,  64 }, { 200,  64 }, { 225,  64 },
-    //         { 225,  43 }, { 225,  21 }, { 225,   0 },
-    //         { 200,   0 }, { 175,   0 }, { 150,   0 },
-    //         { 150,  21 }, { 150,  43 },
-    //         { 175,  43 }, { 200,  43 },
-    //         { 200,  21 }, { 150,  21 },
-    //         { 100,   0 }, { 100,  21 }, { 100,  43 }, { 100,  64 },
-    //         {  75,  64 }, {  50,  64 }, {  25,  64 }, {   0,  64 },
-    //         {   0,  43 }, {   0,  21 }, {   0,   0 },
-    //         {  25,   0 }, {  50,   0 }, {  75,   0 },
-    //         {  75,  21 }, {  75,  43 },
-    //         {  50,  43 }, {  25,  43 },
-    //         {  25,  21 }, {  50,  21 }
-    //     }, {
-    //         4, 4, 4, 1,
-    //         1, 1, 1, 1,
-    //         4, 4, 4, 4,
-    //         4, 4, 4, 4,
-    //         4, 4, 4, 4,
-    //         4, 4, 4, 1,
-    //         1, 1, 1, 1,
-    //         4, 4, 4, 4,
-    //         4, 4, 4, 4,
-    //         4, 4, 4, 4
-    //     } };
-    // }
-#endif
-    matrix_init_user();
-}
diff --git a/keyboards/massdrop/ctrl/keymaps/default/keymap.c b/keyboards/massdrop/ctrl/keymaps/default/keymap.c
index 7a1aebfcb..8c0cab2ea 100644
--- a/keyboards/massdrop/ctrl/keymaps/default/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/default/keymap.c
@@ -39,14 +39,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 };
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-};
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-};
 #define MODS_SHIFT  (get_mods() & MOD_MASK_SHIFT)
 #define MODS_CTRL   (get_mods() & MOD_MASK_CTRL)
 #define MODS_ALT    (get_mods() & MOD_MASK_ALT)
diff --git a/keyboards/massdrop/ctrl/keymaps/default_md/keymap.c b/keyboards/massdrop/ctrl/keymaps/default_md/keymap.c
index a4442d8c6..1083571ef 100644
--- a/keyboards/massdrop/ctrl/keymaps/default_md/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/default_md/keymap.c
@@ -50,14 +50,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    */
 };
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-};
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-};
 #define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSHIFT) || get_mods() & MOD_BIT(KC_RSHIFT))
 #define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTRL))
 #define MODS_ALT  (get_mods() & MOD_BIT(KC_LALT) || get_mods() & MOD_BIT(KC_RALT))
diff --git a/keyboards/matrix/noah/noah.c b/keyboards/matrix/noah/noah.c
index 6b624b9e0..20d68f34e 100644
--- a/keyboards/matrix/noah/noah.c
+++ b/keyboards/matrix/noah/noah.c
@@ -50,11 +50,6 @@ void rgblight_set(void) {
 }
 #endif
-void matrix_init_kb(void) { matrix_init_user(); }
-__attribute__((weak))
-void matrix_init_user(void) { }
 void matrix_scan_kb(void) {
 #ifdef RGBLIGHT_ENABLE
    rgblight_task();
@@ -62,9 +57,6 @@ void matrix_scan_kb(void) {
    matrix_scan_user();
 }
-__attribute__((weak))
-void matrix_scan_user(void) { }
 #ifdef RGB_MATRIX_ENABLE
 const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = {
 /* Refer to IS31 manual for these locations
diff --git a/keyboards/maxr1998/pulse4k/keymaps/default/keymap.c b/keyboards/maxr1998/pulse4k/keymaps/default/keymap.c
index 46de247aa..e33dcad21 100644
--- a/keyboards/maxr1998/pulse4k/keymaps/default/keymap.c
+++ b/keyboards/maxr1998/pulse4k/keymaps/default/keymap.c
@@ -29,15 +29,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        { KC_LEFT, KC_DOWN, KC_RGHT }
    }
 };
-void matrix_init_user(void) {
-}
-// Override if necessary
-/*
-void encoder_one_update(bool clockwise) {
-}
-void encoder_two_update(bool clockwise) {
-}
-//*/
diff --git a/keyboards/mechkeys/mk60/keymaps/default/keymap.c b/keyboards/mechkeys/mk60/keymaps/default/keymap.c
index ea566d4b5..7718902eb 100644
--- a/keyboards/mechkeys/mk60/keymaps/default/keymap.c
+++ b/keyboards/mechkeys/mk60/keymaps/default/keymap.c
@@ -60,15 +60,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 }
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/mechmini/v2/keymaps/default/keymap.c b/keyboards/mechmini/v2/keymaps/default/keymap.c
index b0701ed58..dae1dc9fd 100755
--- a/keyboards/mechmini/v2/keymaps/default/keymap.c
+++ b/keyboards/mechmini/v2/keymaps/default/keymap.c
@@ -31,46 +31,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-        if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-        } else {
-        }
-        if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-        } else {
-        }
-        if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-        } else {
-        }
-        if (usb_led & (1 << USB_LED_COMPOSE)) {
-        } else {
-        }
-        if (usb_led & (1 << USB_LED_KANA)) {
-        } else {
-        }
-}
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  switch (keycode) {
    case SFT_ESC:
diff --git a/keyboards/meira/keymaps/default/keymap.c b/keyboards/meira/keymaps/default/keymap.c
index 5c80df0f0..fcb9796d7 100644
--- a/keyboards/meira/keymaps/default/keymap.c
+++ b/keyboards/meira/keymaps/default/keymap.c
@@ -174,14 +174,6 @@ void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
  }
 }
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  switch (keycode) {
    case QWERTY:
@@ -304,7 +296,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 }
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/meira/meira.c b/keyboards/meira/meira.c
index 1d0db5e99..7879875db 100644
--- a/keyboards/meira/meira.c
+++ b/keyboards/meira/meira.c
@@ -84,11 +84,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
        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 reset_keyboard_kb(){
 #ifdef WATCHDOG_ENABLE
    MCUSR = 0;
diff --git a/keyboards/meishi/keymaps/default/keymap.c b/keyboards/meishi/keymaps/default/keymap.c
index ea6e42a96..5cbeebc46 100644
--- a/keyboards/meishi/keymaps/default/keymap.c
+++ b/keyboards/meishi/keymaps/default/keymap.c
@@ -20,19 +20,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  LCTL(KC_Z),  LCTL(KC_X),  LCTL(KC_C), LCTL(KC_V) \
 ),
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/meishi/meishi.c b/keyboards/meishi/meishi.c
index 92c5194d5..85ede859d 100644
--- a/keyboards/meishi/meishi.c
+++ b/keyboards/meishi/meishi.c
@@ -14,30 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "meishi.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-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/meishi2/keymaps/default/keymap.c b/keyboards/meishi2/keymaps/default/keymap.c
index 6eb3b5a9f..11cfcf072 100644
--- a/keyboards/meishi2/keymaps/default/keymap.c
+++ b/keyboards/meishi2/keymaps/default/keymap.c
@@ -20,16 +20,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    LCTL(KC_Z),  LCTL(KC_X),  LCTL(KC_C), LCTL(KC_V) \
  )
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/meishi2/meishi2.c b/keyboards/meishi2/meishi2.c
index a74e6d3e6..14525ae17 100644
--- a/keyboards/meishi2/meishi2.c
+++ b/keyboards/meishi2/meishi2.c
@@ -14,38 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "meishi2.h"
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-/*
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-  matrix_init_user();
-}
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-  matrix_scan_user();
-}
-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/meme/meme.c b/keyboards/meme/meme.c
index 8ba421b15..928f121fe 100644
--- a/keyboards/meme/meme.c
+++ b/keyboards/meme/meme.c
@@ -14,30 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "meme.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-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/meson/keymaps/default/keymap.c b/keyboards/meson/keymaps/default/keymap.c
index 002fc7977..3280b081c 100644
--- a/keyboards/meson/keymaps/default/keymap.c
+++ b/keyboards/meson/keymaps/default/keymap.c
@@ -64,15 +64,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 }
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/meson/meson.c b/keyboards/meson/meson.c
index 9dc6f6a2e..4b777633b 100644
--- a/keyboards/meson/meson.c
+++ b/keyboards/meson/meson.c
@@ -14,38 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "meson.h"
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-/*
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-  matrix_init_user();
-}
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-  matrix_scan_user();
-}
-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/miniaxe/keymaps/default/keymap.c b/keyboards/miniaxe/keymaps/default/keymap.c
index fb8f6ca97..cc77feeca 100644
--- a/keyboards/miniaxe/keymaps/default/keymap.c
+++ b/keyboards/miniaxe/keymaps/default/keymap.c
@@ -148,12 +148,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 }
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/miniaxe/keymaps/underglow/keymap.c b/keyboards/miniaxe/keymaps/underglow/keymap.c
index 6325b2056..362b29c60 100644
--- a/keyboards/miniaxe/keymaps/underglow/keymap.c
+++ b/keyboards/miniaxe/keymaps/underglow/keymap.c
@@ -148,12 +148,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 }
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/miniaxe/miniaxe.c b/keyboards/miniaxe/miniaxe.c
index 965ada9a1..bda61784e 100644
--- a/keyboards/miniaxe/miniaxe.c
+++ b/keyboards/miniaxe/miniaxe.c
@@ -14,30 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "miniaxe.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-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/miuni32/keymaps/default/keymap.c b/keyboards/miuni32/keymaps/default/keymap.c
index ae58f80a2..87519de54 100644
--- a/keyboards/miuni32/keymaps/default/keymap.c
+++ b/keyboards/miuni32/keymaps/default/keymap.c
@@ -58,47 +58,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    _______, _______, _______, _______,          KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12
  )
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void led_set_user(uint8_t usb_led) {
-  if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_COMPOSE)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_KANA)) {
-  } else {
-  }
-}
diff --git a/keyboards/miuni32/miuni32.c b/keyboards/miuni32/miuni32.c
index 1c1983a56..7defbe891 100644
--- a/keyboards/miuni32/miuni32.c
+++ b/keyboards/miuni32/miuni32.c
@@ -1,28 +1 @@
 #include "miuni32.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-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/mxss/keymaps/default/keymap.c b/keyboards/mxss/keymaps/default/keymap.c
index b69d91df9..e74eb0d22 100644
--- a/keyboards/mxss/keymaps/default/keymap.c
+++ b/keyboards/mxss/keymaps/default/keymap.c
@@ -51,19 +51,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS,           KC_TRNS, KC_TRNS, RGB_HUD, RGB_SAD, RGB_HUI
 ),
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/mxss/mxss.c b/keyboards/mxss/mxss.c
index dd418b86f..f591d39e6 100644
--- a/keyboards/mxss/mxss.c
+++ b/keyboards/mxss/mxss.c
@@ -39,13 +39,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) {
    // Handle custom keycodes for front LED operation
    process_record_fled(keycode, record);
diff --git a/keyboards/nafuda/nafuda.c b/keyboards/nafuda/nafuda.c
index d2061181e..334b3dab2 100644
--- a/keyboards/nafuda/nafuda.c
+++ b/keyboards/nafuda/nafuda.c
@@ -1,5 +1 @@
 #include "nafuda.h"
-void matrix_init_kb(void) {
-        matrix_init_user();
-};
diff --git a/keyboards/naked48/keymaps/default/keymap.c b/keyboards/naked48/keymaps/default/keymap.c
index 616967f57..e145c02e3 100644
--- a/keyboards/naked48/keymaps/default/keymap.c
+++ b/keyboards/naked48/keymaps/default/keymap.c
@@ -104,7 +104,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  return result;
 }
-void matrix_init_user(void) {
-}
diff --git a/keyboards/naked48/rev1/rev1.c b/keyboards/naked48/rev1/rev1.c
index e127232d8..411f2900a 100644
--- a/keyboards/naked48/rev1/rev1.c
+++ b/keyboards/naked48/rev1/rev1.c
@@ -1,12 +1,5 @@
 #include "naked48.h"
-/*#ifdef SSD1306OLED
-void led_set_kb(uint8_t usb_led) {
-  // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-  //led_set_user(usb_led);
-}
-#endif*/
 #ifdef RGB_MATRIX_ENABLE
    led_config_t g_led_config = { {
    // Key Matrix to LED Index
@@ -30,7 +23,3 @@ void led_set_kb(uint8_t usb_led) {
        4, 4, 4, 4, 4, 4, 4, 4
 } };
 #endif
-void matrix_init_kb(void) {
-        matrix_init_user();
-};
-\ No newline at end of file
diff --git a/keyboards/naked60/keymaps/default/keymap.c b/keyboards/naked60/keymaps/default/keymap.c
index 9b764482e..3a95e7324 100644
--- a/keyboards/naked60/keymaps/default/keymap.c
+++ b/keyboards/naked60/keymaps/default/keymap.c
@@ -90,7 +90,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          //`------------------------------------------------------------------------------------------------------------'
  )
 };
-void matrix_init_user(void) {
-}
diff --git a/keyboards/naked60/rev1/rev1.c b/keyboards/naked60/rev1/rev1.c
index bef4f1931..d1d46394f 100644
--- a/keyboards/naked60/rev1/rev1.c
+++ b/keyboards/naked60/rev1/rev1.c
@@ -16,7 +16,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "naked60.h"
-void matrix_init_kb(void) {
-        matrix_init_user();
-};
-\ No newline at end of file
diff --git a/keyboards/naked64/keymaps/default/keymap.c b/keyboards/naked64/keymaps/default/keymap.c
index 4460407db..b71f55415 100644
--- a/keyboards/naked64/keymaps/default/keymap.c
+++ b/keyboards/naked64/keymaps/default/keymap.c
@@ -150,7 +150,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  return result;
 }
-void matrix_init_user(void) {
-}
diff --git a/keyboards/naked64/rev1/rev1.c b/keyboards/naked64/rev1/rev1.c
index d851f9782..520a869e5 100644
--- a/keyboards/naked64/rev1/rev1.c
+++ b/keyboards/naked64/rev1/rev1.c
@@ -1,5 +1 @@
 #include "rev1.h"
-void matrix_init_kb(void) {
-        matrix_init_user();
-};
diff --git a/keyboards/namecard2x4/keymaps/default/keymap.c b/keyboards/namecard2x4/keymaps/default/keymap.c
index 1a0a727fc..5858be6d6 100644
--- a/keyboards/namecard2x4/keymaps/default/keymap.c
+++ b/keyboards/namecard2x4/keymaps/default/keymap.c
@@ -41,20 +41,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                )
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/namecard2x4/namecard2x4.c b/keyboards/namecard2x4/namecard2x4.c
index 349923daf..091b55c10 100644
--- a/keyboards/namecard2x4/namecard2x4.c
+++ b/keyboards/namecard2x4/namecard2x4.c
@@ -14,30 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "namecard2x4.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-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/nek_type_a/keymaps/default/keymap.c b/keyboards/nek_type_a/keymaps/default/keymap.c
index 627aa4590..2c7812fe0 100644
--- a/keyboards/nek_type_a/keymaps/default/keymap.c
+++ b/keyboards/nek_type_a/keymaps/default/keymap.c
@@ -25,15 +25,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    KC_LCTRL, KC_LALT, KC_LCMD, KC_SPC, KC_SPC, KC_RCMD, KC_RALT, KC_RCTRL, KC_APP, KC_LEFT, KC_DOWN, KC_RIGHT \
  ),
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/nek_type_a/nek_type_a.c b/keyboards/nek_type_a/nek_type_a.c
index ec76a209b..f7e1dd4d7 100644
--- a/keyboards/nek_type_a/nek_type_a.c
+++ b/keyboards/nek_type_a/nek_type_a.c
@@ -14,30 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "nek_type_a.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-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/neson_design/n6/n6.c b/keyboards/neson_design/n6/n6.c
index 38b0fd4c8..15f14d7e3 100644
--- a/keyboards/neson_design/n6/n6.c
+++ b/keyboards/neson_design/n6/n6.c
@@ -232,8 +232,6 @@ const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = {
    {0, C9_16, C7_15, C6_15},
 };
 #endif
-__attribute__((weak))
-void matrix_init_user(void) {}
 void matrix_init_kb(void)
 {
diff --git a/keyboards/newgame40/newgame40.c b/keyboards/newgame40/newgame40.c
index e55b25b3d..98add8ea0 100644
--- a/keyboards/newgame40/newgame40.c
+++ b/keyboards/newgame40/newgame40.c
@@ -1,5 +1 @@
 #include "newgame40.h"
-void matrix_init_kb(void) {
-        matrix_init_user();
-}
diff --git a/keyboards/nightmare/nightmare.c b/keyboards/nightmare/nightmare.c
index ee0f5fc2e..301a8981a 100644
--- a/keyboards/nightmare/nightmare.c
+++ b/keyboards/nightmare/nightmare.c
@@ -14,38 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "nightmare.h"
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-/*
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-  matrix_init_user();
-}
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-  matrix_scan_user();
-}
-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/niu_mini/keymaps/default/keymap.c b/keyboards/niu_mini/keymaps/default/keymap.c
index 1fdeb02fc..c0f5d06c7 100644
--- a/keyboards/niu_mini/keymaps/default/keymap.c
+++ b/keyboards/niu_mini/keymaps/default/keymap.c
@@ -56,48 +56,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
    )
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    return true;
-}
-void led_set_user(uint8_t usb_led) {
-    if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) {
-    } else {
-    }
-    if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
-    } else {
-    }
-    if (IS_LED_ON(usb_led, USB_LED_SCROLL_LOCK)) {
-    } else {
-    }
-    if (IS_LED_ON(usb_led, USB_LED_COMPOSE)) {
-    } else {
-    }
-    if (IS_LED_ON(usb_led, USB_LED_KANA)) {
-    } else {
-    }
-}
diff --git a/keyboards/nk65/keymaps/default/keymap.c b/keyboards/nk65/keymaps/default/keymap.c
index a793a8bf4..b4ea68e0e 100755
--- a/keyboards/nk65/keymaps/default/keymap.c
+++ b/keyboards/nk65/keymaps/default/keymap.c
@@ -44,15 +44,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,\
    KC_TRNS, KC_TRNS, KC_TRNS,                KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 };
-void matrix_init_user(void) {
-  //user initialization
-}
-void matrix_scan_user(void) {
-  //user matrix
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-\ No newline at end of file
diff --git a/keyboards/nk65/keymaps/via/keymap.c b/keyboards/nk65/keymaps/via/keymap.c
index a793a8bf4..b4ea68e0e 100755
--- a/keyboards/nk65/keymaps/via/keymap.c
+++ b/keyboards/nk65/keymaps/via/keymap.c
@@ -44,15 +44,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,\
    KC_TRNS, KC_TRNS, KC_TRNS,                KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 };
-void matrix_init_user(void) {
-  //user initialization
-}
-void matrix_scan_user(void) {
-  //user matrix
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-\ No newline at end of file
diff --git a/keyboards/noxary/268/keymaps/ansi/keymap.c b/keyboards/noxary/268/keymaps/ansi/keymap.c
index ffe376b4e..b9b0db247 100644
--- a/keyboards/noxary/268/keymaps/ansi/keymap.c
+++ b/keyboards/noxary/268/keymaps/ansi/keymap.c
@@ -52,49 +52,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
 void led_set_user(uint8_t usb_led) {
-  if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-  } else {
-  }
  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-    DDRB |= (1 << 6);
+    setPinOutput(B6);
-    PORTB |= (1 << 6);
+    writePinHigh(B6);
  } else {
-    DDRB &= ~(1 << 6);
+    setPinInput(B6);
-    PORTB &= ~(1 << 6);
+    writePinLow(B6);
  }
-  if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_COMPOSE)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_KANA)) {
-  } else {
-  }
 }
diff --git a/keyboards/noxary/268/keymaps/default/keymap.c b/keyboards/noxary/268/keymaps/default/keymap.c
index a76509db8..f4e8e5db4 100644
--- a/keyboards/noxary/268/keymaps/default/keymap.c
+++ b/keyboards/noxary/268/keymaps/default/keymap.c
@@ -70,52 +70,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    return true;
-}
 void led_set_user(uint8_t usb_led) {
-    if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-    }
-    else {
-    }
    if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-        DDRB |= (1 << 6); PORTB |= (1 << 6);
+        setPinOutput(B6);
+        writePinHigh(B6);
    }
    else {
-        DDRB &= ~(1 << 6); PORTB &= ~(1 << 6);
+        setPinInput(B6);
-    }
+        writePinLow(B6);
-    if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
    }
-    else {
-    }
-    if (usb_led & (1 << USB_LED_COMPOSE)) {
-    }
-    else {
-    }
-    if (usb_led & (1 << USB_LED_KANA)) {
-    }
-    else {
-    }
 }
diff --git a/keyboards/noxary/268/keymaps/iso/keymap.c b/keyboards/noxary/268/keymaps/iso/keymap.c
index 3d9ca2352..d19084536 100644
--- a/keyboards/noxary/268/keymaps/iso/keymap.c
+++ b/keyboards/noxary/268/keymaps/iso/keymap.c
@@ -52,49 +52,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
 void led_set_user(uint8_t usb_led) {
-  if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-  } else {
-  }
  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-    DDRB |= (1 << 6);
+    setPinOutput(B6);
-    PORTB |= (1 << 6);
+    writePinHigh(B6);
  } else {
-    DDRB &= ~(1 << 6);
+    setPinInput(B6);
-    PORTB &= ~(1 << 6);
+    writePinLow(B6);
  }
-  if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_COMPOSE)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_KANA)) {
-  } else {
-  }
 }
diff --git a/keyboards/orange75/keymaps/default/keymap.c b/keyboards/orange75/keymaps/default/keymap.c
index 37e198f99..11027ca6e 100644
--- a/keyboards/orange75/keymaps/default/keymap.c
+++ b/keyboards/orange75/keymaps/default/keymap.c
@@ -52,34 +52,29 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        )
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    return true;
-}
 void led_set_user(uint8_t usb_led) {
    if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-        DDRB |= (1 << 0); PORTB &= ~(1 << 0);
+        setPinOutput(B0);
+        writePinLow(B0);
    } else {
-        DDRB &= ~(1 << 0); PORTB &= ~(1 << 0);
+        setPinInput(B0);
+        writePinLow(B0);
    }
    if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-        DDRB |= (1 << 1); PORTB &= ~(1 << 1);
+        setPinOutput(B1);
+        writePinLow(B1);
    } else {
-        DDRB &= ~(1 << 1); PORTB &= ~(1 << 1);
+        setPinInput(B1);
+        writePinLow(B1);
    }
    if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-        DDRB |= (1 << 2); PORTB &= ~(1 << 2);
+        setPinOutput(B2);
+        writePinLow(B2);
    } else {
-        DDRB &= ~(1 << 2); PORTB &= ~(1 << 2);
+        setPinInput(B2);
+        writePinLow(B2);
    }
-}
-\ No newline at end of file
+}
diff --git a/keyboards/org60/keymaps/default/keymap.c b/keyboards/org60/keymaps/default/keymap.c
index 1c209a72d..204c7634b 100644
--- a/keyboards/org60/keymaps/default/keymap.c
+++ b/keyboards/org60/keymaps/default/keymap.c
@@ -19,8 +19,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                          KC_RGUI, MO(1),    KC_HOME, KC_PGDOWN,KC_END),
 };
-// Loop
-void matrix_scan_user(void) {
-  // Empty
-};
diff --git a/keyboards/orthodox/rev1/rev1.c b/keyboards/orthodox/rev1/rev1.c
index db8d435c3..49deba4db 100644
--- a/keyboards/orthodox/rev1/rev1.c
+++ b/keyboards/orthodox/rev1/rev1.c
@@ -21,19 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "orthodox.h"
-void matrix_init_kb(void) {
-  //// // green led on
-  //// DDRD |= (1<<5);
-  //// PORTD &= ~(1<<5);
-  //// // orange led on
-  //// DDRB |= (1<<0);
-  //// PORTB &= ~(1<<0);
-  matrix_init_user();
-};
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
 // swap-hands action needs a matrix to define the swap
diff --git a/keyboards/orthodox/rev3/rev3.c b/keyboards/orthodox/rev3/rev3.c
index db8d435c3..49deba4db 100644
--- a/keyboards/orthodox/rev3/rev3.c
+++ b/keyboards/orthodox/rev3/rev3.c
@@ -21,19 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "orthodox.h"
-void matrix_init_kb(void) {
-  //// // green led on
-  //// DDRD |= (1<<5);
-  //// PORTD &= ~(1<<5);
-  //// // orange led on
-  //// DDRB |= (1<<0);
-  //// PORTB &= ~(1<<0);
-  matrix_init_user();
-};
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
 // swap-hands action needs a matrix to define the swap
diff --git a/keyboards/orthodox/rev3_teensy/rev3_teensy.c b/keyboards/orthodox/rev3_teensy/rev3_teensy.c
index db8d435c3..49deba4db 100644
--- a/keyboards/orthodox/rev3_teensy/rev3_teensy.c
+++ b/keyboards/orthodox/rev3_teensy/rev3_teensy.c
@@ -21,19 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "orthodox.h"
-void matrix_init_kb(void) {
-  //// // green led on
-  //// DDRD |= (1<<5);
-  //// PORTD &= ~(1<<5);
-  //// // orange led on
-  //// DDRB |= (1<<0);
-  //// PORTB &= ~(1<<0);
-  matrix_init_user();
-};
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
 // swap-hands action needs a matrix to define the swap
diff --git a/keyboards/otaku_split/rev0/keymaps/default/keymap.c b/keyboards/otaku_split/rev0/keymaps/default/keymap.c
index 844e9c50e..5bf742196 100644
--- a/keyboards/otaku_split/rev0/keymaps/default/keymap.c
+++ b/keyboards/otaku_split/rev0/keymaps/default/keymap.c
@@ -29,21 +29,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                        KC_LCTRL, KC_LGUI,KC_LALT,KC_MHEN,KC_TAB,KC_SPC,    KC_ENT,KC_BSPC,KC_HENK,KC_KANA,KC_RALT,KC_RGUI,KC_APP,KC_RCTRL
  ),
 };
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-  }
-  return true;
-}
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/otaku_split/rev0/keymaps/sample/keymap.c b/keyboards/otaku_split/rev0/keymaps/sample/keymap.c
index b1df2cef0..a309db6ff 100644
--- a/keyboards/otaku_split/rev0/keymaps/sample/keymap.c
+++ b/keyboards/otaku_split/rev0/keymaps/sample/keymap.c
@@ -65,15 +65,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 }
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/otaku_split/rev0/rev0.c b/keyboards/otaku_split/rev0/rev0.c
index 75c24b584..6ec80aabb 100644
--- a/keyboards/otaku_split/rev0/rev0.c
+++ b/keyboards/otaku_split/rev0/rev0.c
@@ -14,38 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "rev0.h"
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-/*
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-  matrix_init_user();
-}
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-  matrix_scan_user();
-}
-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/otaku_split/rev1/keymaps/default/keymap.c b/keyboards/otaku_split/rev1/keymaps/default/keymap.c
index c708e53eb..a7f88b2a8 100644
--- a/keyboards/otaku_split/rev1/keymaps/default/keymap.c
+++ b/keyboards/otaku_split/rev1/keymaps/default/keymap.c
@@ -37,22 +37,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                        KC_LCTRL, KC_LGUI,KC_LALT,KC_MHEN,KC_TRNS,KC_SPC,KC_SPC,        KC_TRNS,KC_ENT,KC_BSPC,KC_HENK,KC_TRNS,KC_LEFT,KC_DOWN,KC_RIGHT
  )
 };
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-  }
-  return true;
-}
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/otaku_split/rev1/keymaps/sample/keymap.c b/keyboards/otaku_split/rev1/keymaps/sample/keymap.c
index 6875f462f..b73c4fe64 100644
--- a/keyboards/otaku_split/rev1/keymaps/sample/keymap.c
+++ b/keyboards/otaku_split/rev1/keymaps/sample/keymap.c
@@ -71,15 +71,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 }
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/otaku_split/rev1/rev1.c b/keyboards/otaku_split/rev1/rev1.c
index 88b42eb95..b63bb047a 100644
--- a/keyboards/otaku_split/rev1/rev1.c
+++ b/keyboards/otaku_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/paladin64/keymaps/default/keymap.c b/keyboards/paladin64/keymaps/default/keymap.c
index 63c1f1f0b..15c5858a8 100755
--- a/keyboards/paladin64/keymaps/default/keymap.c
+++ b/keyboards/paladin64/keymaps/default/keymap.c
@@ -43,48 +43,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-        return true;
-}
-void led_set_user(uint8_t usb_led) {
-        if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-                
-        } else {
-                
-        }
-        if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-                
-        } else {
-                
-        }
-        if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-                
-        } else {
-                
-        }
-        if (usb_led & (1 << USB_LED_COMPOSE)) {
-                
-        } else {
-                
-        }
-        if (usb_led & (1 << USB_LED_KANA)) {
-                
-        } else {
-                
-        }
-}
diff --git a/keyboards/pdxkbc/keymaps/default/keymap.c b/keyboards/pdxkbc/keymaps/default/keymap.c
index feb344704..2c208dea5 100644
--- a/keyboards/pdxkbc/keymaps/default/keymap.c
+++ b/keyboards/pdxkbc/keymaps/default/keymap.c
@@ -57,9 +57,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  return true;
 }
-void matrix_init_user(void) {}
-void matrix_scan_user(void) {}
-void led_set_user(uint8_t usb_led) {}
diff --git a/keyboards/percent/booster/booster.c b/keyboards/percent/booster/booster.c
index 3a298f58f..bbae5d6f4 100644
--- a/keyboards/percent/booster/booster.c
+++ b/keyboards/percent/booster/booster.c
@@ -14,38 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "booster.h"
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-/*
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-  matrix_init_user();
-}
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-  matrix_scan_user();
-}
-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/pinky/pinky.c b/keyboards/pinky/pinky.c
index 9b98ea85d..aa873c7a7 100644
--- a/keyboards/pinky/pinky.c
+++ b/keyboards/pinky/pinky.c
@@ -14,30 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "pinky.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-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/planck/light/light.c b/keyboards/planck/light/light.c
index 3a53e3998..839848228 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
@@ -120,11 +115,6 @@ uint8_t rgb_matrix_map_row_column_to_led_kb(uint8_t row, uint8_t column, uint8_t
    return 0;
 }
-void matrix_scan_kb(void)
-{
-    matrix_scan_user();
-}
 void suspend_power_down_kb(void)
 {
    rgb_matrix_set_suspend_state(true);
diff --git a/keyboards/playkbtw/pk60/keymaps/default/keymap.c b/keyboards/playkbtw/pk60/keymaps/default/keymap.c
index d0fbc619f..8c5c25e6b 100644
--- a/keyboards/playkbtw/pk60/keymaps/default/keymap.c
+++ b/keyboards/playkbtw/pk60/keymaps/default/keymap.c
@@ -20,42 +20,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
 void led_set_user(uint8_t usb_led) {
-  if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-  } else {
-  }
  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-    DDRF |= (1 << 4); PORTF &= ~(1 << 4);
+    setPinOutput(F4);
-  } else {
+    writePinLow(F4);
-    DDRF &= ~(1 << 4); PORTF &= ~(1 << 4);
-  }
-  if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
  } else {
+    setPinInput(F4);
-  }
+    writePinLow(F4);
-  if (usb_led & (1 << USB_LED_COMPOSE)) {
-  } else {
  }
-  if (usb_led & (1 << USB_LED_KANA)) {
-  } else {
-  }
 }
diff --git a/keyboards/primekb/prime_e/keymaps/default/keymap.c b/keyboards/primekb/prime_e/keymaps/default/keymap.c
index 65b2f67a3..08067b313 100644
--- a/keyboards/primekb/prime_e/keymaps/default/keymap.c
+++ b/keyboards/primekb/prime_e/keymaps/default/keymap.c
@@ -57,11 +57,6 @@ void matrix_init_user(void) {
  writePinLow(B3);
 }
-void matrix_scan_user(void) {
-}
 void led_set_user(uint8_t usb_led) {
  if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) {
    writePinHigh(B2);
diff --git a/keyboards/primekb/prime_e/keymaps/via/keymap.c b/keyboards/primekb/prime_e/keymaps/via/keymap.c
index 960d1dc39..195f845cc 100644
--- a/keyboards/primekb/prime_e/keymaps/via/keymap.c
+++ b/keyboards/primekb/prime_e/keymaps/via/keymap.c
@@ -85,11 +85,6 @@ void matrix_init_user(void) {
  writePinLow(B3);
 }
-void matrix_scan_user(void) {
-}
 void led_set_user(uint8_t usb_led) {
  if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) {
    writePinHigh(B2);
diff --git a/keyboards/primekb/prime_e/prime_e.c b/keyboards/primekb/prime_e/prime_e.c
index bd51ce008..8e30f3c5f 100644
--- a/keyboards/primekb/prime_e/prime_e.c
+++ b/keyboards/primekb/prime_e/prime_e.c
@@ -14,9 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "prime_e.h"
-void led_set_kb(uint8_t usb_led) {
-        // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-        led_set_user(usb_led);
-}
diff --git a/keyboards/primekb/prime_o/keymaps/default/keymap.c b/keyboards/primekb/prime_o/keymaps/default/keymap.c
index a2d9e807c..b3ca2b15f 100644
--- a/keyboards/primekb/prime_o/keymaps/default/keymap.c
+++ b/keyboards/primekb/prime_o/keymaps/default/keymap.c
@@ -63,15 +63,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 }
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/primekb/prime_o/prime_o.c b/keyboards/primekb/prime_o/prime_o.c
index d603cc6c9..369347cf4 100644
--- a/keyboards/primekb/prime_o/prime_o.c
+++ b/keyboards/primekb/prime_o/prime_o.c
@@ -14,30 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "prime_o.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-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/primekb/prime_r/keymaps/default/keymap.c b/keyboards/primekb/prime_r/keymaps/default/keymap.c
index afff0d7da..885a37e08 100644
--- a/keyboards/primekb/prime_r/keymaps/default/keymap.c
+++ b/keyboards/primekb/prime_r/keymaps/default/keymap.c
@@ -52,13 +52,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  ),
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
diff --git a/keyboards/primekb/prime_r/prime_r.c b/keyboards/primekb/prime_r/prime_r.c
index 845769dae..3a08bed59 100644
--- a/keyboards/primekb/prime_r/prime_r.c
+++ b/keyboards/primekb/prime_r/prime_r.c
@@ -14,30 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "prime_r.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-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/quantrik/kyuu/keymaps/default/keymap.c b/keyboards/quantrik/kyuu/keymaps/default/keymap.c
index 5e4709b41..6b7adf0d1 100644
--- a/keyboards/quantrik/kyuu/keymaps/default/keymap.c
+++ b/keyboards/quantrik/kyuu/keymaps/default/keymap.c
@@ -59,15 +59,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
    }
    return true;
 }
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/quantrik/kyuu/kyuu.c b/keyboards/quantrik/kyuu/kyuu.c
index e9a72a574..7f7d2fcc8 100644
--- a/keyboards/quantrik/kyuu/kyuu.c
+++ b/keyboards/quantrik/kyuu/kyuu.c
@@ -14,30 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "kyuu.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-        matrix_init_user();
-}
-void matrix_scan_kb(void) {
-        // put your looping keyboard code here
-        // runs every cycle (a lot)
-        matrix_scan_user();
-}
-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/qwertyydox/rev1/rev1.c b/keyboards/qwertyydox/rev1/rev1.c
index 609c479eb..520a869e5 100644
--- a/keyboards/qwertyydox/rev1/rev1.c
+++ b/keyboards/qwertyydox/rev1/rev1.c
@@ -1,22 +1 @@
 #include "rev1.h"
-#ifdef SSD1306OLED
-void led_set_kb(uint8_t usb_led) {
-    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-    led_set_user(usb_led);
-}
-#endif
-void matrix_init_kb(void) {
-    // // green led on
-    // DDRD |= (1<<5);
-    // PORTD &= ~(1<<5);
-    // // orange led on
-    // DDRB |= (1<<0);
-    // PORTB &= ~(1<<0);
-        matrix_init_user();
-};
diff --git a/keyboards/rabbit/rabbit68/rabbit68.c b/keyboards/rabbit/rabbit68/rabbit68.c
index a9e4c6533..652d8417e 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/redox/rev1/rev1.c b/keyboards/redox/rev1/rev1.c
index 2eb7c7c0e..b1ab15df3 100644
--- a/keyboards/redox/rev1/rev1.c
+++ b/keyboards/redox/rev1/rev1.c
@@ -1,22 +1 @@
 #include "redox.h"
-#ifdef SSD1306OLED
-void led_set_kb(uint8_t usb_led) {
-    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-    led_set_user(usb_led);
-}
-#endif
-void matrix_init_kb(void) {
-    // // green led on
-    // DDRD |= (1<<5);
-    // PORTD &= ~(1<<5);
-    // // orange led on
-    // DDRB |= (1<<0);
-    // PORTB &= ~(1<<0);
-        matrix_init_user();
-};
diff --git a/keyboards/reviung34/reviung34.c b/keyboards/reviung34/reviung34.c
index 9a10f96f5..00862d73e 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 1ea816e5a..0948106e9 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/rgbkb/zen/rev1/rev1.c b/keyboards/rgbkb/zen/rev1/rev1.c
index 5f4cd32f6..520a869e5 100644
--- a/keyboards/rgbkb/zen/rev1/rev1.c
+++ b/keyboards/rgbkb/zen/rev1/rev1.c
@@ -1,22 +1 @@
 #include "rev1.h"
-#ifdef SSD1306OLED
-void led_set_kb(uint8_t usb_led) {
-    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-    led_set_user(usb_led);
-}
-#endif
-void matrix_init_kb(void) {
-    // // green led on
-    // DDRD |= (1<<5);
-    // PORTD &= ~(1<<5);
-    // // orange led on
-    // DDRB |= (1<<0);
-    // PORTB &= ~(1<<0);
-        matrix_init_user();
-};
diff --git a/keyboards/rominronin/katana60/rev1/keymaps/default/keymap.c b/keyboards/rominronin/katana60/rev1/keymaps/default/keymap.c
index 989c7c16b..1cb925889 100644
--- a/keyboards/rominronin/katana60/rev1/keymaps/default/keymap.c
+++ b/keyboards/rominronin/katana60/rev1/keymaps/default/keymap.c
@@ -63,19 +63,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    )
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/scarletbandana/keymaps/default/keymap.c b/keyboards/scarletbandana/keymaps/default/keymap.c
index 55d8f07c1..3060bb76a 100644
--- a/keyboards/scarletbandana/keymaps/default/keymap.c
+++ b/keyboards/scarletbandana/keymaps/default/keymap.c
@@ -87,14 +87,6 @@ void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
  float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
 #endif
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  switch (keycode) {
    case LOWER:
@@ -167,7 +159,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 }
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/sck/m0116b/keymaps/default/keymap.c b/keyboards/sck/m0116b/keymaps/default/keymap.c
index b8ae5931f..8a6f831fe 100644
--- a/keyboards/sck/m0116b/keymaps/default/keymap.c
+++ b/keyboards/sck/m0116b/keymaps/default/keymap.c
@@ -72,14 +72,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    ),
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  switch (keycode) {
    case M0116B:
@@ -94,7 +86,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 };
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/sck/m0116b/keymaps/m0116/keymap.c b/keyboards/sck/m0116b/keymaps/m0116/keymap.c
index b8ae5931f..8a6f831fe 100644
--- a/keyboards/sck/m0116b/keymaps/m0116/keymap.c
+++ b/keyboards/sck/m0116b/keymaps/m0116/keymap.c
@@ -72,14 +72,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    ),
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  switch (keycode) {
    case M0116B:
@@ -94,7 +86,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 };
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/sck/m0116b/keymaps/m0118/keymap.c b/keyboards/sck/m0116b/keymaps/m0118/keymap.c
index 094d70066..5d718e9a7 100644
--- a/keyboards/sck/m0116b/keymaps/m0118/keymap.c
+++ b/keyboards/sck/m0116b/keymaps/m0118/keymap.c
@@ -72,14 +72,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    ),
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  switch (keycode) {
    case M0116B:
@@ -94,7 +86,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 };
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/sck/m0116b/m0116b.c b/keyboards/sck/m0116b/m0116b.c
index 2e0a4ae2c..368bc3eaf 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/neiso/neiso.c b/keyboards/sck/neiso/neiso.c
index 4b817bdd5..8fe008e28 100644
--- a/keyboards/sck/neiso/neiso.c
+++ b/keyboards/sck/neiso/neiso.c
@@ -14,17 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "neiso.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 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/keymaps/all/keymap.c b/keyboards/sck/osa/keymaps/all/keymap.c
index 01bd9da25..5f6dfbbc8 100644
--- a/keyboards/sck/osa/keymaps/all/keymap.c
+++ b/keyboards/sck/osa/keymaps/all/keymap.c
@@ -15,13 +15,6 @@
 */
 #include QMK_KEYBOARD_H
-// Defines the keycodes used by our macros in process_record_user
-//enum custom_keycodes {
-//  QMKBEST = SAFE_RANGE,
-//  QMKURL
-//};
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Keymap BASE: (Base Layer) Default Layer
   * .----.,----------------------------------------------------------------------.
@@ -64,40 +57,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                  KC_LCTL,          KC_LALT,          KC_SPC, _______,                   KC_SPC,                    KC_RALT,                            KC_RCTL
  ),
 };
-//bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-//  switch (keycode) {
-//    case QMKBEST:
-//      if (record->event.pressed) {
-//        // when keycode QMKBEST is pressed
-//        SEND_STRING("QMK is the best thing ever!");
-//      } else {
-//       // when keycode QMKBEST is released
-//      }
-//      break;
-//    case QMKURL:
-//      if (record->event.pressed) {
-//        // when keycode QMKURL is pressed
-//       SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER));
-//      } else {
-//        // when keycode QMKURL is released
-//     }
-//      break;
-//  }
-//  return true;
-//}
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/sck/osa/keymaps/default/keymap.c b/keyboards/sck/osa/keymaps/default/keymap.c
index d6cfddc46..b61b8da48 100644
--- a/keyboards/sck/osa/keymaps/default/keymap.c
+++ b/keyboards/sck/osa/keymaps/default/keymap.c
@@ -15,13 +15,6 @@
 */
 #include QMK_KEYBOARD_H
-// Defines the keycodes used by our macros in process_record_user
-//enum custom_keycodes {
-//  QMKBEST = SAFE_RANGE,
-//  QMKURL
-//};
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Keymap BASE: (Base Layer) Default Layer
   * .----.,----------------------------------------------------------------------.
@@ -64,40 +57,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                   KC_LCTL,              KC_LALT,             KC_SPC, _______,                     KC_SPC,                    KC_RALT,                            KC_RCTL
  ),
 };
-//bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-//  switch (keycode) {
-//    case QMKBEST:
-//      if (record->event.pressed) {
-//        // when keycode QMKBEST is pressed
-//        SEND_STRING("QMK is the best thing ever!");
-//      } else {
-//       // when keycode QMKBEST is released
-//      }
-//      break;
-//    case QMKURL:
-//      if (record->event.pressed) {
-//        // when keycode QMKURL is pressed
-//       SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER));
-//      } else {
-//        // when keycode QMKURL is released
-//     }
-//      break;
-//  }
-//  return true;
-//}
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-//void led_set_user(uint16_t usb_led) {
-//
-//}
diff --git a/keyboards/scythe/scythe.c b/keyboards/scythe/scythe.c
index e8060ac27..c1f95e2f7 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/keymaps/default/keymap.c b/keyboards/sentraq/number_pad/keymaps/default/keymap.c
index 90c806a91..207f01abd 100644
--- a/keyboards/sentraq/number_pad/keymaps/default/keymap.c
+++ b/keyboards/sentraq/number_pad/keymaps/default/keymap.c
@@ -18,13 +18,6 @@
 #define _BL 0
 #define _FN 1
-// Defines the keycodes used by our macros in process_record_user.
-// Disabled as it isn't used in this keymap, but available for modification.
-// enum custom_keycodes {
-//   QMKBEST = SAFE_RANGE,
-//   QMKURL
-// };
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [_BL] = LAYOUT_numpad_5x4(
    /* Base Layer: Number Pad
@@ -67,39 +60,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    KC_NO,            KC_NO,   KC_NLCK
  ),
 };
-// Handles macros for keycodes defined above.
-// Disabled as it isn't used in this keymap, but available for modification.
-// bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-//   switch (keycode) {
-//     case QMKBEST:
-//       if (record->event.pressed) {
-//         // when keycode QMKBEST is pressed
-//         SEND_STRING("QMK is the best thing ever!");
-//       } else {
-//         // when keycode QMKBEST is released
-//       }
-//       break;
-//     case QMKURL:
-//       if (record->event.pressed) {
-//         // when keycode QMKURL is pressed
-//         SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER));
-//       } else {
-//         // when keycode QMKURL is released
-//       }
-//       break;
-//   }
-//   return true;
-// }
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/sentraq/number_pad/number_pad.c b/keyboards/sentraq/number_pad/number_pad.c
index 8c39efac5..f32364871 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 253f5495c..2a5bcfdd6 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/sentraq/s65_x/s65_x.c b/keyboards/sentraq/s65_x/s65_x.c
index 844f5cf28..09ce310b0 100644
--- a/keyboards/sentraq/s65_x/s65_x.c
+++ b/keyboards/sentraq/s65_x/s65_x.c
@@ -1,18 +1 @@
 #include "s65_x.h"
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-  matrix_init_user();
-};
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-  matrix_scan_user();
-};
-void led_set_kb(uint8_t usb_led) {
-  // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-  led_set_user(usb_led);
-}
diff --git a/keyboards/setta21/rev1/rev1.c b/keyboards/setta21/rev1/rev1.c
index 3c0823870..b37745277 100644
--- a/keyboards/setta21/rev1/rev1.c
+++ b/keyboards/setta21/rev1/rev1.c
@@ -19,7 +19,3 @@
        4
 } };
 #endif
-void matrix_init_kb(void) {
-        matrix_init_user();
-};
diff --git a/keyboards/shiro/shiro.c b/keyboards/shiro/shiro.c
index b30329d33..3f92c54a0 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/keymaps/default/keymap.c b/keyboards/snampad/keymaps/default/keymap.c
index 6e887e52f..cdd3dff59 100644
--- a/keyboards/snampad/keymaps/default/keymap.c
+++ b/keyboards/snampad/keymaps/default/keymap.c
@@ -26,15 +26,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  ),
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/snampad/snampad.c b/keyboards/snampad/snampad.c
index c7a94245c..58413d0af 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/southpole/keymaps/default/keymap.c b/keyboards/southpole/keymaps/default/keymap.c
index 78cb81f4b..20333f0e3 100644
--- a/keyboards/southpole/keymaps/default/keymap.c
+++ b/keyboards/southpole/keymaps/default/keymap.c
@@ -18,9 +18,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                )
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
diff --git a/keyboards/spacetime/keymaps/default/keymap.c b/keyboards/spacetime/keymaps/default/keymap.c
index 6be5d1d6d..ffd867ca0 100644
--- a/keyboards/spacetime/keymaps/default/keymap.c
+++ b/keyboards/spacetime/keymaps/default/keymap.c
@@ -67,19 +67,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 layer_state_t layer_state_set_user(layer_state_t state) {
  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
 }
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/spacetime/rev1/rev1.c b/keyboards/spacetime/rev1/rev1.c
index 6fde622c2..b9942a351 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 6b62c071e..3ecef1c1d 100644
--- a/keyboards/spacetime/rev2/rev2.c
+++ b/keyboards/spacetime/rev2/rev2.c
@@ -22,23 +22,3 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
  return process_record_user(keycode, record);
 #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/standaside/standaside.c b/keyboards/standaside/standaside.c
index 904e92d33..9f445ec04 100644
--- a/keyboards/standaside/standaside.c
+++ b/keyboards/standaside/standaside.c
@@ -1,14 +1 @@
 #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 3d2d1de77..1c2936e15 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/alpha/keymaps/default/keymap.c b/keyboards/suihankey/alpha/keymaps/default/keymap.c
index 852334d87..79c4c3df6 100644
--- a/keyboards/suihankey/alpha/keymaps/default/keymap.c
+++ b/keyboards/suihankey/alpha/keymaps/default/keymap.c
@@ -55,22 +55,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  ),
 };
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
 #ifdef OLED_ENABLE
 void oled_task_user(void) {
  oled_write_P(PSTR("Layer: "), false);
diff --git a/keyboards/suihankey/rev1/keymaps/default/keymap.c b/keyboards/suihankey/rev1/keymaps/default/keymap.c
index 852334d87..79c4c3df6 100644
--- a/keyboards/suihankey/rev1/keymaps/default/keymap.c
+++ b/keyboards/suihankey/rev1/keymaps/default/keymap.c
@@ -55,22 +55,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  ),
 };
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
 #ifdef OLED_ENABLE
 void oled_task_user(void) {
  oled_write_P(PSTR("Layer: "), false);
diff --git a/keyboards/suihankey/rev1/rev1.c b/keyboards/suihankey/rev1/rev1.c
index f97e6caed..40ff30e62 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 3d2d1de77..1c2936e15 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/keymaps/default/keymap.c b/keyboards/suihankey/split/keymaps/default/keymap.c
index e844db9ed..a48072d9f 100644
--- a/keyboards/suihankey/split/keymaps/default/keymap.c
+++ b/keyboards/suihankey/split/keymaps/default/keymap.c
@@ -54,19 +54,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                        KC_NO,  KC_NO,  KC_NO,                 KC_NO,  KC_NO,  KC_NO
  ),
 };
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/suihankey/split/rev1/rev1.c b/keyboards/suihankey/split/rev1/rev1.c
index f97e6caed..40ff30e62 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/tanuki/tanuki.c b/keyboards/tanuki/tanuki.c
index 573e20061..97f744664 100644
--- a/keyboards/tanuki/tanuki.c
+++ b/keyboards/tanuki/tanuki.c
@@ -2,9 +2,3 @@
 #include "rgblight.h"
 #include "config.h"
 #include "rgblight.h"
-void matrix_init_kb(void) {
-        // put your keyboard start-up code here
-        // runs once when the firmware starts up
-};
diff --git a/keyboards/tg4x/tg4x.c b/keyboards/tg4x/tg4x.c
index 9452d4d95..fa7a970d5 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 9686379eb..29a824892 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/roadkit/roadkit.c b/keyboards/thevankeyboards/roadkit/roadkit.c
index 26e0c51ec..0f3d7f691 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/tkc/candybar/lefty/lefty.c b/keyboards/tkc/candybar/lefty/lefty.c
index 920811b83..6bda3805c 100644
--- a/keyboards/tkc/candybar/lefty/lefty.c
+++ b/keyboards/tkc/candybar/lefty/lefty.c
@@ -15,7 +15,3 @@
 */
 #include "lefty.h"
-void matrix_init_kb(void) {
-  matrix_init_user();
-}
diff --git a/keyboards/tmo50/tmo50.c b/keyboards/tmo50/tmo50.c
index bad4319f1..80eb286f4 100644
--- a/keyboards/tmo50/tmo50.c
+++ b/keyboards/tmo50/tmo50.c
@@ -31,26 +31,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);
-}
 layer_state_t layer_state_set_kb(layer_state_t state)
 {
  state = layer_state_set_user(state);
diff --git a/keyboards/treasure/type9/keymaps/default/keymap.c b/keyboards/treasure/type9/keymaps/default/keymap.c
index 300d5b1e4..7d2242171 100644
--- a/keyboards/treasure/type9/keymaps/default/keymap.c
+++ b/keyboards/treasure/type9/keymaps/default/keymap.c
@@ -50,15 +50,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 }
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/treasure/type9/type9.c b/keyboards/treasure/type9/type9.c
index 58a9c8f52..466f29467 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/uk78/keymaps/default/keymap.c b/keyboards/uk78/keymaps/default/keymap.c
index 18791f957..c23cca1b8 100644
--- a/keyboards/uk78/keymaps/default/keymap.c
+++ b/keyboards/uk78/keymaps/default/keymap.c
@@ -75,48 +75,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
 void led_set_user(uint8_t usb_led) {
-  if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-  } else {
-  }
  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-    DDRA |= (1 << 3);
+    setPinOutput(A3);
-    PORTA |= (1 << 3);
+    writePinHigh(A3);
  } else {
-    DDRA &= ~(1 << 3);
+    setPinInput(A3);
-    PORTA &= ~(1 << 3);
+    writePinLow(A3);
  }
+}
-  if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_COMPOSE)) {
-  } else {
-  }
-  if (usb_led & (1 << USB_LED_KANA)) {
-  } else {
-  }
-}
-\ No newline at end of file
diff --git a/keyboards/ut472/ut472.c b/keyboards/ut472/ut472.c
index c0686d661..637922171 100644
--- a/keyboards/ut472/ut472.c
+++ b/keyboards/ut472/ut472.c
@@ -1,13 +1 @@
 #include "ut472.h"
-void matrix_init_kb(void) {
-  // Keyboard start-up code goes here
-  // Runs once when the firmware starts up
-  matrix_init_user();
-};
-void matrix_scan_kb(void) {
-  // Looping keyboard code goes here
-  // This runs every cycle (a lot)
-  matrix_scan_user();
-};
diff --git a/keyboards/uzu42/uzu42.c b/keyboards/uzu42/uzu42.c
index 0eb8c5f3a..df71734f7 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/keymaps/default/keymap.c b/keyboards/v60_type_r/keymaps/default/keymap.c
index 352400815..a002a46a8 100644
--- a/keyboards/v60_type_r/keymaps/default/keymap.c
+++ b/keyboards/v60_type_r/keymaps/default/keymap.c
@@ -62,7 +62,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
               KC_TRNS,   KC_TRNS,  KC_TRNS,            KC_TRNS,                                                           KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS),
 };
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/v60_type_r/keymaps/iso/keymap.c b/keyboards/v60_type_r/keymaps/iso/keymap.c
index 74aee86ed..17feaec3d 100644
--- a/keyboards/v60_type_r/keymaps/iso/keymap.c
+++ b/keyboards/v60_type_r/keymaps/iso/keymap.c
@@ -48,7 +48,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  ),
 };
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/vitamins_included/rev1/rev1.c b/keyboards/vitamins_included/rev1/rev1.c
index 56fbb8787..520a869e5 100644
--- a/keyboards/vitamins_included/rev1/rev1.c
+++ b/keyboards/vitamins_included/rev1/rev1.c
@@ -1,13 +1 @@
 #include "rev1.h"
-#ifdef SSD1306OLED
-void led_set_kb(uint8_t usb_led) {
-    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-    led_set_user(usb_led);
-}
-#endif
-void matrix_init_kb(void) {
-        matrix_init_user();
-};
diff --git a/keyboards/vitamins_included/rev2/rev2.c b/keyboards/vitamins_included/rev2/rev2.c
index 7bdeebb03..15b47089e 100644
--- a/keyboards/vitamins_included/rev2/rev2.c
+++ b/keyboards/vitamins_included/rev2/rev2.c
@@ -1,13 +1,5 @@
 #include "rev2.h"
-#ifdef SSD1306OLED
-void led_set_kb(uint8_t usb_led) {
-    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-    led_set_user(usb_led);
-}
-#endif
 bool is_keyboard_left(void) {
    #if defined(MASTER_LEFT)
        return is_keyboard_master();
@@ -25,7 +17,3 @@ bool is_keyboard_left(void) {
    return is_keyboard_master();
 }
-void matrix_init_kb(void) {
-        matrix_init_user();
-};
diff --git a/keyboards/westfoxtrot/aanzee/keymaps/default/keymap.c b/keyboards/westfoxtrot/aanzee/keymaps/default/keymap.c
index e2b75bc86..8809523b6 100644
--- a/keyboards/westfoxtrot/aanzee/keymaps/default/keymap.c
+++ b/keyboards/westfoxtrot/aanzee/keymaps/default/keymap.c
@@ -34,15 +34,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______, \
    _______,_______,_______,                _______,                        _______,_______,_______,_______,                _______)
  };
-    void matrix_init_user(void) {
-      //user initialization
-    }
-    void matrix_scan_user(void) {
-      //user matrix
-    }
-    bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-      return true;
-    }
diff --git a/keyboards/westfoxtrot/aanzee/keymaps/iso-default/keymap.c b/keyboards/westfoxtrot/aanzee/keymaps/iso-default/keymap.c
index 4ea027958..c3cf7e0df 100644
--- a/keyboards/westfoxtrot/aanzee/keymaps/iso-default/keymap.c
+++ b/keyboards/westfoxtrot/aanzee/keymaps/iso-default/keymap.c
@@ -34,15 +34,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, \
    _______,_______,_______,                _______,                        _______,_______,_______,_______,_______)
  };
-    void matrix_init_user(void) {
-      //user initialization
-    }
-    void matrix_scan_user(void) {
-      //user matrix
-    }
-    bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-      return true;
-    }
diff --git a/keyboards/westfoxtrot/aanzee/keymaps/via/keymap.c b/keyboards/westfoxtrot/aanzee/keymaps/via/keymap.c
index 1ac5c77ff..1d1e2252b 100644
--- a/keyboards/westfoxtrot/aanzee/keymaps/via/keymap.c
+++ b/keyboards/westfoxtrot/aanzee/keymaps/via/keymap.c
@@ -34,15 +34,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______, \
    _______,_______,_______,                _______,                        _______,_______        ,_______,_______,        _______)
  };
-    void matrix_init_user(void) {
-      //user initialization
-    }
-    void matrix_scan_user(void) {
-      //user matrix
-    }
-    bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-      return true;
-    }
diff --git a/keyboards/westfoxtrot/cyclops/cyclops.c b/keyboards/westfoxtrot/cyclops/cyclops.c
index aea51e6b3..f28d626e4 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/westfoxtrot/cyclops/keymaps/default/keymap.c b/keyboards/westfoxtrot/cyclops/keymaps/default/keymap.c
index c850b9da0..b693bceba 100644
--- a/keyboards/westfoxtrot/cyclops/keymaps/default/keymap.c
+++ b/keyboards/westfoxtrot/cyclops/keymaps/default/keymap.c
@@ -35,19 +35,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
                RESET,   _______, _______,                            _______,                            _______, _______,          _______, _______, _______),
 };
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/xbows/woody/woody.c b/keyboards/xbows/woody/woody.c
index 1027e3ca3..39d87442c 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/xiudi/xd004/keymaps/default/keymap.c b/keyboards/xiudi/xd004/keymaps/default/keymap.c
index e82ce5e97..f54f42261 100644
--- a/keyboards/xiudi/xd004/keymaps/default/keymap.c
+++ b/keyboards/xiudi/xd004/keymaps/default/keymap.c
@@ -6,8 +6,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    LAYOUT_all(KC_L, KC_O, KC_V, KC_E),
 };
-// Loop
-void matrix_scan_user(void){
-    // Empty
-};
diff --git a/keyboards/xiudi/xd004/xd004.c b/keyboards/xiudi/xd004/xd004.c
index 37a1dca14..7f0b4e52c 100644
--- a/keyboards/xiudi/xd004/xd004.c
+++ b/keyboards/xiudi/xd004/xd004.c
@@ -1,7 +1 @@
 #include "xd004.h"
-void led_set_kb(uint8_t usb_led) {
-    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-    led_set_user(usb_led);
-}
diff --git a/keyboards/xiudi/xd60/keymaps/default/keymap.c b/keyboards/xiudi/xd60/keymaps/default/keymap.c
index 9233f99ba..ce2a592e3 100644
--- a/keyboards/xiudi/xd60/keymaps/default/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/default/keymap.c
@@ -19,8 +19,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                          KC_RGUI, MO(1),    KC_HOME, KC_PGDOWN,KC_END),
 };
-// Loop
-void matrix_scan_user(void) {
-  // Empty
-};
diff --git a/keyboards/xiudi/xd60/keymaps/iso/keymap.c b/keyboards/xiudi/xd60/keymaps/iso/keymap.c
index 0f4694ca6..481b62155 100644
--- a/keyboards/xiudi/xd60/keymaps/iso/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/iso/keymap.c
@@ -26,8 +26,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        )
 };
-// Loop
-void matrix_scan_user(void) {
-    // Empty
-};
diff --git a/keyboards/xiudi/xd87/keymaps/default/keymap.c b/keyboards/xiudi/xd87/keymaps/default/keymap.c
index b31db9b57..d36f7d964 100644
--- a/keyboards/xiudi/xd87/keymaps/default/keymap.c
+++ b/keyboards/xiudi/xd87/keymaps/default/keymap.c
@@ -54,15 +54,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 }
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/xiudi/xd87/keymaps/default_underglow/keymap.c b/keyboards/xiudi/xd87/keymaps/default_underglow/keymap.c
index 8852c3a62..47dd4dfe8 100755
--- a/keyboards/xiudi/xd87/keymaps/default_underglow/keymap.c
+++ b/keyboards/xiudi/xd87/keymaps/default_underglow/keymap.c
@@ -60,15 +60,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 }
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/yd68/keymaps/default/keymap.c b/keyboards/yd68/keymaps/default/keymap.c
index 290aa0d61..fc6141f3b 100644
--- a/keyboards/yd68/keymaps/default/keymap.c
+++ b/keyboards/yd68/keymaps/default/keymap.c
@@ -51,15 +51,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return true;
 }
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-void led_set_user(uint8_t usb_led) {
-}
diff --git a/keyboards/ymdk/sp64/sp64.c b/keyboards/ymdk/sp64/sp64.c
index 568735ad7..12f257771 100644
--- a/keyboards/ymdk/sp64/sp64.c
+++ b/keyboards/ymdk/sp64/sp64.c
@@ -67,27 +67,3 @@ out:
  return (mcp23018_status);
 }
 #endif
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-__attribute__ ((weak))
-void matrix_init_user(void) {}
-void matrix_init_kb(void) {
-    // put your keyboard start-up code here
-    // runs once when the firmware starts up
-    matrix_init_user();
-}
-__attribute__ ((weak))
-void matrix_scan_user(void) {}
-void matrix_scan_kb(void) {
-    // put your looping keyboard code here
-    // runs every cycle (a lot)
-    matrix_scan_user();
-}
diff --git a/keyboards/yosino58/rev1/rev1.c b/keyboards/yosino58/rev1/rev1.c
index ef1f13e41..45534122b 100644
--- a/keyboards/yosino58/rev1/rev1.c
+++ b/keyboards/yosino58/rev1/rev1.c
@@ -1,8 +1 @@
 #include "yosino58.h"
-#ifdef SSD1306OLED
-void led_set_kb(uint8_t usb_led) {
-    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-    //led_set_user(usb_led);
-}
-#endif
diff --git a/keyboards/z150_bh/keymaps/default/keymap.c b/keyboards/z150_bh/keymaps/default/keymap.c
index ff4f6f7f9..9ca75dd28 100644
--- a/keyboards/z150_bh/keymaps/default/keymap.c
+++ b/keyboards/z150_bh/keymaps/default/keymap.c
@@ -33,16 +33,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        _______, _______,   _______, _______,                            _______,                                                       _______,                _______,          _______
    ),
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    return true;
-}
-void led_set_user(uint8_t usb_led) {
-}
-\ No newline at end of file
diff --git a/keyboards/z150_bh/keymaps/default_tkl/keymap.c b/keyboards/z150_bh/keymaps/default_tkl/keymap.c
index f1a24b8dd..fa1f7e47b 100644
--- a/keyboards/z150_bh/keymaps/default_tkl/keymap.c
+++ b/keyboards/z150_bh/keymaps/default_tkl/keymap.c
@@ -33,16 +33,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        _______, _______,   _______, _______, _______,                            _______,                            _______, _______, _______, _______,     _______, _______, _______
    ),
 };
-void matrix_init_user(void) {
-}
-void matrix_scan_user(void) {
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    return true;
-}
-void led_set_user(uint8_t usb_led) {
-}
-\ No newline at end of file
diff --git a/keyboards/zinc/rev1/rev1.c b/keyboards/zinc/rev1/rev1.c
index a9c2cfdba..139919d5a 100644
--- a/keyboards/zinc/rev1/rev1.c
+++ b/keyboards/zinc/rev1/rev1.c
@@ -1,5 +1 @@
 #include "zinc.h"
-void matrix_init_kb(void) {
-        matrix_init_user();
-};
diff --git a/keyboards/zinc/reva/reva.c b/keyboards/zinc/reva/reva.c
index a9c2cfdba..139919d5a 100644
--- a/keyboards/zinc/reva/reva.c
+++ b/keyboards/zinc/reva/reva.c
@@ -1,5 +1 @@
 #include "zinc.h"
-void matrix_init_kb(void) {
-        matrix_init_user();
-};
diff --git a/keyboards/zj68/zj68.c b/keyboards/zj68/zj68.c
index 960c94303..8de12a645 100644
--- a/keyboards/zj68/zj68.c
+++ b/keyboards/zj68/zj68.c
@@ -14,11 +14,3 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "zj68.h"
-void matrix_init_kb(void) {
-    matrix_init_user();
-}
-void matrix_scan_kb(void) {
-    matrix_scan_user();
-}