diff --git a/quantum/qmk_settings.c b/quantum/qmk_settings.c
index 586fcf7759..ea71add9cd 100644
--- a/quantum/qmk_settings.c
+++ b/quantum/qmk_settings.c
@@ -30,13 +30,10 @@ static void mousekey_apply(void) {
 
 static const qmk_settings_proto_t protos[] PROGMEM = {
    DECLARE_SETTING(1, grave_esc_override),
-   DECLARE_SETTING(2, debounce_time),
    DECLARE_SETTING(3, auto_shift),
    DECLARE_SETTING_CB(4, auto_shift_timeout, auto_shift_timeout_apply),
    DECLARE_SETTING(5, osk_tap_toggle),
    DECLARE_SETTING(6, osk_timeout),
-   DECLARE_SETTING(7, tapping_term),
-   DECLARE_SETTING(8, tap_hold),
    DECLARE_SETTING_CB(9, mousekey_delay, mousekey_apply),
    DECLARE_SETTING_CB(10, mousekey_interval, mousekey_apply),
    DECLARE_SETTING_CB(11, mousekey_move_delta, mousekey_apply),
@@ -85,15 +82,11 @@ void qmk_settings_init(void) {
 }
 
 void qmk_settings_reset(void) {
-    /* TODO: this should take values from various #define's */
     QS.grave_esc_override = 0;
-    QS.debounce_time = 5;
     QS.auto_shift = 0;
-    QS.auto_shift_timeout = 175;
+    QS.auto_shift_timeout = AUTO_SHIFT_TIMEOUT;
     QS.osk_tap_toggle = 0;
     QS.osk_timeout = 5000;
-    QS.tapping_term = 200;
-    QS.tap_hold = 0;
 
     QS.mousekey_delay = MOUSEKEY_DELAY;
     QS.mousekey_interval = MOUSEKEY_INTERVAL;
diff --git a/quantum/qmk_settings.h b/quantum/qmk_settings.h
index 0c2105ca54..b3b0bfe0c7 100644
--- a/quantum/qmk_settings.h
+++ b/quantum/qmk_settings.h
@@ -83,15 +83,8 @@
 /* actual settings - stored in RAM and backed by EEPROM
    these are in arbitrary order to ensure they are aligned w/o any holes, and the order can be changed at will */
 typedef struct {
-    uint8_t grave_esc_override;
-    uint8_t auto_shift;
-    uint8_t osk_tap_toggle;
-    uint8_t tap_hold;
-    uint16_t debounce_time;
     uint16_t auto_shift_timeout;
     uint16_t osk_timeout;
-    uint16_t tapping_term;
-
     uint16_t mousekey_delay;
     uint16_t mousekey_interval;
     uint16_t mousekey_move_delta;
@@ -101,8 +94,12 @@ typedef struct {
     uint16_t mousekey_wheel_interval;
     uint16_t mousekey_wheel_max_speed;
     uint16_t mousekey_wheel_time_to_max;
+    uint8_t grave_esc_override;
+    uint8_t auto_shift;
+    uint8_t osk_tap_toggle;
+    uint8_t padding0;
 } qmk_settings_t;
-_Static_assert(sizeof(qmk_settings_t) == 30, "unexpected size of the qmk_settings_t structure");
+_Static_assert(sizeof(qmk_settings_t) == 26, "unexpected size of the qmk_settings_t structure");
 
 typedef void (*qmk_setting_callback_t)(void);