From c4aa18363ee21bafb5f42145b68f351ea0951591 Mon Sep 17 00:00:00 2001
From: skullY <skullydazed@gmail.com>
Date: Sat, 29 Feb 2020 09:49:42 -0800
Subject: [PATCH] wip

---
 keyboards/1upkeyboards/1up60hse/1up60hse.c    |  7 ----
 keyboards/1upkeyboards/super16/super16.c      |  7 ----
 keyboards/40percentclub/25/25.c               |  7 ----
 keyboards/40percentclub/4pack/4pack.c         |  7 ----
 keyboards/40percentclub/4x4/4x4.c             |  7 ----
 keyboards/40percentclub/5x5/5x5.c             |  7 ----
 keyboards/40percentclub/6lit/6lit.c           |  7 ----
 keyboards/40percentclub/foobar/foobar.c       |  7 ----
 .../40percentclub/half_n_half/half_n_half.c   |  7 ----
 keyboards/40percentclub/i75/i75.c             |  7 ----
 keyboards/40percentclub/nori/nori.c           |  7 ----
 keyboards/40percentclub/ut47/ut47.c           | 35 +++++++++++--------
 keyboards/abstract/ellipse/rev1/rev1.c        |  9 +----
 keyboards/acheron/shark/shark.c               |  7 ----
 keyboards/ai03/orbit/orbit.c                  |  7 ----
 keyboards/ai03/quasar/quasar.c                |  7 ----
 keyboards/ai03/soyuz/soyuz.c                  |  7 ----
 keyboards/akb/eb46/eb46.c                     |  7 ----
 keyboards/al1/al1.c                           |  4 ---
 keyboards/alf/dc60/dc60.c                     |  7 ----
 keyboards/alf/x11/x11.c                       |  7 ----
 keyboards/alu84/alu84.c                       |  7 ----
 keyboards/amj96/amj96.c                       |  7 ----
 keyboards/amjkeyboard/amj66/amj66.c           |  7 ----
 keyboards/angel17/alpha/alpha.c               |  7 ----
 keyboards/angel17/rev1/rev1.c                 |  7 ----
 keyboards/angel64/alpha/alpha.c               |  7 ----
 keyboards/angel64/rev1/rev1.c                 |  7 ----
 keyboards/baguette/baguette.c                 |  7 ----
 keyboards/bm16a/bm16a.c                       |  7 ----
 keyboards/bm43a/bm43a.c                       |  7 ----
 keyboards/bm60rgb/bm60rgb.c                   |  7 ----
 keyboards/boston_meetup/2019/2019.c           |  5 ---
 .../bpiphany/frosty_flake/frosty_flake.c      |  9 +----
 keyboards/bpiphany/kitten_paw/kitten_paw.c    |  7 ----
 keyboards/bpiphany/tiger_lily/tiger_lily.c    |  9 +----
 .../unloved_bastard/unloved_bastard.c         |  6 ----
 keyboards/bthlabs/geekpad/geekpad.c           |  7 ----
 keyboards/business_card/alpha/alpha.c         |  7 ----
 keyboards/business_card/beta/beta.c           |  7 ----
 keyboards/business_card/business_card.c       |  7 ----
 keyboards/butterstick/butterstick.c           |  6 ----
 .../satisfaction75/satisfaction75.c           |  9 +++--
 keyboards/cannonkeys/stm32f072/keyboard.c     |  7 +++-
 keyboards/choco60/choco60.c                   |  7 ----
 keyboards/ckeys/handwire_101/handwire_101.c   |  6 ----
 keyboards/ckeys/nakey/nakey.c                 |  7 ----
 keyboards/ckeys/obelus/obelus.c               |  6 ----
 keyboards/ckeys/thedora/thedora.c             |  6 ----
 keyboards/claw44/claw44.c                     |  9 +++--
 keyboards/clueboard/2x1800/2x1800.c           |  4 ---
 keyboards/clueboard/card/card.c               |  7 ----
 keyboards/cocoa40/cocoa40.c                   |  7 ----
 keyboards/converter/modelm101/modelm101.c     |  7 ----
 .../numeric_keypad_IIe/numeric_keypad_IIe.c   |  7 ----
 .../siemens_tastatur/siemens_tastatur.c       |  7 ----
 keyboards/crkbd/crkbd.c                       |  9 +++--
 keyboards/cu75/cu75.c                         |  7 +++-
 keyboards/cutie_club/wraith/wraith.c          |  4 ---
 keyboards/dc01/arrow/arrow.c                  |  7 ----
 keyboards/dc01/left/left.c                    |  7 ----
 keyboards/dc01/numpad/numpad.c                |  7 ----
 keyboards/dc01/right/right.c                  |  7 ----
 .../donutcables/scrabblepad/scrabblepad.c     |  7 ----
 keyboards/doro67/multi/multi.c                |  7 ----
 keyboards/doro67/regular/regular.c            |  7 ----
 keyboards/doro67/rgb/rgb.c                    |  7 ----
 keyboards/dozen0/dozen0.c                     |  7 ----
 keyboards/dp60/dp60.c                         |  4 ---
 keyboards/duck/eagle_viper/v2/v2.c            |  4 ---
 keyboards/duck/jetfire/jetfire.c              |  9 -----
 keyboards/duck/lightsaver/lightsaver.c        |  4 ---
 keyboards/duck/octagon/v1/v1.c                |  4 ---
 keyboards/duck/octagon/v2/v2.c                |  4 ---
 keyboards/duck/orion/v3/v3.c                  |  4 ---
 keyboards/dumbpad/dumbpad.c                   |  7 ----
 keyboards/efreet/efreet.c                     |  7 ----
 keyboards/ep/40/40.c                          |  7 ----
 keyboards/ep/96/96.c                          |  7 ----
 keyboards/ep/comsn/hs68/hs68.c                |  7 ----
 keyboards/ep/comsn/mollydooker/mollydooker.c  |  7 ----
 .../ep/comsn/tf_longeboye/tf__longeboye.c     |  7 ----
 keyboards/ergodox_ez/ergodox_ez.c             |  7 +++-
 keyboards/espectro/espectro.c                 |  7 ----
 keyboards/evil80/evil80.c                     |  7 ----
 keyboards/exclusive/e6v2/le/le.c              |  7 ----
 keyboards/exclusive/e6v2/oe/oe.c              |  7 ----
 keyboards/exclusive/e7v1/e7v1.c               |  4 ---
 keyboards/exclusive/e7v1se/e7v1se.c           |  7 ----
 keyboards/fc660c/fc660c.c                     |  7 ----
 keyboards/fc980c/fc980c.c                     |  7 ----
 keyboards/fleuron/fleuron.c                   |  7 ----
 keyboards/flx/virgo/virgo.c                   |  7 ----
 keyboards/foxlab/leaf60/hotswap/hotswap.c     |  7 ----
 keyboards/foxlab/leaf60/universal/universal.c |  7 ----
 keyboards/geekboards/tester/tester.c          |  4 ---
 keyboards/gray_studio/cod67/cod67.c           |  7 ----
 keyboards/gray_studio/space65/space65.c       |  7 ----
 .../gray_studio/think65/hotswap/hotswap.c     |  7 ----
 keyboards/gray_studio/think65/solder/solder.c |  7 ----
 keyboards/hadron/ver2/ver2.c                  |  9 +----
 keyboards/hadron/ver3/ver3.c                  |  5 ---
 keyboards/halberd/halberd.c                   |  7 ----
 keyboards/handwired/412_64/412_64.c           |  7 ----
 keyboards/handwired/aranck/aranck.c           |  7 ----
 keyboards/handwired/co60/rev1/rev1.c          |  7 ----
 keyboards/handwired/dactyl_left/dactyl_left.c |  7 ----
 keyboards/handwired/daishi/daishi.c           |  7 ----
 keyboards/handwired/datahand/matrix.c         |  4 ---
 keyboards/handwired/fruity60/fruity60.c       |  7 ----
 .../hacked_motospeed/hacked_motospeed.c       |  9 +----
 keyboards/handwired/hnah40/hnah40.c           |  7 ----
 keyboards/handwired/ibm122m/ibm122m.c         |  7 ----
 keyboards/handwired/jn68m/jn68m.c             |  7 ----
 keyboards/handwired/kbod/kbod.c               |  7 ----
 .../mechboards_micropad/mechboards_micropad.c |  7 ----
 keyboards/handwired/owlet60/owlet60.c         |  7 ----
 keyboards/handwired/pilcrow/pilcrow.c         |  7 ----
 keyboards/handwired/prime_exl/prime_exl.c     |  9 +----
 keyboards/handwired/sticc14/sticc14.c         |  7 ----
 keyboards/handwired/tennie/tennie.c           |  7 ----
 .../handwired/terminus_mini/terminus_mini.c   |  7 ----
 keyboards/handwired/traveller/traveller.c     |  7 ----
 keyboards/handwired/woodpad/woodpad.c         |  7 ----
 keyboards/hecomi/hecomi.c                     |  7 ----
 keyboards/helix/pico/pico.c                   |  4 ---
 keyboards/helix/rev1/rev1.c                   |  4 ---
 keyboards/helix/rev2/rev2.c                   |  4 ---
 keyboards/hid_liber/hid_liber.c               |  7 ----
 keyboards/hineybush/h87a/h87a.c               |  7 ----
 keyboards/hineybush/h88/h88.c                 |  7 ----
 keyboards/hineybush/hbcp/hbcp.c               |  7 ----
 keyboards/hineybush/hineyg80/hineyg80.c       |  7 ----
 keyboards/hineybush/sm68/sm68.c               |  7 ----
 keyboards/hs60/v1/v1.c                        |  5 ---
 keyboards/idobo/idobo.c                       |  7 ----
 keyboards/illuminati/is0/is0.c                |  7 ----
 keyboards/jae/j01/j01.c                       |  7 ----
 keyboards/jc65/v32u4/v32u4.c                  |  7 ----
 keyboards/kagamidget/kagamidget.c             |  7 ----
 keyboards/katana60/katana60.c                 |  7 ----
 keyboards/kbdfans/kbd19x/kbd19x.c             |  7 ----
 keyboards/kbdfans/kbd4x/kbd4x.c               |  7 ----
 quantum/quantum.c                             |  1 +
 144 files changed, 66 insertions(+), 928 deletions(-)

diff --git a/keyboards/1upkeyboards/1up60hse/1up60hse.c b/keyboards/1upkeyboards/1up60hse/1up60hse.c
index c04018d62c4..f2ef58be175 100644
--- a/keyboards/1upkeyboards/1up60hse/1up60hse.c
+++ b/keyboards/1upkeyboards/1up60hse/1up60hse.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/1upkeyboards/super16/super16.c b/keyboards/1upkeyboards/super16/super16.c
index 72e47f447b1..41c5eab2c7f 100644
--- a/keyboards/1upkeyboards/super16/super16.c
+++ b/keyboards/1upkeyboards/super16/super16.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
   matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
   // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/40percentclub/25/25.c b/keyboards/40percentclub/25/25.c
index 54a42d263c8..01019bea3e4 100644
--- a/keyboards/40percentclub/25/25.c
+++ b/keyboards/40percentclub/25/25.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/40percentclub/4pack/4pack.c b/keyboards/40percentclub/4pack/4pack.c
index 98f22a65a5c..b17b7196b61 100644
--- a/keyboards/40percentclub/4pack/4pack.c
+++ b/keyboards/40percentclub/4pack/4pack.c
@@ -38,13 +38,6 @@ void matrix_scan_kb(void) {
   matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
   // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/40percentclub/4x4/4x4.c b/keyboards/40percentclub/4x4/4x4.c
index 963b6d00d44..94abafa580b 100644
--- a/keyboards/40percentclub/4x4/4x4.c
+++ b/keyboards/40percentclub/4x4/4x4.c
@@ -15,13 +15,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/40percentclub/5x5/5x5.c b/keyboards/40percentclub/5x5/5x5.c
index 20e5246094c..0a7e29dddee 100644
--- a/keyboards/40percentclub/5x5/5x5.c
+++ b/keyboards/40percentclub/5x5/5x5.c
@@ -15,13 +15,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/40percentclub/6lit/6lit.c b/keyboards/40percentclub/6lit/6lit.c
index fd3ae7d0097..6c2297067f2 100644
--- a/keyboards/40percentclub/6lit/6lit.c
+++ b/keyboards/40percentclub/6lit/6lit.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/40percentclub/foobar/foobar.c b/keyboards/40percentclub/foobar/foobar.c
index c032056a155..8deccd6a89b 100644
--- a/keyboards/40percentclub/foobar/foobar.c
+++ b/keyboards/40percentclub/foobar/foobar.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/40percentclub/half_n_half/half_n_half.c b/keyboards/40percentclub/half_n_half/half_n_half.c
index c4e6a4ce079..1d024608898 100644
--- a/keyboards/40percentclub/half_n_half/half_n_half.c
+++ b/keyboards/40percentclub/half_n_half/half_n_half.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/40percentclub/i75/i75.c b/keyboards/40percentclub/i75/i75.c
index 7efe3b4549f..9360877ac89 100644
--- a/keyboards/40percentclub/i75/i75.c
+++ b/keyboards/40percentclub/i75/i75.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/40percentclub/nori/nori.c b/keyboards/40percentclub/nori/nori.c
index 9d27df7a5c9..5c51c7baa32 100644
--- a/keyboards/40percentclub/nori/nori.c
+++ b/keyboards/40percentclub/nori/nori.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/40percentclub/ut47/ut47.c b/keyboards/40percentclub/ut47/ut47.c
index f467fd130ab..662e9099f11 100644
--- a/keyboards/40percentclub/ut47/ut47.c
+++ b/keyboards/40percentclub/ut47/ut47.c
@@ -15,32 +15,37 @@
  */
 #include "ut47.h"
 #ifdef LED_ENABLE
-  #include "protocol/serial.h"
+    #include "protocol/serial.h"
 #endif
 
 void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
+    // put your keyboard start-up code here
+    // runs once when the firmware starts up
 
-	matrix_init_user();
+    matrix_init_user();
 }
 
 void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
+    // put your looping keyboard code here
+    // runs every cycle (a lot)
 
-	matrix_scan_user();
+    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
-  if (record->event.pressed) {
-    #ifdef LED_ENABLE
-      serial_send((record->event.key.row*16)+record->event.key.col);
-    #endif
-  }
-	return process_record_user(keycode, record);
+    // put your per-action keyboard code here
+    // runs for every action, just before processing by the firmware
+    /* FIXME(skullydazed): 
+     *     Originally this code always ran no matter what process_record_user() did.
+     *     With this PR it will only run if process_record_user() returns true. We
+     *     should think through the implications here.
+     */
+    if (record->event.pressed) {
+#ifdef LED_ENABLE
+        serial_send((record->event.key.row*16)+record->event.key.col);
+#endif
+    }
+    return true;  
 }
 
 void led_set_kb(uint8_t usb_led) {
diff --git a/keyboards/abstract/ellipse/rev1/rev1.c b/keyboards/abstract/ellipse/rev1/rev1.c
index ae7aa640e4a..482065c5c9a 100644
--- a/keyboards/abstract/ellipse/rev1/rev1.c
+++ b/keyboards/abstract/ellipse/rev1/rev1.c
@@ -29,15 +29,8 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
 	led_set_user(usb_led);
-}*/
\ No newline at end of file
+}*/
diff --git a/keyboards/acheron/shark/shark.c b/keyboards/acheron/shark/shark.c
index b15c8a270e6..667a716f5d5 100644
--- a/keyboards/acheron/shark/shark.c
+++ b/keyboards/acheron/shark/shark.c
@@ -35,13 +35,6 @@ void matrix_scan_kb(void) {
   matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
   // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/ai03/orbit/orbit.c b/keyboards/ai03/orbit/orbit.c
index 2f149875b1c..18dd2244bab 100644
--- a/keyboards/ai03/orbit/orbit.c
+++ b/keyboards/ai03/orbit/orbit.c
@@ -179,13 +179,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 	
diff --git a/keyboards/ai03/quasar/quasar.c b/keyboards/ai03/quasar/quasar.c
index ac8b7517719..dd70947d1fa 100644
--- a/keyboards/ai03/quasar/quasar.c
+++ b/keyboards/ai03/quasar/quasar.c
@@ -35,13 +35,6 @@ void matrix_scan_kb(void) {
   matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
   // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/ai03/soyuz/soyuz.c b/keyboards/ai03/soyuz/soyuz.c
index dc73f196ef5..4d4cbef3cdb 100644
--- a/keyboards/ai03/soyuz/soyuz.c
+++ b/keyboards/ai03/soyuz/soyuz.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/akb/eb46/eb46.c b/keyboards/akb/eb46/eb46.c
index 3417b4329a3..8c0a2ddb9b9 100644
--- a/keyboards/akb/eb46/eb46.c
+++ b/keyboards/akb/eb46/eb46.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/al1/al1.c b/keyboards/al1/al1.c
index e50a6373b40..562410690d3 100644
--- a/keyboards/al1/al1.c
+++ b/keyboards/al1/al1.c
@@ -15,10 +15,6 @@
  */
 #include "al1.h"
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
     CONFIG_LED_IO;
     print_dec(usb_led);
diff --git a/keyboards/alf/dc60/dc60.c b/keyboards/alf/dc60/dc60.c
index 70979adf4ef..7f724b45d20 100644
--- a/keyboards/alf/dc60/dc60.c
+++ b/keyboards/alf/dc60/dc60.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
 		DDRB |= (1 << 7);
diff --git a/keyboards/alf/x11/x11.c b/keyboards/alf/x11/x11.c
index 9699918d5b2..1c35fb2c78d 100644
--- a/keyboards/alf/x11/x11.c
+++ b/keyboards/alf/x11/x11.c
@@ -32,13 +32,6 @@ void matrix_scan_kb(void) {
     matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-    // put your per-action keyboard code here
-    // runs for every action, just before processing by the firmware
-
-    return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
     // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/alu84/alu84.c b/keyboards/alu84/alu84.c
index 46e510efb5a..a07bce36e4b 100755
--- a/keyboards/alu84/alu84.c
+++ b/keyboards/alu84/alu84.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/amj96/amj96.c b/keyboards/amj96/amj96.c
index 959e321c8f6..b9cf6d720a4 100644
--- a/keyboards/amj96/amj96.c
+++ b/keyboards/amj96/amj96.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/amjkeyboard/amj66/amj66.c b/keyboards/amjkeyboard/amj66/amj66.c
index 05e29975b66..2a6b3687a53 100644
--- a/keyboards/amjkeyboard/amj66/amj66.c
+++ b/keyboards/amjkeyboard/amj66/amj66.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/angel17/alpha/alpha.c b/keyboards/angel17/alpha/alpha.c
index 3d2d1de7790..a5f094f7c57 100644
--- a/keyboards/angel17/alpha/alpha.c
+++ b/keyboards/angel17/alpha/alpha.c
@@ -35,13 +35,6 @@ void matrix_scan_kb(void) {
   matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
   // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/angel17/rev1/rev1.c b/keyboards/angel17/rev1/rev1.c
index f97e6caed42..831064dde4c 100644
--- a/keyboards/angel17/rev1/rev1.c
+++ b/keyboards/angel17/rev1/rev1.c
@@ -35,13 +35,6 @@ void matrix_scan_kb(void) {
   matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
   // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/angel64/alpha/alpha.c b/keyboards/angel64/alpha/alpha.c
index 3d2d1de7790..a5f094f7c57 100644
--- a/keyboards/angel64/alpha/alpha.c
+++ b/keyboards/angel64/alpha/alpha.c
@@ -35,13 +35,6 @@ void matrix_scan_kb(void) {
   matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
   // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/angel64/rev1/rev1.c b/keyboards/angel64/rev1/rev1.c
index f97e6caed42..831064dde4c 100644
--- a/keyboards/angel64/rev1/rev1.c
+++ b/keyboards/angel64/rev1/rev1.c
@@ -35,13 +35,6 @@ void matrix_scan_kb(void) {
   matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
   // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/baguette/baguette.c b/keyboards/baguette/baguette.c
index 751a3172562..6f707fe56e5 100644
--- a/keyboards/baguette/baguette.c
+++ b/keyboards/baguette/baguette.c
@@ -57,13 +57,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/bm16a/bm16a.c b/keyboards/bm16a/bm16a.c
index 3d616f29e9d..64b5bf64305 100644
--- a/keyboards/bm16a/bm16a.c
+++ b/keyboards/bm16a/bm16a.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/bm43a/bm43a.c b/keyboards/bm43a/bm43a.c
index 36543e3721d..a4bb6fad634 100644
--- a/keyboards/bm43a/bm43a.c
+++ b/keyboards/bm43a/bm43a.c
@@ -35,13 +35,6 @@ void matrix_scan_kb(void) {
   matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
   // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/bm60rgb/bm60rgb.c b/keyboards/bm60rgb/bm60rgb.c
index 3f301d1d475..c4248a672d1 100644
--- a/keyboards/bm60rgb/bm60rgb.c
+++ b/keyboards/bm60rgb/bm60rgb.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
     matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-    // put your per-action keyboard code here
-    // runs for every action, just before processing by the firmware
-
-    return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
     // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/boston_meetup/2019/2019.c b/keyboards/boston_meetup/2019/2019.c
index 933c14dee4f..b4501af07b7 100644
--- a/keyboards/boston_meetup/2019/2019.c
+++ b/keyboards/boston_meetup/2019/2019.c
@@ -177,11 +177,6 @@ uint32_t layer_state_set_kb(uint32_t state) {
   return state;
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  queue_for_send = true;
-  return process_record_user(keycode, record);
-}
-
 void encoder_update_kb(uint8_t index, bool clockwise) {
   encoder_value = (encoder_value + (clockwise ? 1 : -1)) % 64;
   queue_for_send = true;
diff --git a/keyboards/bpiphany/frosty_flake/frosty_flake.c b/keyboards/bpiphany/frosty_flake/frosty_flake.c
index 1cd47603893..f858a356f8b 100644
--- a/keyboards/bpiphany/frosty_flake/frosty_flake.c
+++ b/keyboards/bpiphany/frosty_flake/frosty_flake.c
@@ -14,13 +14,6 @@ void matrix_scan_kb(void) {
     matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-    // put your per-action keyboard code here
-    // runs for every action, just before processing by the firmware
-
-    return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
     DDRB |= (1<<7);
     DDRC |= (1<<5) | (1<<6);
@@ -60,4 +53,4 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 __attribute__ ((weak))
 void led_set_user(uint8_t usb_led) {
-}
\ No newline at end of file
+}
diff --git a/keyboards/bpiphany/kitten_paw/kitten_paw.c b/keyboards/bpiphany/kitten_paw/kitten_paw.c
index 26cb533f2db..c2d42e1428d 100644
--- a/keyboards/bpiphany/kitten_paw/kitten_paw.c
+++ b/keyboards/bpiphany/kitten_paw/kitten_paw.c
@@ -22,13 +22,6 @@ __attribute__ ((weak))
 void matrix_scan_user(void) {
 }
 
-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
     CONFIG_LED_IO;
diff --git a/keyboards/bpiphany/tiger_lily/tiger_lily.c b/keyboards/bpiphany/tiger_lily/tiger_lily.c
index d2e7ba70952..ec50ea8b3f4 100644
--- a/keyboards/bpiphany/tiger_lily/tiger_lily.c
+++ b/keyboards/bpiphany/tiger_lily/tiger_lily.c
@@ -14,13 +14,6 @@ void matrix_scan_kb(void) {
     matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-    // put your per-action keyboard code here
-    // runs for every action, just before processing by the firmware
-
-    return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
     DDRB |= (1<<7);
     DDRC |= (1<<5) | (1<<6);
@@ -60,4 +53,4 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 __attribute__ ((weak))
 void led_set_user(uint8_t usb_led) {
-}
\ No newline at end of file
+}
diff --git a/keyboards/bpiphany/unloved_bastard/unloved_bastard.c b/keyboards/bpiphany/unloved_bastard/unloved_bastard.c
index 1975930603b..ab54a5293dc 100644
--- a/keyboards/bpiphany/unloved_bastard/unloved_bastard.c
+++ b/keyboards/bpiphany/unloved_bastard/unloved_bastard.c
@@ -29,12 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-    // put your per-action keyboard code here
-    // runs for every action, just before processing by the firmware
-    return process_record_user(keycode, record);
-}
-
 // C5 left
 // C6 middle led
 // B7 right led
diff --git a/keyboards/bthlabs/geekpad/geekpad.c b/keyboards/bthlabs/geekpad/geekpad.c
index e52507c93dc..61df9391739 100644
--- a/keyboards/bthlabs/geekpad/geekpad.c
+++ b/keyboards/bthlabs/geekpad/geekpad.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
     matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-    // put your per-action keyboard code here
-    // runs for every action, just before processing by the firmware
-
-    return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
     // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/business_card/alpha/alpha.c b/keyboards/business_card/alpha/alpha.c
index 3d2d1de7790..a5f094f7c57 100644
--- a/keyboards/business_card/alpha/alpha.c
+++ b/keyboards/business_card/alpha/alpha.c
@@ -35,13 +35,6 @@ void matrix_scan_kb(void) {
   matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
   // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/business_card/beta/beta.c b/keyboards/business_card/beta/beta.c
index c43be6c16ad..b969fba9627 100644
--- a/keyboards/business_card/beta/beta.c
+++ b/keyboards/business_card/beta/beta.c
@@ -35,13 +35,6 @@ void matrix_scan_kb(void) {
   matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
   // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/business_card/business_card.c b/keyboards/business_card/business_card.c
index a57c004570b..cab292dc977 100644
--- a/keyboards/business_card/business_card.c
+++ b/keyboards/business_card/business_card.c
@@ -35,13 +35,6 @@ void matrix_scan_kb(void) {
   matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
   // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/butterstick/butterstick.c b/keyboards/butterstick/butterstick.c
index 6c00bbe5dfd..66decfc5e18 100644
--- a/keyboards/butterstick/butterstick.c
+++ b/keyboards/butterstick/butterstick.c
@@ -40,12 +40,6 @@ void matrix_scan_kb(void) {
 }
 
 /*
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
 
 void led_set_kb(uint8_t usb_led) {
   // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
diff --git a/keyboards/cannonkeys/satisfaction75/satisfaction75.c b/keyboards/cannonkeys/satisfaction75/satisfaction75.c
index f92067c98f7..e936a4f40dc 100644
--- a/keyboards/cannonkeys/satisfaction75/satisfaction75.c
+++ b/keyboards/cannonkeys/satisfaction75/satisfaction75.c
@@ -247,6 +247,11 @@ uint32_t layer_state_set_kb(uint32_t state) {
 }
 
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    /* FIXME(skullydazed):
+     *     Originally this code always ran no matter what process_record_user() did.
+     *     With this PR it will only run if process_record_user() returns true. We
+     *     should think through the implications here.
+     */
   queue_for_send = true;
   switch (keycode) {
     case OLED_TOGG:
@@ -291,7 +296,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
       break;
   }
 
-  return process_record_user(keycode, record);
+  return true;
 }
 
 
@@ -446,4 +451,4 @@ void via_eeprom_reset(void)
     eeconfig_disable();
 }
 
-#endif // VIA_ENABLE
\ No newline at end of file
+#endif // VIA_ENABLE
diff --git a/keyboards/cannonkeys/stm32f072/keyboard.c b/keyboards/cannonkeys/stm32f072/keyboard.c
index fdda018fc4e..0347e939a47 100644
--- a/keyboards/cannonkeys/stm32f072/keyboard.c
+++ b/keyboards/cannonkeys/stm32f072/keyboard.c
@@ -78,6 +78,11 @@ void matrix_scan_kb(void)
 }
 
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    /* FIXME(skullydazed):
+     *     Originally this code always ran no matter what process_record_user() did.
+     *     With this PR it will only run if process_record_user() returns true. We
+     *     should think through the implications here.
+     */
   switch (keycode) {
     case BL_INC:
       if (record->event.pressed) {
@@ -123,7 +128,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
         break;
   }
 
-  return process_record_user(keycode, record);;
+  return true;
 }
 
 #ifdef VIA_ENABLE
diff --git a/keyboards/choco60/choco60.c b/keyboards/choco60/choco60.c
index e38f335c1c5..a9f91d63fd5 100644
--- a/keyboards/choco60/choco60.c
+++ b/keyboards/choco60/choco60.c
@@ -35,13 +35,6 @@ void matrix_scan_kb(void) {
   matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
   // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/ckeys/handwire_101/handwire_101.c b/keyboards/ckeys/handwire_101/handwire_101.c
index a6ff8f0e3d0..06f807c5e61 100755
--- a/keyboards/ckeys/handwire_101/handwire_101.c
+++ b/keyboards/ckeys/handwire_101/handwire_101.c
@@ -16,12 +16,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 	led_set_user(usb_led);
diff --git a/keyboards/ckeys/nakey/nakey.c b/keyboards/ckeys/nakey/nakey.c
index ba2fb90ebe4..c8e037403af 100644
--- a/keyboards/ckeys/nakey/nakey.c
+++ b/keyboards/ckeys/nakey/nakey.c
@@ -28,13 +28,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/ckeys/obelus/obelus.c b/keyboards/ckeys/obelus/obelus.c
index 2905f0724df..7706481ee2a 100644
--- a/keyboards/ckeys/obelus/obelus.c
+++ b/keyboards/ckeys/obelus/obelus.c
@@ -16,12 +16,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 	led_set_user(usb_led);
diff --git a/keyboards/ckeys/thedora/thedora.c b/keyboards/ckeys/thedora/thedora.c
index 438320ef1c6..d6e22f41f5d 100755
--- a/keyboards/ckeys/thedora/thedora.c
+++ b/keyboards/ckeys/thedora/thedora.c
@@ -16,12 +16,6 @@ void matrix_scan_kb(void) {
   matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-  return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
   // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
   led_set_user(usb_led);
diff --git a/keyboards/claw44/claw44.c b/keyboards/claw44/claw44.c
index f564fb623b8..a50704ad95b 100644
--- a/keyboards/claw44/claw44.c
+++ b/keyboards/claw44/claw44.c
@@ -2,9 +2,14 @@
 #include "ssd1306.h"
 
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    /* FIXME(skullydazed):
+     *     Originally this code always ran no matter what process_record_user() did.
+     *     With this PR it will only run if process_record_user() returns true. We
+     *     should think through the implications here.
+     */
 #ifdef SSD1306OLED
-  return process_record_gfx(keycode,record) && process_record_user(keycode, record);
+  return process_record_gfx(keycode,record);
 #else
-  return process_record_user(keycode, record);
+  return true;
 #endif
 }
diff --git a/keyboards/clueboard/2x1800/2x1800.c b/keyboards/clueboard/2x1800/2x1800.c
index 09c90adbcf6..89608bd72d9 100644
--- a/keyboards/clueboard/2x1800/2x1800.c
+++ b/keyboards/clueboard/2x1800/2x1800.c
@@ -29,10 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
   // Toggle numlock as needed
 	if (usb_led & (1<<USB_LED_NUM_LOCK)) {
diff --git a/keyboards/clueboard/card/card.c b/keyboards/clueboard/card/card.c
index 9b4b397d925..953656d6f13 100644
--- a/keyboards/clueboard/card/card.c
+++ b/keyboards/clueboard/card/card.c
@@ -17,13 +17,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/cocoa40/cocoa40.c b/keyboards/cocoa40/cocoa40.c
index 22d19828d6a..d2f42f951a5 100644
--- a/keyboards/cocoa40/cocoa40.c
+++ b/keyboards/cocoa40/cocoa40.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/converter/modelm101/modelm101.c b/keyboards/converter/modelm101/modelm101.c
index c2204bea660..4af8ea31206 100644
--- a/keyboards/converter/modelm101/modelm101.c
+++ b/keyboards/converter/modelm101/modelm101.c
@@ -39,13 +39,6 @@ void matrix_scan_kb(void) {
   matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  /* put your per-action keyboard code here
-   * runs for every action, just before processing by the firmware */
-
-  return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
   if (usb_led & (1<<USB_LED_NUM_LOCK)) {
     writePinLow(B4);
diff --git a/keyboards/converter/numeric_keypad_IIe/numeric_keypad_IIe.c b/keyboards/converter/numeric_keypad_IIe/numeric_keypad_IIe.c
index c29d85d488e..341eea8e49c 100644
--- a/keyboards/converter/numeric_keypad_IIe/numeric_keypad_IIe.c
+++ b/keyboards/converter/numeric_keypad_IIe/numeric_keypad_IIe.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/converter/siemens_tastatur/siemens_tastatur.c b/keyboards/converter/siemens_tastatur/siemens_tastatur.c
index 298f24c36f9..d182d72cce1 100644
--- a/keyboards/converter/siemens_tastatur/siemens_tastatur.c
+++ b/keyboards/converter/siemens_tastatur/siemens_tastatur.c
@@ -30,13 +30,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/crkbd/crkbd.c b/keyboards/crkbd/crkbd.c
index 7417ad60478..4abe61dee44 100644
--- a/keyboards/crkbd/crkbd.c
+++ b/keyboards/crkbd/crkbd.c
@@ -1,9 +1,14 @@
 #include "crkbd.h"
 
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    /* FIXME(skullydazed):
+     *     Originally this code always ran no matter what process_record_user() did.
+     *     With this PR it will only run if process_record_user() returns true. We
+     *     should think through the implications here.
+     */
 #ifdef SSD1306OLED
-  return process_record_gfx(keycode,record) && process_record_user(keycode, record);
+  return process_record_gfx(keycode,record);
 #else
-  return process_record_user(keycode, record);
+  return true;
 #endif
 }
diff --git a/keyboards/cu75/cu75.c b/keyboards/cu75/cu75.c
index 6dc28984545..14b163d6b92 100644
--- a/keyboards/cu75/cu75.c
+++ b/keyboards/cu75/cu75.c
@@ -86,6 +86,11 @@ void click(uint16_t freq, uint16_t duration){
 
 bool process_record_kb(uint16_t keycode, keyrecord_t* record)
 {
+    /* FIXME(skullydazed):
+     *     Originally this code always ran no matter what process_record_user() did.
+     *     With this PR it will only run if process_record_user() returns true. We
+     *     should think through the implications here.
+     */
     // Test code that turns on the switch led for the key that is pressed
     // set_backlight_by_keymap(record->event.key.col, record->event.key.row);
     if (click_toggle && record->event.pressed){
@@ -95,7 +100,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record)
         reset_keyboard_kb();
     } else {
     }
-    return process_record_user(keycode, record);
+    return true;
 }
 
 void action_function(keyrecord_t *event, uint8_t id, uint8_t opt)
diff --git a/keyboards/cutie_club/wraith/wraith.c b/keyboards/cutie_club/wraith/wraith.c
index 95265384ee4..9b25a47ebf2 100644
--- a/keyboards/cutie_club/wraith/wraith.c
+++ b/keyboards/cutie_club/wraith/wraith.c
@@ -29,10 +29,6 @@ void matrix_scan_kb(void) {
   matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
   if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
         writePinLow(B3);
diff --git a/keyboards/dc01/arrow/arrow.c b/keyboards/dc01/arrow/arrow.c
index 07988b8099d..7fe6b9ba08d 100644
--- a/keyboards/dc01/arrow/arrow.c
+++ b/keyboards/dc01/arrow/arrow.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/dc01/left/left.c b/keyboards/dc01/left/left.c
index 1d8da186bde..2eb48f917ec 100644
--- a/keyboards/dc01/left/left.c
+++ b/keyboards/dc01/left/left.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/dc01/numpad/numpad.c b/keyboards/dc01/numpad/numpad.c
index 04d0a33afe7..b59e192534b 100644
--- a/keyboards/dc01/numpad/numpad.c
+++ b/keyboards/dc01/numpad/numpad.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/dc01/right/right.c b/keyboards/dc01/right/right.c
index fc2dead4c2b..24e7c6da240 100644
--- a/keyboards/dc01/right/right.c
+++ b/keyboards/dc01/right/right.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/donutcables/scrabblepad/scrabblepad.c b/keyboards/donutcables/scrabblepad/scrabblepad.c
index e97cbd46c01..ff6ee4932e7 100644
--- a/keyboards/donutcables/scrabblepad/scrabblepad.c
+++ b/keyboards/donutcables/scrabblepad/scrabblepad.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/doro67/multi/multi.c b/keyboards/doro67/multi/multi.c
index 14e3359c1af..f9fdb3bdb4a 100644
--- a/keyboards/doro67/multi/multi.c
+++ b/keyboards/doro67/multi/multi.c
@@ -30,13 +30,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/doro67/regular/regular.c b/keyboards/doro67/regular/regular.c
index 719ceea6fe9..d4679a9edee 100644
--- a/keyboards/doro67/regular/regular.c
+++ b/keyboards/doro67/regular/regular.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
   if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
diff --git a/keyboards/doro67/rgb/rgb.c b/keyboards/doro67/rgb/rgb.c
index e8c9ac63216..b0fc7acf72f 100644
--- a/keyboards/doro67/rgb/rgb.c
+++ b/keyboards/doro67/rgb/rgb.c
@@ -36,13 +36,6 @@ void matrix_scan_kb(void) {
   matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
   if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
diff --git a/keyboards/dozen0/dozen0.c b/keyboards/dozen0/dozen0.c
index 8b52aa89867..e209225fde5 100644
--- a/keyboards/dozen0/dozen0.c
+++ b/keyboards/dozen0/dozen0.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/dp60/dp60.c b/keyboards/dp60/dp60.c
index 3e478024635..06dac3d9cb8 100644
--- a/keyboards/dp60/dp60.c
+++ b/keyboards/dp60/dp60.c
@@ -161,11 +161,7 @@ webusb_pos_t webusb_keymap[] = {
 };
 #endif
 
-#ifndef RAW_ENABLE
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-#else
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-#endif
   if (record->event.pressed) {
     switch(keycode) {
     #ifdef RGBLIGHT_ENABLE
diff --git a/keyboards/duck/eagle_viper/v2/v2.c b/keyboards/duck/eagle_viper/v2/v2.c
index a60acb9784d..d3e1368de98 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 0662489c6f2..e751da73125 100644
--- a/keyboards/duck/jetfire/jetfire.c
+++ b/keyboards/duck/jetfire/jetfire.c
@@ -122,15 +122,6 @@ void backlight_set(uint8_t level)
 }
 
 
-
-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/lightsaver/lightsaver.c b/keyboards/duck/lightsaver/lightsaver.c
index 75e35b28b28..e0fe918e7d5 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 2586882291e..e9e88c70d0e 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 52653b37e79..23e92b27697 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 ca5c512cee1..2e8f85a1100 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/dumbpad/dumbpad.c b/keyboards/dumbpad/dumbpad.c
index d9b649c7155..e22f04f55a5 100644
--- a/keyboards/dumbpad/dumbpad.c
+++ b/keyboards/dumbpad/dumbpad.c
@@ -69,13 +69,6 @@ void matrix_scan_kb(void) {
   matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
   // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/efreet/efreet.c b/keyboards/efreet/efreet.c
index a05db74a520..f76f30dde48 100644
--- a/keyboards/efreet/efreet.c
+++ b/keyboards/efreet/efreet.c
@@ -35,13 +35,6 @@ void matrix_scan_kb(void) {
   matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
   // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/ep/40/40.c b/keyboards/ep/40/40.c
index 7c235f3ce5c..fd9b2ef1c44 100644
--- a/keyboards/ep/40/40.c
+++ b/keyboards/ep/40/40.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/ep/96/96.c b/keyboards/ep/96/96.c
index 9fdd51977d4..204e91bef71 100644
--- a/keyboards/ep/96/96.c
+++ b/keyboards/ep/96/96.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/ep/comsn/hs68/hs68.c b/keyboards/ep/comsn/hs68/hs68.c
index fdde3ad78d4..08a1f964a14 100644
--- a/keyboards/ep/comsn/hs68/hs68.c
+++ b/keyboards/ep/comsn/hs68/hs68.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
   matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
   // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/ep/comsn/mollydooker/mollydooker.c b/keyboards/ep/comsn/mollydooker/mollydooker.c
index d0d6f302eeb..d54f636122d 100644
--- a/keyboards/ep/comsn/mollydooker/mollydooker.c
+++ b/keyboards/ep/comsn/mollydooker/mollydooker.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/ep/comsn/tf_longeboye/tf__longeboye.c b/keyboards/ep/comsn/tf_longeboye/tf__longeboye.c
index 9e8141772c2..fc4415672df 100644
--- a/keyboards/ep/comsn/tf_longeboye/tf__longeboye.c
+++ b/keyboards/ep/comsn/tf_longeboye/tf__longeboye.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/ergodox_ez/ergodox_ez.c b/keyboards/ergodox_ez/ergodox_ez.c
index d313f7d5d99..6a0fe84e3b5 100644
--- a/keyboards/ergodox_ez/ergodox_ez.c
+++ b/keyboards/ergodox_ez/ergodox_ez.c
@@ -337,6 +337,11 @@ void keyboard_post_init_kb(void) {
 
 #ifdef ORYX_CONFIGURATOR
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    /* FIXME(skullydazed):
+     *     Originally this code always ran no matter what process_record_user() did.
+     *     With this PR it will only run if process_record_user() returns true. We
+     *     should think through the implications here.
+     */
     switch (keycode) {
         case LED_LEVEL:
             if (record->event.pressed) {
@@ -378,7 +383,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
             return false;
 #endif
     }
-    return process_record_user(keycode, record);
+    return true;
 }
 #endif
 
diff --git a/keyboards/espectro/espectro.c b/keyboards/espectro/espectro.c
index 13030cdd414..03ce1b05ca8 100755
--- a/keyboards/espectro/espectro.c
+++ b/keyboards/espectro/espectro.c
@@ -26,13 +26,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/evil80/evil80.c b/keyboards/evil80/evil80.c
index d4653d049ba..af1522f0f1f 100644
--- a/keyboards/evil80/evil80.c
+++ b/keyboards/evil80/evil80.c
@@ -13,13 +13,6 @@ void matrix_scan_kb(void) {
     matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-    // put your per-action keyboard code here
-    // runs for every action, just before processing by the firmware
-
-    return process_record_user(keycode, record);
-}
-
 void led_init_ports(void) {
     DDRB |= (1<<6) | (1<<7); // OUT
 }
diff --git a/keyboards/exclusive/e6v2/le/le.c b/keyboards/exclusive/e6v2/le/le.c
index f27bdc113b7..ac72ef63c4e 100644
--- a/keyboards/exclusive/e6v2/le/le.c
+++ b/keyboards/exclusive/e6v2/le/le.c
@@ -14,13 +14,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_user(uint8_t usb_led) {
 	if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
 		DDRB |= (1 << 7); 
diff --git a/keyboards/exclusive/e6v2/oe/oe.c b/keyboards/exclusive/e6v2/oe/oe.c
index 10cd59f0c21..e9c5f60c9bd 100644
--- a/keyboards/exclusive/e6v2/oe/oe.c
+++ b/keyboards/exclusive/e6v2/oe/oe.c
@@ -14,13 +14,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 	DDRB |= (1<<6);
diff --git a/keyboards/exclusive/e7v1/e7v1.c b/keyboards/exclusive/e7v1/e7v1.c
index 381585e6cfb..e8dbe51fa04 100644
--- a/keyboards/exclusive/e7v1/e7v1.c
+++ b/keyboards/exclusive/e7v1/e7v1.c
@@ -9,10 +9,6 @@ void matrix_scan_kb(void) {
   matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
   if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
     writePinHigh(F0);
diff --git a/keyboards/exclusive/e7v1se/e7v1se.c b/keyboards/exclusive/e7v1se/e7v1se.c
index 36cfccc2f58..d8cea9d2c56 100644
--- a/keyboards/exclusive/e7v1se/e7v1se.c
+++ b/keyboards/exclusive/e7v1se/e7v1se.c
@@ -35,13 +35,6 @@ void matrix_scan_kb(void) {
     matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-    // put your per-action keyboard code here
-    // runs for every action, just before processing by the firmware
-
-    return process_record_user(keycode, record);
-}
-
 bool led_update_kb(led_t led_state) {
     // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/fc660c/fc660c.c b/keyboards/fc660c/fc660c.c
index da6ba9e7442..1c049602b13 100644
--- a/keyboards/fc660c/fc660c.c
+++ b/keyboards/fc660c/fc660c.c
@@ -38,13 +38,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
     if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
         PORTB &= ~(1<<6);
diff --git a/keyboards/fc980c/fc980c.c b/keyboards/fc980c/fc980c.c
index c09eacfa332..0d9205110de 100644
--- a/keyboards/fc980c/fc980c.c
+++ b/keyboards/fc980c/fc980c.c
@@ -39,13 +39,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
     if (usb_led & (1<<USB_LED_NUM_LOCK)) {
         PORTB |=  (1<<4);
diff --git a/keyboards/fleuron/fleuron.c b/keyboards/fleuron/fleuron.c
index 12f950f367b..0fccef6544b 100644
--- a/keyboards/fleuron/fleuron.c
+++ b/keyboards/fleuron/fleuron.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/flx/virgo/virgo.c b/keyboards/flx/virgo/virgo.c
index 142ddf3ebc0..7e87234faf1 100644
--- a/keyboards/flx/virgo/virgo.c
+++ b/keyboards/flx/virgo/virgo.c
@@ -32,13 +32,6 @@ void matrix_scan_kb(void) {
     matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-    // put your per-action keyboard code here
-    // runs for every action, just before processing by the firmware
-
-    return process_record_user(keycode, record);
-}
-
 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/hotswap.c b/keyboards/foxlab/leaf60/hotswap/hotswap.c
index 20778d927d2..b4912ec7624 100644
--- a/keyboards/foxlab/leaf60/hotswap/hotswap.c
+++ b/keyboards/foxlab/leaf60/hotswap/hotswap.c
@@ -34,13 +34,6 @@ void matrix_scan_kb(void) {
   matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
   // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/foxlab/leaf60/universal/universal.c b/keyboards/foxlab/leaf60/universal/universal.c
index 5fe663a1bff..934706cf878 100644
--- a/keyboards/foxlab/leaf60/universal/universal.c
+++ b/keyboards/foxlab/leaf60/universal/universal.c
@@ -35,13 +35,6 @@ void matrix_scan_kb(void) {
   matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
   // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/geekboards/tester/tester.c b/keyboards/geekboards/tester/tester.c
index 4fab1a7012f..37ced13a7c5 100644
--- a/keyboards/geekboards/tester/tester.c
+++ b/keyboards/geekboards/tester/tester.c
@@ -39,10 +39,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	return process_record_user(keycode, record);
-}
-
 void suspend_power_down_kb(void)
 {
     rgb_matrix_set_suspend_state(true);
diff --git a/keyboards/gray_studio/cod67/cod67.c b/keyboards/gray_studio/cod67/cod67.c
index b6c04a3e576..e2a54a616dc 100644
--- a/keyboards/gray_studio/cod67/cod67.c
+++ b/keyboards/gray_studio/cod67/cod67.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/gray_studio/space65/space65.c b/keyboards/gray_studio/space65/space65.c
index 74a86a202d0..981fb66512e 100644
--- a/keyboards/gray_studio/space65/space65.c
+++ b/keyboards/gray_studio/space65/space65.c
@@ -30,13 +30,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
   if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
diff --git a/keyboards/gray_studio/think65/hotswap/hotswap.c b/keyboards/gray_studio/think65/hotswap/hotswap.c
index 07cdc8b1f73..47bd93faf2f 100644
--- a/keyboards/gray_studio/think65/hotswap/hotswap.c
+++ b/keyboards/gray_studio/think65/hotswap/hotswap.c
@@ -38,13 +38,6 @@ void matrix_scan_kb(void) {
   matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
   // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/gray_studio/think65/solder/solder.c b/keyboards/gray_studio/think65/solder/solder.c
index 48ed25b19b6..619aa2db8d5 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/hadron/ver2/ver2.c b/keyboards/hadron/ver2/ver2.c
index 739f06567a7..b91f9af6530 100644
--- a/keyboards/hadron/ver2/ver2.c
+++ b/keyboards/hadron/ver2/ver2.c
@@ -12,15 +12,8 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
 	led_set_user(usb_led);
-}
\ No newline at end of file
+}
diff --git a/keyboards/hadron/ver3/ver3.c b/keyboards/hadron/ver3/ver3.c
index 1491caba43f..5e98df069ca 100644
--- a/keyboards/hadron/ver3/ver3.c
+++ b/keyboards/hadron/ver3/ver3.c
@@ -176,11 +176,6 @@ uint32_t layer_state_set_kb(uint32_t state) {
   return state;
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  queue_for_send = true;
-  return process_record_user(keycode, record);
-}
-
 void encoder_update_kb(uint8_t index, bool clockwise) {
   encoder_value = (encoder_value + (clockwise ? 1 : -1)) % 64;
   queue_for_send = true;
diff --git a/keyboards/halberd/halberd.c b/keyboards/halberd/halberd.c
index 8b59310a7fc..bb27af3d293 100644
--- a/keyboards/halberd/halberd.c
+++ b/keyboards/halberd/halberd.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/handwired/412_64/412_64.c b/keyboards/handwired/412_64/412_64.c
index eaec54ade88..4e5c26c6e5f 100644
--- a/keyboards/handwired/412_64/412_64.c
+++ b/keyboards/handwired/412_64/412_64.c
@@ -15,13 +15,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/handwired/aranck/aranck.c b/keyboards/handwired/aranck/aranck.c
index 2e67ec1dae7..fb1ed785651 100644
--- a/keyboards/handwired/aranck/aranck.c
+++ b/keyboards/handwired/aranck/aranck.c
@@ -34,10 +34,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);
-}
\ No newline at end of file
diff --git a/keyboards/handwired/co60/rev1/rev1.c b/keyboards/handwired/co60/rev1/rev1.c
index abdfa884d60..dbd4b6686b2 100644
--- a/keyboards/handwired/co60/rev1/rev1.c
+++ b/keyboards/handwired/co60/rev1/rev1.c
@@ -31,13 +31,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 __attribute__ ((weak))
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
diff --git a/keyboards/handwired/dactyl_left/dactyl_left.c b/keyboards/handwired/dactyl_left/dactyl_left.c
index e6fe3402dac..918a599cff1 100644
--- a/keyboards/handwired/dactyl_left/dactyl_left.c
+++ b/keyboards/handwired/dactyl_left/dactyl_left.c
@@ -35,13 +35,6 @@ void matrix_scan_kb(void) {
   matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
   // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/handwired/daishi/daishi.c b/keyboards/handwired/daishi/daishi.c
index dcd2cd0d153..f4b0b1598e6 100644
--- a/keyboards/handwired/daishi/daishi.c
+++ b/keyboards/handwired/daishi/daishi.c
@@ -13,10 +13,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);
-}
\ No newline at end of file
diff --git a/keyboards/handwired/datahand/matrix.c b/keyboards/handwired/datahand/matrix.c
index a08450d779b..319fd886104 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/fruity60/fruity60.c b/keyboards/handwired/fruity60/fruity60.c
index d68b17955ea..c3abfb6d714 100644
--- a/keyboards/handwired/fruity60/fruity60.c
+++ b/keyboards/handwired/fruity60/fruity60.c
@@ -35,13 +35,6 @@ void matrix_scan_kb(void) {
   matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
   // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/handwired/hacked_motospeed/hacked_motospeed.c b/keyboards/handwired/hacked_motospeed/hacked_motospeed.c
index 21643895d75..1ab28669a5f 100644
--- a/keyboards/handwired/hacked_motospeed/hacked_motospeed.c
+++ b/keyboards/handwired/hacked_motospeed/hacked_motospeed.c
@@ -29,15 +29,8 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
 	led_set_user(usb_led);
-}
\ No newline at end of file
+}
diff --git a/keyboards/handwired/hnah40/hnah40.c b/keyboards/handwired/hnah40/hnah40.c
index 0f08136c210..4b3665dfa17 100644
--- a/keyboards/handwired/hnah40/hnah40.c
+++ b/keyboards/handwired/hnah40/hnah40.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/handwired/ibm122m/ibm122m.c b/keyboards/handwired/ibm122m/ibm122m.c
index 1c52b94ec65..5e68a90230b 100644
--- a/keyboards/handwired/ibm122m/ibm122m.c
+++ b/keyboards/handwired/ibm122m/ibm122m.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/handwired/jn68m/jn68m.c b/keyboards/handwired/jn68m/jn68m.c
index b61b17aa9b3..9c01df8c660 100644
--- a/keyboards/handwired/jn68m/jn68m.c
+++ b/keyboards/handwired/jn68m/jn68m.c
@@ -28,10 +28,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);
-}
diff --git a/keyboards/handwired/kbod/kbod.c b/keyboards/handwired/kbod/kbod.c
index 9a12cae0d20..df16146d4c6 100644
--- a/keyboards/handwired/kbod/kbod.c
+++ b/keyboards/handwired/kbod/kbod.c
@@ -14,13 +14,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/handwired/mechboards_micropad/mechboards_micropad.c b/keyboards/handwired/mechboards_micropad/mechboards_micropad.c
index d4c8fa9b928..7cb619b1be7 100644
--- a/keyboards/handwired/mechboards_micropad/mechboards_micropad.c
+++ b/keyboards/handwired/mechboards_micropad/mechboards_micropad.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/handwired/owlet60/owlet60.c b/keyboards/handwired/owlet60/owlet60.c
index 42d24a291ae..057a69a9d35 100644
--- a/keyboards/handwired/owlet60/owlet60.c
+++ b/keyboards/handwired/owlet60/owlet60.c
@@ -37,13 +37,6 @@ void matrix_scan_kb(void) {
   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
 
diff --git a/keyboards/handwired/pilcrow/pilcrow.c b/keyboards/handwired/pilcrow/pilcrow.c
index c8243df7bff..2c610e1a2a6 100644
--- a/keyboards/handwired/pilcrow/pilcrow.c
+++ b/keyboards/handwired/pilcrow/pilcrow.c
@@ -14,13 +14,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/handwired/prime_exl/prime_exl.c b/keyboards/handwired/prime_exl/prime_exl.c
index bae606ffbf5..2085f115e50 100644
--- a/keyboards/handwired/prime_exl/prime_exl.c
+++ b/keyboards/handwired/prime_exl/prime_exl.c
@@ -29,16 +29,9 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
 	led_set_user(usb_led);
 }
-*/
\ No newline at end of file
+*/
diff --git a/keyboards/handwired/sticc14/sticc14.c b/keyboards/handwired/sticc14/sticc14.c
index 8edd2bda6b9..94ca7c85f0a 100644
--- a/keyboards/handwired/sticc14/sticc14.c
+++ b/keyboards/handwired/sticc14/sticc14.c
@@ -35,13 +35,6 @@ void matrix_scan_kb(void) {
   matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
   // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/handwired/tennie/tennie.c b/keyboards/handwired/tennie/tennie.c
index e1ceaf153d7..3baedcad7ed 100644
--- a/keyboards/handwired/tennie/tennie.c
+++ b/keyboards/handwired/tennie/tennie.c
@@ -31,13 +31,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 //void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/handwired/terminus_mini/terminus_mini.c b/keyboards/handwired/terminus_mini/terminus_mini.c
index 58edca76873..dd04144b443 100644
--- a/keyboards/handwired/terminus_mini/terminus_mini.c
+++ b/keyboards/handwired/terminus_mini/terminus_mini.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/handwired/traveller/traveller.c b/keyboards/handwired/traveller/traveller.c
index 9d25341300d..6975aa30251 100644
--- a/keyboards/handwired/traveller/traveller.c
+++ b/keyboards/handwired/traveller/traveller.c
@@ -45,13 +45,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/handwired/woodpad/woodpad.c b/keyboards/handwired/woodpad/woodpad.c
index 15a87f2eaec..186e51360b5 100644
--- a/keyboards/handwired/woodpad/woodpad.c
+++ b/keyboards/handwired/woodpad/woodpad.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/hecomi/hecomi.c b/keyboards/hecomi/hecomi.c
index 9d0d93fa173..3eeed446e7f 100644
--- a/keyboards/hecomi/hecomi.c
+++ b/keyboards/hecomi/hecomi.c
@@ -30,13 +30,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/helix/pico/pico.c b/keyboards/helix/pico/pico.c
index bb8ba9ca2b4..0775ec63e14 100644
--- a/keyboards/helix/pico/pico.c
+++ b/keyboards/helix/pico/pico.c
@@ -4,10 +4,6 @@
 #ifdef SSD1306OLED
 #include "ssd1306.h"
 
-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);
diff --git a/keyboards/helix/rev1/rev1.c b/keyboards/helix/rev1/rev1.c
index 309cca010f1..fc713e9090c 100644
--- a/keyboards/helix/rev1/rev1.c
+++ b/keyboards/helix/rev1/rev1.c
@@ -4,10 +4,6 @@
 #ifdef SSD1306OLED
 #include "ssd1306.h"
 
-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);
diff --git a/keyboards/helix/rev2/rev2.c b/keyboards/helix/rev2/rev2.c
index abaa02cdb13..751c796d8fe 100644
--- a/keyboards/helix/rev2/rev2.c
+++ b/keyboards/helix/rev2/rev2.c
@@ -4,10 +4,6 @@
 #ifdef SSD1306OLED
 #include "ssd1306.h"
 
-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);
diff --git a/keyboards/hid_liber/hid_liber.c b/keyboards/hid_liber/hid_liber.c
index 6517c920622..1d6fc67c5bd 100755
--- a/keyboards/hid_liber/hid_liber.c
+++ b/keyboards/hid_liber/hid_liber.c
@@ -31,13 +31,6 @@ void matrix_scan_kb(void) {
     matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-    // put your per-action keyboard code here
-    // runs for every action, just before processing by the firmware
-
-    return process_record_user(keycode, record);
-}
-
 void led_init_ports(void) {
     DDRB |= (1<<5) | (1<<6); // OUT
 }
diff --git a/keyboards/hineybush/h87a/h87a.c b/keyboards/hineybush/h87a/h87a.c
index a3f511ffcc4..a59c680bf12 100644
--- a/keyboards/hineybush/h87a/h87a.c
+++ b/keyboards/hineybush/h87a/h87a.c
@@ -30,13 +30,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/hineybush/h88/h88.c b/keyboards/hineybush/h88/h88.c
index 1f702e9e9dc..055be6537f5 100644
--- a/keyboards/hineybush/h88/h88.c
+++ b/keyboards/hineybush/h88/h88.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/hineybush/hbcp/hbcp.c b/keyboards/hineybush/hbcp/hbcp.c
index e2513023e09..22cb0e1684b 100644
--- a/keyboards/hineybush/hbcp/hbcp.c
+++ b/keyboards/hineybush/hbcp/hbcp.c
@@ -54,13 +54,6 @@ void matrix_scan_kb(void) {
   matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
   // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/hineybush/hineyg80/hineyg80.c b/keyboards/hineybush/hineyg80/hineyg80.c
index 236c646be75..f9178955971 100644
--- a/keyboards/hineybush/hineyg80/hineyg80.c
+++ b/keyboards/hineybush/hineyg80/hineyg80.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 	if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) {
diff --git a/keyboards/hineybush/sm68/sm68.c b/keyboards/hineybush/sm68/sm68.c
index 5aa3c85bbc7..8e2a95cde06 100644
--- a/keyboards/hineybush/sm68/sm68.c
+++ b/keyboards/hineybush/sm68/sm68.c
@@ -35,13 +35,6 @@ void matrix_scan_kb(void) {
     matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-    // put your per-action keyboard code here
-    // runs for every action, just before processing by the firmware
-
-    return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
     // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/hs60/v1/v1.c b/keyboards/hs60/v1/v1.c
index 70c1c2128eb..7d421c37047 100644
--- a/keyboards/hs60/v1/v1.c
+++ b/keyboards/hs60/v1/v1.c
@@ -383,11 +383,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	//backlight_set_indicator_state(usb_led);
 }
diff --git a/keyboards/idobo/idobo.c b/keyboards/idobo/idobo.c
index 3f870835ed8..4b456283fd5 100644
--- a/keyboards/idobo/idobo.c
+++ b/keyboards/idobo/idobo.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/illuminati/is0/is0.c b/keyboards/illuminati/is0/is0.c
index 920277e6c9c..afd9c3facf5 100644
--- a/keyboards/illuminati/is0/is0.c
+++ b/keyboards/illuminati/is0/is0.c
@@ -35,13 +35,6 @@ void matrix_scan_kb(void) {
   matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  // put your per-action keyboard code here
-  // runs for every action, just before processing by the firmware
-
-  return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
   // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/jae/j01/j01.c b/keyboards/jae/j01/j01.c
index a72279b35c7..40814338d26 100644
--- a/keyboards/jae/j01/j01.c
+++ b/keyboards/jae/j01/j01.c
@@ -36,13 +36,6 @@ void matrix_scan_kb(void) {
     matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-    // put your per-action keyboard code here
-    // runs for every action, just before processing by the firmware
-
-    return process_record_user(keycode, record);
-}
-
 bool led_update_kb(led_t led_state) {
     if(led_update_user(led_state)) {
         writePin(E6, !led_state.caps_lock);
diff --git a/keyboards/jc65/v32u4/v32u4.c b/keyboards/jc65/v32u4/v32u4.c
index c69c5d53166..14cbf40185b 100644
--- a/keyboards/jc65/v32u4/v32u4.c
+++ b/keyboards/jc65/v32u4/v32u4.c
@@ -14,13 +14,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
     if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
diff --git a/keyboards/kagamidget/kagamidget.c b/keyboards/kagamidget/kagamidget.c
index 1f790c9e777..663553aa605 100644
--- a/keyboards/kagamidget/kagamidget.c
+++ b/keyboards/kagamidget/kagamidget.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/katana60/katana60.c b/keyboards/katana60/katana60.c
index e8d4fef1936..68a017c4488 100644
--- a/keyboards/katana60/katana60.c
+++ b/keyboards/katana60/katana60.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/kbdfans/kbd19x/kbd19x.c b/keyboards/kbdfans/kbd19x/kbd19x.c
index e6cd77d656b..deb6d8cb783 100644
--- a/keyboards/kbdfans/kbd19x/kbd19x.c
+++ b/keyboards/kbdfans/kbd19x/kbd19x.c
@@ -40,13 +40,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/keyboards/kbdfans/kbd4x/kbd4x.c b/keyboards/kbdfans/kbd4x/kbd4x.c
index 84ada250d7c..dcb378b9e5e 100644
--- a/keyboards/kbdfans/kbd4x/kbd4x.c
+++ b/keyboards/kbdfans/kbd4x/kbd4x.c
@@ -29,13 +29,6 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();
 }
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 
diff --git a/quantum/quantum.c b/quantum/quantum.c
index 7c19a3bbb6c..44de941adf6 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -217,6 +217,7 @@ bool process_record_quantum(keyrecord_t *record) {
 #if defined(VIA_ENABLE)
             process_record_via(keycode, record) &&
 #endif
+            process_record_user(keycode, record) &&
             process_record_kb(keycode, record) &&
 #if defined(MIDI_ENABLE) && defined(MIDI_ADVANCED)
             process_midi(keycode, record) &&