Remove 1k USB_POLLING_INTERVAL_MS config from keyboards and default-ish keymaps (#16448)

* Remove 1k USB_POLLING_INTERVAL_MS config from keyboard level

* Remove 1k USB_POLLING_INTERVAL_MS config from default|via keymaps

55 files changed, 9 insertions, 94 deletions

diff --git a/keyboards/ai03/jp60/keymaps/default/config.h b/keyboards/ai03/jp60/keymaps/default/config.h
index ee63d9feee..9e0623524a 100644
--- a/keyboards/ai03/jp60/keymaps/default/config.h
+++ b/keyboards/ai03/jp60/keymaps/default/config.h
@@ -16,6 +16,5 @@
 
 #pragma once
 
-/* Increase polling rates and scan quantity for improved performance */
-#define USB_POLLING_INTERVAL_MS 1
+/* Increase scan quantity for improved performance */
 #define QMK_KEYS_PER_SCAN 12
diff --git a/keyboards/ai03/jp60/keymaps/via/config.h b/keyboards/ai03/jp60/keymaps/via/config.h
index ee63d9feee..9e0623524a 100644
--- a/keyboards/ai03/jp60/keymaps/via/config.h
+++ b/keyboards/ai03/jp60/keymaps/via/config.h
@@ -16,6 +16,5 @@
 
 #pragma once
 
-/* Increase polling rates and scan quantity for improved performance */
-#define USB_POLLING_INTERVAL_MS 1
+/* Increase scan quantity for improved performance */
 #define QMK_KEYS_PER_SCAN 12
diff --git a/keyboards/bastardkb/skeletyl/config.h b/keyboards/bastardkb/skeletyl/config.h
index a7530a5e73..fae8e2ec03 100644
--- a/keyboards/bastardkb/skeletyl/config.h
+++ b/keyboards/bastardkb/skeletyl/config.h
@@ -40,7 +40,6 @@
 
 #define SOFT_SERIAL_PIN D0
 
-#define USB_POLLING_INTERVAL_MS 1
 #define MASTER_RIGHT
 
 // RGB matrix support
diff --git a/keyboards/bastardkb/tbkmini/config.h b/keyboards/bastardkb/tbkmini/config.h
index b2308bc8ed..094544de9a 100644
--- a/keyboards/bastardkb/tbkmini/config.h
+++ b/keyboards/bastardkb/tbkmini/config.h
@@ -43,7 +43,6 @@
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
 #define F_SCL 400000L
-#define USB_POLLING_INTERVAL_MS 1
 #define MASTER_RIGHT
 
 // RGB matrix support
diff --git a/keyboards/durgod/dgk6x/config.h b/keyboards/durgod/dgk6x/config.h
index a15ed86650..28a506cf8d 100644
--- a/keyboards/durgod/dgk6x/config.h
+++ b/keyboards/durgod/dgk6x/config.h
@@ -22,7 +22,6 @@
 #define VENDOR_ID       0xD60D
 #define MANUFACTURER    Hoksi Technology
 
-#define USB_POLLING_INTERVAL_MS 1
 #define WAIT_US_TIMER           GPTD3
 
 /* COL2ROW, ROW2COL*/
diff --git a/keyboards/durgod/k3x0/config.h b/keyboards/durgod/k3x0/config.h
index af543bb970..691076ecac 100644
--- a/keyboards/durgod/k3x0/config.h
+++ b/keyboards/durgod/k3x0/config.h
@@ -23,7 +23,6 @@
 #define VENDOR_ID       0xD60D
 #define MANUFACTURER    Hoksi Technology
 
-#define USB_POLLING_INTERVAL_MS 1
 #define WAIT_US_TIMER           GPTD3
 
 /* key matrix size (rows in specific keyboard variant) */
@@ -41,7 +40,6 @@
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
-// #define USB_POLLING_INTERVAL_MS 1
 
 /* Bootmagic Lite key configuration */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
diff --git a/keyboards/geekboards/macropad_v2/config.h b/keyboards/geekboards/macropad_v2/config.h
index cdb3a7dbe8..cb671bfab7 100644
--- a/keyboards/geekboards/macropad_v2/config.h
+++ b/keyboards/geekboards/macropad_v2/config.h
@@ -100,7 +100,6 @@
 
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define WAIT_FOR_USB
-#define USB_POLLING_INTERVAL_MS 1
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
diff --git a/keyboards/gmmk/pro/config.h b/keyboards/gmmk/pro/config.h
index bb2cca1921..d83c965fc5 100644
--- a/keyboards/gmmk/pro/config.h
+++ b/keyboards/gmmk/pro/config.h
@@ -114,9 +114,6 @@
 #define ENABLE_RGB_MATRIX_SOLID_SPLASH
 #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
-/* 1000Hz USB polling - it's the default on stock firmware */
-#define USB_POLLING_INTERVAL_MS 1
-
 /* Send up to 4 key press events per scan */
 #define QMK_KEYS_PER_SCAN 4
 
diff --git a/keyboards/handwired/marauder/config.h b/keyboards/handwired/marauder/config.h
index df30a6c226..7c6a6d74d4 100644
--- a/keyboards/handwired/marauder/config.h
+++ b/keyboards/handwired/marauder/config.h
@@ -43,7 +43,6 @@
 #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4, B0 }
 #define DIODE_DIRECTION COL2ROW
 #define LAYER_STATE_8BIT
-#define USB_POLLING_INTERVAL_MS 1 //1000Hz polling rate
 #define QMK_KEYS_PER_SCAN 12 // moar gaming code
 #define RGB_DI_PIN D3
 #ifdef RGB_DI_PIN
diff --git a/keyboards/handwired/xealousbrown/config.h b/keyboards/handwired/xealousbrown/config.h
index 70775ffaeb..cb787ba0c2 100644
--- a/keyboards/handwired/xealousbrown/config.h
+++ b/keyboards/handwired/xealousbrown/config.h
@@ -29,7 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 13
 #define DEBOUNCE 10
-#define USB_POLLING_INTERVAL_MS 1
 /* layer optimization */
 #define LAYER_STATE_8BIT
 #define MAX_LAYER 2
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h b/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h
index 825b6d3e5b..af7affbb83 100644
--- a/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h
+++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h
@@ -45,8 +45,7 @@
 /* Forcing to use NKRO instead 6KRO */
 #define FORCE_NKRO
 
-/* Change USB Polling Rate to 1000hz and a larger keys per scan for elite gaming */
-#define USB_POLLING_INTERVAL_MS 1
+/* Change larger keys per scan for elite gaming */
 #define QMK_KEYS_PER_SCAN 12
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/horrortroll/chinese_pcb/m63_rgb/config.h b/keyboards/horrortroll/chinese_pcb/m63_rgb/config.h
index 2983971258..4c126bb3f3 100644
--- a/keyboards/horrortroll/chinese_pcb/m63_rgb/config.h
+++ b/keyboards/horrortroll/chinese_pcb/m63_rgb/config.h
@@ -45,8 +45,7 @@
 /* Forcing to use NKRO instead 6KRO */
 #define FORCE_NKRO
 
-/* Change USB Polling Rate to 1000hz and a larger keys per scan for elite gaming */
-#define USB_POLLING_INTERVAL_MS 1
+/* Change larger keys per scan for elite gaming */
 #define QMK_KEYS_PER_SCAN 12
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/horrortroll/handwired_k552/config.h b/keyboards/horrortroll/handwired_k552/config.h
index 87908a1dcd..3caaee51e5 100644
--- a/keyboards/horrortroll/handwired_k552/config.h
+++ b/keyboards/horrortroll/handwired_k552/config.h
@@ -46,8 +46,7 @@
 /* Forcing to use NKRO instead 6KRO */
 #define FORCE_NKRO
 
-/* Change USB Polling Rate to 1000hz and a larger keys per scan for elite gaming */
-#define USB_POLLING_INTERVAL_MS 1
+/* Change larger keys per scan for elite gaming */
 #define QMK_KEYS_PER_SCAN 12
 
 /* EEPROM size */
diff --git a/keyboards/ianklug/grooveboard/config.h b/keyboards/ianklug/grooveboard/config.h
index e42c5f14e8..aac9be1022 100644
--- a/keyboards/ianklug/grooveboard/config.h
+++ b/keyboards/ianklug/grooveboard/config.h
@@ -154,5 +154,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/jadookb/jkb2/keymaps/via/config.h b/keyboards/jadookb/jkb2/keymaps/via/config.h
index ecd00aced4..31022ca535 100644
--- a/keyboards/jadookb/jkb2/keymaps/via/config.h
+++ b/keyboards/jadookb/jkb2/keymaps/via/config.h
@@ -16,5 +16,4 @@
   */
 #pragma once
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/jadookb/jkb65/keymaps/via/config.h b/keyboards/jadookb/jkb65/keymaps/via/config.h
index 31f7507464..9d4eaf74ee 100644
--- a/keyboards/jadookb/jkb65/keymaps/via/config.h
+++ b/keyboards/jadookb/jkb65/keymaps/via/config.h
@@ -16,5 +16,4 @@
 
 #pragma once
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 12
diff --git a/keyboards/kinesis/kint2pp/config.h b/keyboards/kinesis/kint2pp/config.h
index 4191446e68..54ba07d3d6 100644
--- a/keyboards/kinesis/kint2pp/config.h
+++ b/keyboards/kinesis/kint2pp/config.h
@@ -41,10 +41,6 @@
 
 #define IGNORE_MOD_TAP_INTERRUPT
 
-// Reduce input latency by lowering the USB polling interval
-// from its 10ms default to the 1ms minimum that USB 1.x (Full Speed) allows:
-#define USB_POLLING_INTERVAL_MS 1
-
 // The Teensy 2++ consumes about 60 mA of current at its full speed of 16 MHz as
 // per https://www.pjrc.com/teensy/low_power.html
 #define USB_MAX_POWER_CONSUMPTION 100
diff --git a/keyboards/kinesis/kint36/config.h b/keyboards/kinesis/kint36/config.h
index 3738629ea7..188c83345d 100644
--- a/keyboards/kinesis/kint36/config.h
+++ b/keyboards/kinesis/kint36/config.h
@@ -59,10 +59,6 @@
 
 #define IGNORE_MOD_TAP_INTERRUPT
 
-// Reduce input latency by lowering the USB polling interval
-// from its 10ms default to the 1ms minimum that USB 1.x (Full Speed) allows:
-#define USB_POLLING_INTERVAL_MS 1
-
 // The Teensy 3.6 consumes about 80 mA of current at its full speed of 180 MHz:
 // https://forum.pjrc.com/threads/47256-What-is-the-power-consumption-of-the-Teensy-3-6
 #define USB_MAX_POWER_CONSUMPTION 100
diff --git a/keyboards/kinesis/kint41/config.h b/keyboards/kinesis/kint41/config.h
index 7d87b8dd76..3e13e84606 100644
--- a/keyboards/kinesis/kint41/config.h
+++ b/keyboards/kinesis/kint41/config.h
@@ -86,10 +86,6 @@
 
 #define IGNORE_MOD_TAP_INTERRUPT
 
-// Reduce input latency by lowering the USB polling interval
-// from its 10ms default to the 125μs minimum that USB 2.x (High Speed) allows:
-#define USB_POLLING_INTERVAL_MS 1
-
 // The Teensy 4.1 consumes about 100 mA of current at its full speed of 600 MHz
 // as per https://www.pjrc.com/store/teensy41.html
 #define USB_MAX_POWER_CONSUMPTION 100
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/config.h b/keyboards/kprepublic/bm60hsrgb/rev2/config.h
index e25f0ad489..b4aa1a549c 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/config.h
@@ -44,7 +44,6 @@
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
-#define USB_POLLING_INTERVAL_MS 1
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
index 8286b447a8..5e695aec57 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
@@ -46,7 +46,6 @@
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
-#define USB_POLLING_INTERVAL_MS 1
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h
index b5efc1f596..27c3a6df55 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h
@@ -44,7 +44,6 @@
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
-#define USB_POLLING_INTERVAL_MS 1
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
diff --git a/keyboards/linworks/fave87/config.h b/keyboards/linworks/fave87/config.h
index d6d5ab5cf4..ef934024f7 100644
--- a/keyboards/linworks/fave87/config.h
+++ b/keyboards/linworks/fave87/config.h
@@ -23,8 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MANUFACTURER    Lx3
 #define PRODUCT         FAVE-87
 
-/* Set 1 kHz polling rate and force USB NKRO */
-#define USB_POLLING_INTERVAL_MS 1
+/* Force USB NKRO */
 #define FORCE_NKRO
 
 /* key matrix size */
diff --git a/keyboards/linworks/whale75/config.h b/keyboards/linworks/whale75/config.h
index 5ba4494309..2e0b26b397 100644
--- a/keyboards/linworks/whale75/config.h
+++ b/keyboards/linworks/whale75/config.h
@@ -23,8 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MANUFACTURER    Lx3
 #define PRODUCT         Whale-75
 
-/* Set 1 kHz polling rate and force USB NKRO */
-#define USB_POLLING_INTERVAL_MS 1
+/* Force USB NKRO */
 #define FORCE_NKRO
 
 /* key matrix size */
diff --git a/keyboards/lz/erghost/config.h b/keyboards/lz/erghost/config.h
index 74867baf7f..0936f6c271 100644
--- a/keyboards/lz/erghost/config.h
+++ b/keyboards/lz/erghost/config.h
@@ -46,9 +46,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
 
-#define USB_POLLING_INTERVAL_MS 1
-
-
 #define LED_NUM_LOCK_PIN D7
 #define LED_CAPS_LOCK_PIN D6
 #define LED_SCROLL_LOCK_PIN B4
diff --git a/keyboards/mechlovin/infinity87/rev2/config.h b/keyboards/mechlovin/infinity87/rev2/config.h
index ddf9df4593..575e826a9b 100644
--- a/keyboards/mechlovin/infinity87/rev2/config.h
+++ b/keyboards/mechlovin/infinity87/rev2/config.h
@@ -36,9 +36,6 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
 
-#define USB_POLLING_INTERVAL_MS 1
-
-
 #define LED_NUM_LOCK_PIN D7
 #define LED_CAPS_LOCK_PIN D6
 #define LED_SCROLL_LOCK_PIN B4
diff --git a/keyboards/mechlovin/serratus/config.h b/keyboards/mechlovin/serratus/config.h
index 055557b3a4..0bb9ccbea9 100644
--- a/keyboards/mechlovin/serratus/config.h
+++ b/keyboards/mechlovin/serratus/config.h
@@ -45,9 +45,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
 
-#define USB_POLLING_INTERVAL_MS 1
-
-
 #define LED_NUM_LOCK_PIN D7
 #define LED_CAPS_LOCK_PIN D6
 #define LED_SCROLL_LOCK_PIN B4
diff --git a/keyboards/ploopyco/mouse/config.h b/keyboards/ploopyco/mouse/config.h
index 4f2103e31c..df1ea1297b 100644
--- a/keyboards/ploopyco/mouse/config.h
+++ b/keyboards/ploopyco/mouse/config.h
@@ -54,9 +54,6 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
-/* Much more so than a keyboard, speed matters for a mouse. So we'll go for as high
-   a polling rate as possible. */
-#define USB_POLLING_INTERVAL_MS 1
 #define USB_MAX_POWER_CONSUMPTION 100
 
 /* define if matrix has ghost (lacks anti-ghosting diodes) */
diff --git a/keyboards/ploopyco/trackball/config.h b/keyboards/ploopyco/trackball/config.h
index 7b0f3faa04..4275e9d119 100644
--- a/keyboards/ploopyco/trackball/config.h
+++ b/keyboards/ploopyco/trackball/config.h
@@ -44,9 +44,6 @@
 #define NO_ACTION_MACRO
 #define NO_ACTION_FUNCTION
 
-/* Much more so than a keyboard, speed matters for a mouse. So we'll go for as high
-   a polling rate as possible. */
-#define USB_POLLING_INTERVAL_MS 1
 #define USB_MAX_POWER_CONSUMPTION 100
 
 /* Bootmagic Lite key configuration */
diff --git a/keyboards/ploopyco/trackball_mini/config.h b/keyboards/ploopyco/trackball_mini/config.h
index af1e63eb71..731e6fbc97 100644
--- a/keyboards/ploopyco/trackball_mini/config.h
+++ b/keyboards/ploopyco/trackball_mini/config.h
@@ -45,9 +45,6 @@
 #define NO_ACTION_MACRO
 #define NO_ACTION_FUNCTION
 
-/* Much more so than a keyboard, speed matters for a mouse. So we'll go for as high
-   a polling rate as possible. */
-#define USB_POLLING_INTERVAL_MS 1
 #define USB_MAX_POWER_CONSUMPTION 100
 
 /* Bootmagic Lite key configuration */
diff --git a/keyboards/ploopyco/trackball_nano/config.h b/keyboards/ploopyco/trackball_nano/config.h
index 4c0aab8c62..98a2c662fa 100644
--- a/keyboards/ploopyco/trackball_nano/config.h
+++ b/keyboards/ploopyco/trackball_nano/config.h
@@ -41,9 +41,6 @@
 #define NO_ACTION_MACRO
 #define NO_ACTION_FUNCTION
 
-/* Much more so than a keyboard, speed matters for a mouse. So we'll go for as high
-   a polling rate as possible. */
-#define USB_POLLING_INTERVAL_MS 1
 #define USB_MAX_POWER_CONSUMPTION 100
 
 #define ADNS5050_SCLK_PIN         B7
diff --git a/keyboards/rgbkb/mun/config.h b/keyboards/rgbkb/mun/config.h
index eec3009d8c..de658eb93c 100644
--- a/keyboards/rgbkb/mun/config.h
+++ b/keyboards/rgbkb/mun/config.h
@@ -17,8 +17,6 @@
 #define MANUFACTURER    RGBKB
 #define PRODUCT         Mün
 
-#define USB_POLLING_INTERVAL_MS 1
-
 /* Matrix Configuration - Rows are doubled up */
 #define MATRIX_ROWS 14
 // Last pins reserved for encoder / touch encoder support
diff --git a/keyboards/rgbkb/sol3/config.h b/keyboards/rgbkb/sol3/config.h
index 8d87e5b2fa..92db3def6b 100644
--- a/keyboards/rgbkb/sol3/config.h
+++ b/keyboards/rgbkb/sol3/config.h
@@ -17,8 +17,6 @@
 #define MANUFACTURER    RGBKB
 #define PRODUCT         Sol 3
 
-#define USB_POLLING_INTERVAL_MS 1
-
 /* Matrix Configuration - Rows are doubled up */
 #define MATRIX_ROWS 12
 // Last pins reserved for encoder / touch encoder support
diff --git a/keyboards/sanctified/dystopia/config.h b/keyboards/sanctified/dystopia/config.h
index dbed621724..3cb61cfde6 100644
--- a/keyboards/sanctified/dystopia/config.h
+++ b/keyboards/sanctified/dystopia/config.h
@@ -35,5 +35,4 @@
 
 #define DIODE_DIRECTION COL2ROW
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 12
diff --git a/keyboards/splitkb/kyria/keymaps/via/config.h b/keyboards/splitkb/kyria/keymaps/via/config.h
index 3ca93f4fd3..f4449ac7a0 100644
--- a/keyboards/splitkb/kyria/keymaps/via/config.h
+++ b/keyboards/splitkb/kyria/keymaps/via/config.h
@@ -36,5 +36,3 @@
 #    define RGBLIGHT_VAL_STEP 8
 #    define RGBLIGHT_LIMIT_VAL 150
 #endif
-
-#define USB_POLLING_INTERVAL_MS 1
diff --git a/keyboards/xelus/dharma/keymaps/default/config.h b/keyboards/xelus/dharma/keymaps/default/config.h
index ea9bfa60eb..5d972dd48c 100644
--- a/keyboards/xelus/dharma/keymaps/default/config.h
+++ b/keyboards/xelus/dharma/keymaps/default/config.h
@@ -15,5 +15,4 @@
  */
 #pragma once
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/dharma/keymaps/via/config.h b/keyboards/xelus/dharma/keymaps/via/config.h
index ea9bfa60eb..5d972dd48c 100644
--- a/keyboards/xelus/dharma/keymaps/via/config.h
+++ b/keyboards/xelus/dharma/keymaps/via/config.h
@@ -15,5 +15,4 @@
  */
 #pragma once
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/kangaroo/keymaps/default/config.h b/keyboards/xelus/kangaroo/keymaps/default/config.h
index ea9bfa60eb..5d972dd48c 100644
--- a/keyboards/xelus/kangaroo/keymaps/default/config.h
+++ b/keyboards/xelus/kangaroo/keymaps/default/config.h
@@ -15,5 +15,4 @@
  */
 #pragma once
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/kangaroo/keymaps/via/config.h b/keyboards/xelus/kangaroo/keymaps/via/config.h
index ea9bfa60eb..5d972dd48c 100644
--- a/keyboards/xelus/kangaroo/keymaps/via/config.h
+++ b/keyboards/xelus/kangaroo/keymaps/via/config.h
@@ -15,5 +15,4 @@
  */
 #pragma once
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/la_plus/keymaps/default/config.h b/keyboards/xelus/la_plus/keymaps/default/config.h
index 393166c4f4..e559a15426 100644
--- a/keyboards/xelus/la_plus/keymaps/default/config.h
+++ b/keyboards/xelus/la_plus/keymaps/default/config.h
@@ -16,6 +16,4 @@
 
 #pragma once
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 4
-
diff --git a/keyboards/xelus/la_plus/keymaps/via/config.h b/keyboards/xelus/la_plus/keymaps/via/config.h
index ef2ec42057..58c086282c 100644
--- a/keyboards/xelus/la_plus/keymaps/via/config.h
+++ b/keyboards/xelus/la_plus/keymaps/via/config.h
@@ -19,6 +19,4 @@
 // Enable RGB Matrix
 #define VIA_QMK_RGBLIGHT_ENABLE
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 4
-
diff --git a/keyboards/xelus/pachi/mini_32u4/keymaps/default/config.h b/keyboards/xelus/pachi/mini_32u4/keymaps/default/config.h
index ea9bfa60eb..5d972dd48c 100644
--- a/keyboards/xelus/pachi/mini_32u4/keymaps/default/config.h
+++ b/keyboards/xelus/pachi/mini_32u4/keymaps/default/config.h
@@ -15,5 +15,4 @@
  */
 #pragma once
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/pachi/mini_32u4/keymaps/via/config.h b/keyboards/xelus/pachi/mini_32u4/keymaps/via/config.h
index 0315ad280f..fc3a2bd0b2 100644
--- a/keyboards/xelus/pachi/mini_32u4/keymaps/via/config.h
+++ b/keyboards/xelus/pachi/mini_32u4/keymaps/via/config.h
@@ -19,5 +19,4 @@
 // 3 layers or else it will not fit in EEPROM
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/pachi/rev1/keymaps/default/config.h b/keyboards/xelus/pachi/rev1/keymaps/default/config.h
index ea9bfa60eb..5d972dd48c 100644
--- a/keyboards/xelus/pachi/rev1/keymaps/default/config.h
+++ b/keyboards/xelus/pachi/rev1/keymaps/default/config.h
@@ -15,5 +15,4 @@
  */
 #pragma once
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/pachi/rev1/keymaps/via/config.h b/keyboards/xelus/pachi/rev1/keymaps/via/config.h
index 0315ad280f..fc3a2bd0b2 100644
--- a/keyboards/xelus/pachi/rev1/keymaps/via/config.h
+++ b/keyboards/xelus/pachi/rev1/keymaps/via/config.h
@@ -19,5 +19,4 @@
 // 3 layers or else it will not fit in EEPROM
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/pachi/rgb/keymaps/default/config.h b/keyboards/xelus/pachi/rgb/keymaps/default/config.h
index ea9bfa60eb..5d972dd48c 100644
--- a/keyboards/xelus/pachi/rgb/keymaps/default/config.h
+++ b/keyboards/xelus/pachi/rgb/keymaps/default/config.h
@@ -15,5 +15,4 @@
  */
 #pragma once
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/pachi/rgb/keymaps/via/config.h b/keyboards/xelus/pachi/rgb/keymaps/via/config.h
index 76d009f29e..1213e7a8f2 100644
--- a/keyboards/xelus/pachi/rgb/keymaps/via/config.h
+++ b/keyboards/xelus/pachi/rgb/keymaps/via/config.h
@@ -22,6 +22,4 @@
 // Enable RGB Matrix
 #define VIA_QMK_RGBLIGHT_ENABLE
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 4
-
diff --git a/keyboards/xelus/rs60/keymaps/default/config.h b/keyboards/xelus/rs60/keymaps/default/config.h
index ea9bfa60eb..5d972dd48c 100644
--- a/keyboards/xelus/rs60/keymaps/default/config.h
+++ b/keyboards/xelus/rs60/keymaps/default/config.h
@@ -15,5 +15,4 @@
  */
 #pragma once
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/rs60/keymaps/via/config.h b/keyboards/xelus/rs60/keymaps/via/config.h
index ea9bfa60eb..5d972dd48c 100644
--- a/keyboards/xelus/rs60/keymaps/via/config.h
+++ b/keyboards/xelus/rs60/keymaps/via/config.h
@@ -15,5 +15,4 @@
  */
 #pragma once
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/valor/rev2/keymaps/default/config.h b/keyboards/xelus/valor/rev2/keymaps/default/config.h
index 824d4633cc..5d972dd48c 100644
--- a/keyboards/xelus/valor/rev2/keymaps/default/config.h
+++ b/keyboards/xelus/valor/rev2/keymaps/default/config.h
@@ -13,6 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#pragma once
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/valor/rev2/keymaps/via/config.h b/keyboards/xelus/valor/rev2/keymaps/via/config.h
index 456369d884..490964f272 100644
--- a/keyboards/xelus/valor/rev2/keymaps/via/config.h
+++ b/keyboards/xelus/valor/rev2/keymaps/via/config.h
@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#pragma once
 
 // RGB Matrix
 #define VIA_QMK_RGBLIGHT_ENABLE
@@ -20,5 +21,4 @@
 // More layers
 #define DYNAMIC_KEYMAP_LAYER_COUNT 8
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/valor_frl_tkl/keymaps/default/config.h b/keyboards/xelus/valor_frl_tkl/keymaps/default/config.h
index 604c00df9f..7b8de5510e 100644
--- a/keyboards/xelus/valor_frl_tkl/keymaps/default/config.h
+++ b/keyboards/xelus/valor_frl_tkl/keymaps/default/config.h
@@ -15,5 +15,4 @@
  */
 #pragma once
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/valor_frl_tkl/keymaps/via/config.h b/keyboards/xelus/valor_frl_tkl/keymaps/via/config.h
index 604c00df9f..7b8de5510e 100644
--- a/keyboards/xelus/valor_frl_tkl/keymaps/via/config.h
+++ b/keyboards/xelus/valor_frl_tkl/keymaps/via/config.h
@@ -15,5 +15,4 @@
  */
 #pragma once
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/xs60/keymaps/default/config.h b/keyboards/xelus/xs60/keymaps/default/config.h
index ea9bfa60eb..5d972dd48c 100644
--- a/keyboards/xelus/xs60/keymaps/default/config.h
+++ b/keyboards/xelus/xs60/keymaps/default/config.h
@@ -15,5 +15,4 @@
  */
 #pragma once
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/xs60/keymaps/via/config.h b/keyboards/xelus/xs60/keymaps/via/config.h
index 54aaf775da..b608adcfc4 100644
--- a/keyboards/xelus/xs60/keymaps/via/config.h
+++ b/keyboards/xelus/xs60/keymaps/via/config.h
@@ -18,5 +18,4 @@
 // More layers
 #define DYNAMIC_KEYMAP_LAYER_COUNT 8
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 4