diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/config.h b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/config.h
index 4e39f5182d2a..1f01ef440d4c 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/config.h
@@ -28,9 +28,6 @@
 /* VBUS detection. */
 #define USB_VBUS_PIN GP25
 
-/* VBUS detection. */
-#define USB_VBUS_PIN GP25
-
 /* SPI & PMW3360 settings. */
 #define SPI_DRIVER SPID0
 #define SPI_SCK_PIN GP18
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/config.h b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/config.h
index e55cc58a837b..37f4c6a55d9c 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/config.h
@@ -28,9 +28,6 @@
 /* VBUS detection. */
 #define USB_VBUS_PIN GP19
 
-/* VBUS detection. */
-#define USB_VBUS_PIN GP19
-
 /* SPI & PMW3360 settings. */
 #define SPI_DRIVER SPID0
 #define SPI_SCK_PIN GP22
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h
index 4e39f5182d2a..1f01ef440d4c 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/config.h
@@ -28,9 +28,6 @@
 /* VBUS detection. */
 #define USB_VBUS_PIN GP25
 
-/* VBUS detection. */
-#define USB_VBUS_PIN GP25
-
 /* SPI & PMW3360 settings. */
 #define SPI_DRIVER SPID0
 #define SPI_SCK_PIN GP18
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h
index e55cc58a837b..37f4c6a55d9c 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h
@@ -28,9 +28,6 @@
 /* VBUS detection. */
 #define USB_VBUS_PIN GP19
 
-/* VBUS detection. */
-#define USB_VBUS_PIN GP19
-
 /* SPI & PMW3360 settings. */
 #define SPI_DRIVER SPID0
 #define SPI_SCK_PIN GP22
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/config.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/config.h
index 4e39f5182d2a..1f01ef440d4c 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/config.h
@@ -28,9 +28,6 @@
 /* VBUS detection. */
 #define USB_VBUS_PIN GP25
 
-/* VBUS detection. */
-#define USB_VBUS_PIN GP25
-
 /* SPI & PMW3360 settings. */
 #define SPI_DRIVER SPID0
 #define SPI_SCK_PIN GP18
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/config.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/config.h
index e55cc58a837b..37f4c6a55d9c 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/config.h
@@ -28,9 +28,6 @@
 /* VBUS detection. */
 #define USB_VBUS_PIN GP19
 
-/* VBUS detection. */
-#define USB_VBUS_PIN GP19
-
 /* SPI & PMW3360 settings. */
 #define SPI_DRIVER SPID0
 #define SPI_SCK_PIN GP22
diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/keymap.c b/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/keymap.c
index ad4f605f17b5..b3aeaf014f68 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/keymap.c
+++ b/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/keymap.c
@@ -96,7 +96,7 @@ static uint16_t auto_pointer_layer_timer = 0;
 
 /** \brief Mouse emulation and pointer functions. */
 #define LAYOUT_LAYER_POINTER                                                                  \
-    QK_BOOT,  EE_CLR, XXXXXXX, DPI_MOD, S_D_MOD, S_D_MOD, DPI_MOD, XXXXXXX,  EE_CLR, QK_BOOT, \
+    QK_BOOT, XXXXXXX, XXXXXXX, DPI_MOD, S_D_MOD, S_D_MOD, DPI_MOD, XXXXXXX, XXXXXXX, QK_BOOT, \
     ______________HOME_ROW_GACS_L______________, ______________HOME_ROW_GACS_R______________, \
     _______, DRGSCRL, SNIPING, KC_BTN3, XXXXXXX, XXXXXXX, KC_BTN3, SNIPING, DRGSCRL, _______, \
                                KC_BTN2, KC_BTN1, KC_BTN1, KC_BTN2
diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/config.h b/keyboards/bastardkb/scylla/v2/splinky_2/config.h
index eb4f9049a49c..464b189e5164 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_2/config.h
+++ b/keyboards/bastardkb/scylla/v2/splinky_2/config.h
@@ -28,9 +28,6 @@
 /* VBUS detection. */
 #define USB_VBUS_PIN GP25
 
-/* VBUS detection. */
-#define USB_VBUS_PIN GP25
-
 /* Reset. */
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/config.h b/keyboards/bastardkb/scylla/v2/splinky_3/config.h
index bfb1dab883d7..ae33d3e3d9c4 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_3/config.h
+++ b/keyboards/bastardkb/scylla/v2/splinky_3/config.h
@@ -28,9 +28,6 @@
 /* VBUS detection. */
 #define USB_VBUS_PIN GP19
 
-/* VBUS detection. */
-#define USB_VBUS_PIN GP19
-
 /* Reset. */
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/config.h b/keyboards/bastardkb/skeletyl/v2/splinky_2/config.h
index eb4f9049a49c..464b189e5164 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky_2/config.h
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_2/config.h
@@ -28,9 +28,6 @@
 /* VBUS detection. */
 #define USB_VBUS_PIN GP25
 
-/* VBUS detection. */
-#define USB_VBUS_PIN GP25
-
 /* Reset. */
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/config.h b/keyboards/bastardkb/skeletyl/v2/splinky_3/config.h
index bfb1dab883d7..ae33d3e3d9c4 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky_3/config.h
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_3/config.h
@@ -28,9 +28,6 @@
 /* VBUS detection. */
 #define USB_VBUS_PIN GP19
 
-/* VBUS detection. */
-#define USB_VBUS_PIN GP19
-
 /* Reset. */
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_2/config.h b/keyboards/bastardkb/tbkmini/v2/splinky_2/config.h
index eb4f9049a49c..464b189e5164 100644
--- a/keyboards/bastardkb/tbkmini/v2/splinky_2/config.h
+++ b/keyboards/bastardkb/tbkmini/v2/splinky_2/config.h
@@ -28,9 +28,6 @@
 /* VBUS detection. */
 #define USB_VBUS_PIN GP25
 
-/* VBUS detection. */
-#define USB_VBUS_PIN GP25
-
 /* Reset. */
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/config.h b/keyboards/bastardkb/tbkmini/v2/splinky_3/config.h
index bfb1dab883d7..ae33d3e3d9c4 100644
--- a/keyboards/bastardkb/tbkmini/v2/splinky_3/config.h
+++ b/keyboards/bastardkb/tbkmini/v2/splinky_3/config.h
@@ -28,9 +28,6 @@
 /* VBUS detection. */
 #define USB_VBUS_PIN GP19
 
-/* VBUS detection. */
-#define USB_VBUS_PIN GP19
-
 /* Reset. */
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17