diff --git a/keyboards/infinity60/infinity60.h b/keyboards/infinity60/infinity60.h
index 44510f53261e..f1ba15e4890b 100644
--- a/keyboards/infinity60/infinity60.h
+++ b/keyboards/infinity60/infinity60.h
@@ -63,6 +63,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #endif
 
-#define LAYOUT_60_ansi_split_bs KEYMAP
-
 #endif
diff --git a/keyboards/infinity60/rules.mk b/keyboards/infinity60/rules.mk
index 7ea700a433f9..a3ddd55c6c50 100644
--- a/keyboards/infinity60/rules.mk
+++ b/keyboards/infinity60/rules.mk
@@ -65,5 +65,3 @@ COMMAND_ENABLE = yes    # Commands for debug and configuration
 SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
 NKRO_ENABLE = yes	    # USB Nkey Rollover
 CUSTOM_MATRIX = yes # Custom matrix file
-
-LAYOUTS = 60_ansi_split_bs
diff --git a/keyboards/xd75/keymaps/default/Makefile b/keyboards/xd75/keymaps/default/Makefile
index 6e8941fdfd85..d4e08cfb26be 100644
--- a/keyboards/xd75/keymaps/default/Makefile
+++ b/keyboards/xd75/keymaps/default/Makefile
@@ -13,25 +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/>.
 
-
-# QMK Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = yes       # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI support (+2400 to 4200, depending on config)
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
 ifndef QUANTUM_DIR
 	include ../../../../Makefile
 endif
diff --git a/keyboards/xd75/rules.mk b/keyboards/xd75/rules.mk
index 8211a8d4a58d..7aa70212ed45 100644
--- a/keyboards/xd75/rules.mk
+++ b/keyboards/xd75/rules.mk
@@ -47,24 +47,22 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 #   USBaspLoader     2048
 OPT_DEFS += -DBOOTLOADER_SIZE=4996
 
-
-# Build Options
-#   change yes to no to disable
+# QMK Build Options
+#   change to "no" to disable the options, or define them in the Makefile in 
+#   the appropriate keymap folder that will get included automatically
 #
-BOOTMAGIC_ENABLE ?= yes      # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE ?= yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE ?= yes       # Audio control and System control(+450)
-CONSOLE_ENABLE ?= yes        # Console for debug(+400)
-COMMAND_ENABLE ?= yes        # Commands for debug and configuration
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE ?= no       # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE ?= no            # USB Nkey Rollover
-BACKLIGHT_ENABLE ?= yes       # Enable keyboard backlight functionality on B7 by default
-MIDI_ENABLE ?= no            # MIDI support (+2400 to 4200, depending on config)
-UNICODE_ENABLE ?= no         # Unicode
-BLUETOOTH_ENABLE ?= no       # Enable Bluetooth with the Adafruit EZ-Key HID
-AUDIO_ENABLE ?= no           # Audio output on port C6
-FAUXCLICKY_ENABLE ?= no      # Use buzzer to emulate clicky switches
+BOOTMAGIC_ENABLE = yes       # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
+EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
+CONSOLE_ENABLE = no         # Console for debug(+400)
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+MIDI_ENABLE = no            # MIDI support (+2400 to 4200, depending on config)
+AUDIO_ENABLE = no           # Audio output on port C6
+UNICODE_ENABLE = no         # Unicode
+BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
+RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 
 LAYOUTS = ortho_5x15
\ No newline at end of file
diff --git a/layouts/community/60_ansi_split_bs/layout.json b/layouts/community/60_ansi_split_bs/layout.json
deleted file mode 100644
index 82c85276d03b..000000000000
--- a/layouts/community/60_ansi_split_bs/layout.json
+++ /dev/null
@@ -1,5 +0,0 @@
-[{a:7},"","","","","","","","","","","","","","",""],
-[{w:1.5},"","","","","","","","","","","","","",{w:1.5},""],
-[{w:1.75},"","","","","","","","","","","","",{w:2.25},""],
-[{w:2.25},"","","","","","","","","","","",{w:2.75},""],
-[{w:1.25},"",{w:1.25},"",{w:1.25},"",{w:6.25},"",{w:1.25},"",{w:1.25},"",{w:1.25},"",{w:1.25},""]
diff --git a/layouts/community/60_ansi_split_bs/readme.md b/layouts/community/60_ansi_split_bs/readme.md
deleted file mode 100644
index ab44abedde77..000000000000
--- a/layouts/community/60_ansi_split_bs/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# 60_ansi_split_bs
-  
-    LAYOUT_60_ansi_split_bs
\ No newline at end of file
diff --git a/layouts/default/60_ansi_split_bs/default_ansi_split_bs/keymap.c b/layouts/default/60_ansi_split_bs/default_ansi_split_bs/keymap.c
deleted file mode 100644
index d81390f451bc..000000000000
--- a/layouts/default/60_ansi_split_bs/default_ansi_split_bs/keymap.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_60_ansi_split_bs( 
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-        KC_NO,    KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-        KC_NO,       KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,      KC_NO,
-        KC_NO,          KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,         KC_NO,
-        KC_NO,  KC_NO,  KC_NO,                     KC_NO,                      KC_NO,  KC_NO,  KC_NO,  KC_NO 
-    )
-};
\ No newline at end of file
diff --git a/layouts/default/60_ansi_split_bs/layout.json b/layouts/default/60_ansi_split_bs/layout.json
deleted file mode 100644
index 82c85276d03b..000000000000
--- a/layouts/default/60_ansi_split_bs/layout.json
+++ /dev/null
@@ -1,5 +0,0 @@
-[{a:7},"","","","","","","","","","","","","","",""],
-[{w:1.5},"","","","","","","","","","","","","",{w:1.5},""],
-[{w:1.75},"","","","","","","","","","","","",{w:2.25},""],
-[{w:2.25},"","","","","","","","","","","",{w:2.75},""],
-[{w:1.25},"",{w:1.25},"",{w:1.25},"",{w:6.25},"",{w:1.25},"",{w:1.25},"",{w:1.25},"",{w:1.25},""]
diff --git a/layouts/default/60_ansi_split_bs/readme.md b/layouts/default/60_ansi_split_bs/readme.md
deleted file mode 100644
index ab44abedde77..000000000000
--- a/layouts/default/60_ansi_split_bs/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# 60_ansi_split_bs
-  
-    LAYOUT_60_ansi_split_bs
\ No newline at end of file