diff --git a/keyboards/fallacy/config.h b/keyboards/fallacy/config.h
index 379d25d9db..c99653f2c5 100755
--- a/keyboards/fallacy/config.h
+++ b/keyboards/fallacy/config.h
@@ -59,10 +59,6 @@
  */
 #define LOCKING_RESYNC_ENABLE
 
-/* prevent stuck modifiers
- */
-#define PREVENT_STUCK_MODIFIERS
-
 #define RGB_DI_PIN D2
 #define RGBLIGHT_ANIMATIONS
 #define RGBLED_NUM 14
diff --git a/keyboards/handwired/brain/config.h b/keyboards/handwired/brain/config.h
index 87aec1a299..6b9e650bcf 100644
--- a/keyboards/handwired/brain/config.h
+++ b/keyboards/handwired/brain/config.h
@@ -97,7 +97,6 @@ along with this program.  If not, see .
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-//#define PREVENT_STUCK_MODIFIERS
 //#define TAPPING_TERM 150
 //#define IGNORE_MOD_TAP_INTERRUPT
 //#define TAPPING_FORCE_HOLD
diff --git a/keyboards/handwired/d48/config.h b/keyboards/handwired/d48/config.h
index 9c23442997..83ca9b2247 100644
--- a/keyboards/handwired/d48/config.h
+++ b/keyboards/handwired/d48/config.h
@@ -31,9 +31,6 @@
 /* Locking resynchronize hack */
 // #define LOCKING_RESYNC_ENABLE
 
-/* prevent stuck modifiers */
-// #define PREVENT_STUCK_MODIFIERS
-
 /* RGB Underglow */
 #ifdef RGBLIGHT_ENABLE
 #define RGB_DI_PIN A15
diff --git a/keyboards/kapcave/paladinpad/config.h b/keyboards/kapcave/paladinpad/config.h
index 9b3c9a4ca0..2b7d6e363a 100644
--- a/keyboards/kapcave/paladinpad/config.h
+++ b/keyboards/kapcave/paladinpad/config.h
@@ -39,8 +39,3 @@ along with this program.  If not, see .
 
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
-
-/* prevent stuck modifiers */
-#define PREVENT_STUCK_MODIFIERS
-
-
diff --git a/keyboards/shiro/config.h b/keyboards/shiro/config.h
index 0e7ac54f97..80243234e7 100644
--- a/keyboards/shiro/config.h
+++ b/keyboards/shiro/config.h
@@ -85,7 +85,7 @@ along with this program.  If not, see .
 // #endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCING_DELAY 5
+#define DEBOUNCE 5
 
 /* define if matrix has ghost (lacks anti-ghosting diodes) */
 //#define MATRIX_HAS_GHOST