7 files changed, 21 insertions, 70 deletions
diff --git a/keyboards/lets_split/keymaps/adam/config.h b/keyboards/lets_split/keymaps/adam/config.h
index 9ba612359e..c2c45bebfd 100644
--- a/keyboards/lets_split/keymaps/adam/config.h
+++ b/keyboards/lets_split/keymaps/adam/config.h
@@ -21,15 +21,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef CONFIG_USER_H
 #define CONFIG_USER_H
 
-#include "../../config.h"
-
 /* Select hand configuration */
 
 // #define MASTER_LEFT
 // #define MASTER_RIGHT
 #define EE_HANDS
 
-#ifdef SUBPROJECT_rev2
+#ifdef KEYBOARD_lets_split_rev2
     /* RGB Underglow */
     #undef RGBLED_NUM
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/lets_split/keymaps/fabian/config.h b/keyboards/lets_split/keymaps/fabian/config.h
index d05757233d..3e79f43ed0 100644
--- a/keyboards/lets_split/keymaps/fabian/config.h
+++ b/keyboards/lets_split/keymaps/fabian/config.h
@@ -19,14 +19,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MASTER_LEFT
 // #define MASTER_RIGHT
 // #define EE_HANDS
-
-
-#ifdef SUBPROJECT_rev1
-    #include "../../rev1/config.h"
-#endif
-#ifdef SUBPROJECT_rev2
-    #include "../../rev2/config.h"
-#endif
-#ifdef SUBPROJECT_rev2fliphalf
-	#include "../../rev2fliphalf/config.h"
-#endif
diff --git a/keyboards/lets_split/keymaps/heartrobotninja/config.h b/keyboards/lets_split/keymaps/heartrobotninja/config.h
index d4193609ad..bd68b24d08 100644
--- a/keyboards/lets_split/keymaps/heartrobotninja/config.h
+++ b/keyboards/lets_split/keymaps/heartrobotninja/config.h
@@ -41,14 +41,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #undef TAPPING_TOGGLE
 #define TAPPING_TOGGLE 2
 
-#ifdef SUBPROJECT_rev1
-#include "../../rev1/config.h"
-#endif
-#ifdef SUBPROJECT_rev2
-#include "../../rev2/config.h"
-#endif
-#ifdef SUBPROJECT_rev2fliphalf
-#include "../../rev2fliphalf/config.h"
-#endif
-
 #endif
diff --git a/keyboards/lets_split/keymaps/mjt/config.h b/keyboards/lets_split/keymaps/mjt/config.h
index 94be36ef55..e51e065bb6 100644
--- a/keyboards/lets_split/keymaps/mjt/config.h
+++ b/keyboards/lets_split/keymaps/mjt/config.h
@@ -20,17 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-
-#ifdef SUBPROJECT_rev1
-    #include "../../rev1/config.h"
-#endif
-#ifdef SUBPROJECT_rev2
-    #include "../../rev2/config.h"
-#endif
-#ifdef SUBPROJECT_rev2fliphalf
-	#include "../../rev2fliphalf/config.h"
-#endif
-
 #undef RGBLED_NUM
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/lets_split/keymaps/piemod/rules.mk b/keyboards/lets_split/keymaps/piemod/rules.mk
index 79a0a17383..e4319facfb 100644
--- a/keyboards/lets_split/keymaps/piemod/rules.mk
+++ b/keyboards/lets_split/keymaps/piemod/rules.mk
@@ -10,4 +10,3 @@ AUDIO_ENABLE = no           # Audio output on port C6
 UNICODE_ENABLE = yes         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. 
-SUBPROJECT_rev1 = no
diff --git a/keyboards/lets_split/keymaps/zer09/keymap.c b/keyboards/lets_split/keymaps/zer09/keymap.c
index 4adc40e9c6..e09fa0d318 100644
--- a/keyboards/lets_split/keymaps/zer09/keymap.c
+++ b/keyboards/lets_split/keymaps/zer09/keymap.c
@@ -1,6 +1,24 @@
-#include "keymap.h"
+#include "zer09.h"
 
-extern keymap_config_t keymap_config;
+#undef LAYOUT
+#define LAYOUT( \
+  L00, L01, L02, L03, L04,     R00, R01, R02, R03, R04, \
+  L10, L11, L12, L13, L14,     R10, R11, R12, R13, R14, \
+  L20, L21, L22, L23, L24,     R20, R21, R22, R23, R24, \
+  L30, L31, L32, L33, L34,     R30, R31, R32, R33, R34, \
+  L40, L41, L42, L43, L44,     R40, R41, R42, R43, R44 \
+) { \
+  { L00, L01, L02, L03, L04 }, \
+  { L10, L11, L12, L13, L14 }, \
+  { L20, L21, L22, L23, L24 }, \
+  { L30, L31, L32, L33, L34 }, \
+  { L40, L41, L42, L43, L44 }, \
+  { R00, R01, R02, R03, R04 }, \
+  { R10, R11, R12, R13, R14 }, \
+  { R20, R21, R22, R23, R24 }, \
+  { R30, R31, R32, R33, R34 }, \
+  { R40, R41, R42, R43, R44 } \
+}
 
 #define _baseLayer LAYOUT( \
   KC_QUOTE,    KC_COMMA,    KC_DOT,      KC_P,        KC_Y,           /**/KC_F,           KC_G,        KC_C,        KC_R,        KC_L,        \
diff --git a/keyboards/lets_split/keymaps/zer09/keymap.h b/keyboards/lets_split/keymaps/zer09/keymap.h
deleted file mode 100644
index 03f8f480af..0000000000
--- a/keyboards/lets_split/keymaps/zer09/keymap.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#include "lets_split.h"
-#include "action_layer.h"
-#include "eeconfig.h"
-#include "tap_dance.h"
-#include "zer09.h"
-
-#ifdef LAYOUT_ortho_4x12
-#undef LAYOUT_ortho_4x12
-#endif
-
-#ifdef LAYOUT
-#undef LAYOUT
-#define LAYOUT( \
-  L00, L01, L02, L03, L04,     R00, R01, R02, R03, R04,  \
-  L10, L11, L12, L13, L14,     R10, R11, R12, R13, R14,  \
-  L20, L21, L22, L23, L24,     R20, R21, R22, R23, R24,  \
-  L30, L31, L32, L33, L34,     R30, R31, R32, R33, R34,  \
-  L40, L41, L42, L43, L44,     R40, R41, R42, R43, R44   \
-) \
-  { \
-    { L00, L01, L02, L03, L04 }, \
-    { L10, L11, L12, L13, L14 }, \
-    { L20, L21, L22, L23, L24 }, \
-    { L30, L31, L32, L33, L34 }, \
-    { L40, L41, L42, L43, L44 }, \
-    { R00, R01, R02, R03, R04 }, \
-    { R10, R11, R12, R13, R14 }, \
-    { R20, R21, R22, R23, R24 }, \
-    { R30, R31, R32, R33, R34 }, \
-    { R40, R41, R42, R43, R44 }  \
-  }
-#endif