diff --git a/keyboards/25keys/zinc/rev1/config.h b/keyboards/25keys/zinc/rev1/config.h
index 27755e64c6a..8d7fd3e26b3 100644
--- a/keyboards/25keys/zinc/rev1/config.h
+++ b/keyboards/25keys/zinc/rev1/config.h
@@ -19,11 +19,6 @@ along with this program. If not, see .
#define QUICK_TAP_TERM 0
-/* Select hand configuration */
-#define MASTER_LEFT
-//#define MASTER_RIGHT
-//#define EE_HANDS
-
/*
* Feature disable options
* These options are also useful to firmware size reduction.
diff --git a/keyboards/25keys/zinc/reva/config.h b/keyboards/25keys/zinc/reva/config.h
index 27755e64c6a..8d7fd3e26b3 100644
--- a/keyboards/25keys/zinc/reva/config.h
+++ b/keyboards/25keys/zinc/reva/config.h
@@ -19,11 +19,6 @@ along with this program. If not, see .
#define QUICK_TAP_TERM 0
-/* Select hand configuration */
-#define MASTER_LEFT
-//#define MASTER_RIGHT
-//#define EE_HANDS
-
/*
* Feature disable options
* These options are also useful to firmware size reduction.
diff --git a/keyboards/40percentclub/25/config.h b/keyboards/40percentclub/25/config.h
deleted file mode 100644
index 1710ba42ee9..00000000000
--- a/keyboards/40percentclub/25/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2018
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-#pragma once
-
-/* Select hand configuration */
-#define MASTER_LEFT
-//#define MASTER_RIGHT
-//#define EE_HANDS
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/40percentclub/6lit/config.h b/keyboards/40percentclub/6lit/config.h
deleted file mode 100644
index 1710ba42ee9..00000000000
--- a/keyboards/40percentclub/6lit/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2018
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-#pragma once
-
-/* Select hand configuration */
-#define MASTER_LEFT
-//#define MASTER_RIGHT
-//#define EE_HANDS
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/40percentclub/foobar/config.h b/keyboards/40percentclub/foobar/config.h
deleted file mode 100644
index 1710ba42ee9..00000000000
--- a/keyboards/40percentclub/foobar/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2018
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-#pragma once
-
-/* Select hand configuration */
-#define MASTER_LEFT
-//#define MASTER_RIGHT
-//#define EE_HANDS
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/adkb96/keymaps/default/config.h b/keyboards/adkb96/keymaps/default/config.h
index 3f8d841423a..a1c18568bed 100644
--- a/keyboards/adkb96/keymaps/default/config.h
+++ b/keyboards/adkb96/keymaps/default/config.h
@@ -20,13 +20,6 @@ along with this program. If not, see .
#pragma once
-
//#define USE_I2C
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
#define FORCE_NKRO
diff --git a/keyboards/alt34/rev1/config.h b/keyboards/alt34/rev1/config.h
index 9dd9e9bdde5..d71179bed55 100644
--- a/keyboards/alt34/rev1/config.h
+++ b/keyboards/alt34/rev1/config.h
@@ -21,5 +21,4 @@ along with this program. If not, see .
/* Select hand configuration */
#define EE_HANDS
-/* #define MASTER_LEFT */
-/* #define MASTER_RIGHT */
+
diff --git a/keyboards/arabica37/keymaps/default/config.h b/keyboards/arabica37/keymaps/default/config.h
index 5654f4daf4b..ff8c9caffc4 100644
--- a/keyboards/arabica37/keymaps/default/config.h
+++ b/keyboards/arabica37/keymaps/default/config.h
@@ -22,12 +22,6 @@ along with this program. If not, see .
//#define USE_MATRIX_I2C
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
#define QUICK_TAP_TERM 0
#define TAPPING_TERM 170
diff --git a/keyboards/basekeys/slice/rev1/config.h b/keyboards/basekeys/slice/rev1/config.h
deleted file mode 100644
index aecd34737d4..00000000000
--- a/keyboards/basekeys/slice/rev1/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2020 2Moons
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-/* Select hand configuration */
-//#define EE_HANDS
-#define MASTER_LEFT
-//#define MASTER_RIGHT
diff --git a/keyboards/basekeys/slice/rev1_rgb/config.h b/keyboards/basekeys/slice/rev1_rgb/config.h
index 2594d39f2a4..0f281a5718a 100644
--- a/keyboards/basekeys/slice/rev1_rgb/config.h
+++ b/keyboards/basekeys/slice/rev1_rgb/config.h
@@ -16,9 +16,4 @@ along with this program. If not, see .
*/
#pragma once
-/* Select hand configuration */
-//#define EE_HANDS
-#define MASTER_LEFT
-//#define MASTER_RIGHT
-
#define OLED_FONT_H "keyboards/basekeys/slice/slice_font.c"
diff --git a/keyboards/biacco42/ergo42/keymaps/default-illustrator/config.h b/keyboards/biacco42/ergo42/keymaps/default-illustrator/config.h
deleted file mode 100644
index f0717a46328..00000000000
--- a/keyboards/biacco42/ergo42/keymaps/default-illustrator/config.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
diff --git a/keyboards/biacco42/ergo42/keymaps/default-underglow/config.h b/keyboards/biacco42/ergo42/keymaps/default-underglow/config.h
index 2469b627e26..169a67d536a 100644
--- a/keyboards/biacco42/ergo42/keymaps/default-underglow/config.h
+++ b/keyboards/biacco42/ergo42/keymaps/default-underglow/config.h
@@ -20,12 +20,6 @@ along with this program. If not, see .
#pragma once
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
// Underglow
#undef RGBLIGHT_LED_COUNT
#define RGBLIGHT_LED_COUNT 14 // Number of LEDs
diff --git a/keyboards/biacco42/ergo42/keymaps/default/config.h b/keyboards/biacco42/ergo42/keymaps/default/config.h
deleted file mode 100644
index f0717a46328..00000000000
--- a/keyboards/biacco42/ergo42/keymaps/default/config.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
diff --git a/keyboards/controllerworks/mini42/config.h b/keyboards/controllerworks/mini42/config.h
index 3e5f7fd357e..d29e3e449f8 100644
--- a/keyboards/controllerworks/mini42/config.h
+++ b/keyboards/controllerworks/mini42/config.h
@@ -1,16 +1,16 @@
/*
* Copyright 2022 Kevin Gee
- *
+ *
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
@@ -25,7 +25,3 @@
#define I2C1_SCL_PIN GP25
#undef I2C1_SDA_PIN
#define I2C1_SDA_PIN GP24
-
-/* #define EE_HANDS */
-/* #define MASTER_LEFT */
-/* #define MASTER_RIGHT */
diff --git a/keyboards/crkbd/keymaps/default/config.h b/keyboards/crkbd/keymaps/default/config.h
index 9d4be81fa3c..aae511b0361 100644
--- a/keyboards/crkbd/keymaps/default/config.h
+++ b/keyboards/crkbd/keymaps/default/config.h
@@ -22,12 +22,6 @@ along with this program. If not, see .
//#define USE_MATRIX_I2C
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
//#define QUICK_TAP_TERM 0
//#define TAPPING_TERM 100
diff --git a/keyboards/crkbd/keymaps/via/config.h b/keyboards/crkbd/keymaps/via/config.h
index 806b77d0132..c197a1bfdd7 100644
--- a/keyboards/crkbd/keymaps/via/config.h
+++ b/keyboards/crkbd/keymaps/via/config.h
@@ -18,12 +18,6 @@ along with this program. If not, see .
#pragma once
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
#ifdef RGBLIGHT_ENABLE
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/crkbd/keymaps/via_mechboards/config.h b/keyboards/crkbd/keymaps/via_mechboards/config.h
deleted file mode 100644
index cdc04f69080..00000000000
--- a/keyboards/crkbd/keymaps/via_mechboards/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2019 @foostan
-Copyright 2020 Drashna Jaelre <@drashna>
-Copyright 2021 Elliot Powell <@e11i0t23>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
diff --git a/keyboards/dailycraft/claw44/keymaps/default/config.h b/keyboards/dailycraft/claw44/keymaps/default/config.h
deleted file mode 100644
index 98469e4ccf1..00000000000
--- a/keyboards/dailycraft/claw44/keymaps/default/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-Copyright 2012 Jun Wako
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-#define MASTER_LEFT
diff --git a/keyboards/dailycraft/claw44/keymaps/oled/config.h b/keyboards/dailycraft/claw44/keymaps/oled/config.h
index 5379ce677d5..f4a508ed1a7 100644
--- a/keyboards/dailycraft/claw44/keymaps/oled/config.h
+++ b/keyboards/dailycraft/claw44/keymaps/oled/config.h
@@ -18,5 +18,4 @@ along with this program. If not, see .
#pragma once
-#define MASTER_LEFT
#define OLED_FONT_H "keyboards/claw44/lib/glcdfont.c"
diff --git a/keyboards/dailycraft/claw44/keymaps/via/config.h b/keyboards/dailycraft/claw44/keymaps/via/config.h
deleted file mode 100644
index 98469e4ccf1..00000000000
--- a/keyboards/dailycraft/claw44/keymaps/via/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-Copyright 2012 Jun Wako
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-#define MASTER_LEFT
diff --git a/keyboards/deltasplit75/keymaps/default/config.h b/keyboards/deltasplit75/keymaps/default/config.h
deleted file mode 100644
index 7a054691739..00000000000
--- a/keyboards/deltasplit75/keymaps/default/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2012 Jun Wako
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-
-#pragma once
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
diff --git a/keyboards/dm9records/ergoinu/config.h b/keyboards/dm9records/ergoinu/config.h
index b6a3484a260..ec72ce23ffc 100644
--- a/keyboards/dm9records/ergoinu/config.h
+++ b/keyboards/dm9records/ergoinu/config.h
@@ -19,11 +19,6 @@ along with this program. If not, see .
#pragma once
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
#ifndef IOS_DEVICE_ENABLE
#if RGBLIGHT_LED_COUNT <= 7
#define RGBLIGHT_LIMIT_VAL 255
diff --git a/keyboards/ergoslab/keymaps/default/config.h b/keyboards/ergoslab/keymaps/default/config.h
index e15fd605f41..8c198fd8302 100644
--- a/keyboards/ergoslab/keymaps/default/config.h
+++ b/keyboards/ergoslab/keymaps/default/config.h
@@ -18,7 +18,4 @@ along with this program. If not, see .
#pragma once
/* Select hand configuration */
-
-// #define MASTER_LEFT
#define MASTER_RIGHT
-// #define EE_HANDS
diff --git a/keyboards/ergotravel/keymaps/default/config.h b/keyboards/ergotravel/keymaps/default/config.h
index 746e60da5a5..62da533a87a 100644
--- a/keyboards/ergotravel/keymaps/default/config.h
+++ b/keyboards/ergotravel/keymaps/default/config.h
@@ -17,12 +17,6 @@ along with this program. If not, see .
#pragma once
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
#undef RGBLIGHT_LED_COUNT
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/ergotravel/keymaps/via/config.h b/keyboards/ergotravel/keymaps/via/config.h
deleted file mode 100644
index d42b738adc1..00000000000
--- a/keyboards/ergotravel/keymaps/via/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-Copyright 2017 Pierre Constantineau
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-// #undef RGBLIGHT_LED_COUNT
-// #define RGBLIGHT_LED_COUNT 14
-// #define RGBLIGHT_HUE_STEP 8
-// #define RGBLIGHT_SAT_STEP 8
-// #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/flxlb/zplit/keymaps/default/config.h b/keyboards/flxlb/zplit/keymaps/default/config.h
deleted file mode 100644
index a157047f7a1..00000000000
--- a/keyboards/flxlb/zplit/keymaps/default/config.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-//#define USE_I2C
-
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
diff --git a/keyboards/flxlb/zplit/keymaps/via/config.h b/keyboards/flxlb/zplit/keymaps/via/config.h
deleted file mode 100644
index a157047f7a1..00000000000
--- a/keyboards/flxlb/zplit/keymaps/via/config.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-//#define USE_I2C
-
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
diff --git a/keyboards/giabalanai/keymaps/2firmware/config.h b/keyboards/giabalanai/keymaps/2firmware/config.h
index e5ec1d73e28..a60cb593686 100644
--- a/keyboards/giabalanai/keymaps/2firmware/config.h
+++ b/keyboards/giabalanai/keymaps/2firmware/config.h
@@ -19,7 +19,4 @@ along with this program. If not, see .
//#define USE_MATRIX_I2C
/* Select hand configuration */
-
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
#define EE_HANDS
diff --git a/keyboards/handwired/chiron/keymaps/default/config.h b/keyboards/handwired/chiron/keymaps/default/config.h
index 5d8a8a083da..b636b8de812 100644
--- a/keyboards/handwired/chiron/keymaps/default/config.h
+++ b/keyboards/handwired/chiron/keymaps/default/config.h
@@ -17,7 +17,6 @@
#pragma once
#define MASTER_RIGHT
-//#define MASTER_LEFT
#define PERMISSIVE_HOLD
diff --git a/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/config.h b/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/config.h
index 335ac8cd3e4..b0e65f08c95 100644
--- a/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/config.h
+++ b/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/config.h
@@ -21,7 +21,4 @@ along with this program. If not, see .
#pragma once
/* Select hand configuration */
-//#define MASTER_LEFT
-//#define MASTER_RIGHT
-
#define EE_HANDS
diff --git a/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/config.h b/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/config.h
index cbacb25ca4a..b0e65f08c95 100644
--- a/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/config.h
+++ b/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/config.h
@@ -21,7 +21,4 @@ along with this program. If not, see .
#pragma once
/* Select hand configuration */
-
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
#define EE_HANDS
diff --git a/keyboards/handwired/dactyl_manuform/4x6/keymaps/default/config.h b/keyboards/handwired/dactyl_manuform/4x6/keymaps/default/config.h
index 335ac8cd3e4..b0e65f08c95 100644
--- a/keyboards/handwired/dactyl_manuform/4x6/keymaps/default/config.h
+++ b/keyboards/handwired/dactyl_manuform/4x6/keymaps/default/config.h
@@ -21,7 +21,4 @@ along with this program. If not, see .
#pragma once
/* Select hand configuration */
-//#define MASTER_LEFT
-//#define MASTER_RIGHT
-
#define EE_HANDS
diff --git a/keyboards/handwired/dactyl_manuform/4x6/keymaps/via/config.h b/keyboards/handwired/dactyl_manuform/4x6/keymaps/via/config.h
index ce7fd324eb2..1972348cefe 100644
--- a/keyboards/handwired/dactyl_manuform/4x6/keymaps/via/config.h
+++ b/keyboards/handwired/dactyl_manuform/4x6/keymaps/via/config.h
@@ -22,7 +22,4 @@ along with this program. If not, see .
#pragma once
/* Select hand configuration */
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
-
#define EE_HANDS
diff --git a/keyboards/handwired/dactyl_manuform/4x6_4_3/keymaps/default/config.h b/keyboards/handwired/dactyl_manuform/4x6_4_3/keymaps/default/config.h
deleted file mode 100644
index 4d83c191f3c..00000000000
--- a/keyboards/handwired/dactyl_manuform/4x6_4_3/keymaps/default/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2012 Jun Wako
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-#define MASTER_LEFT
-//#define MASTER_RIGHT
-
-//#define EE_HANDS
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/default/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/default/config.h
deleted file mode 100644
index 4d83c191f3c..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/default/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2012 Jun Wako
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-#define MASTER_LEFT
-//#define MASTER_RIGHT
-
-//#define EE_HANDS
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/swedish/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/swedish/config.h
deleted file mode 100644
index b63c5788d18..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/swedish/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2012 Jun Wako
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-
-#pragma once
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-//#define EE_HANDS
-// Rows are doubled-up
diff --git a/keyboards/handwired/dactyl_manuform/5x7/keymaps/default/config.h b/keyboards/handwired/dactyl_manuform/5x7/keymaps/default/config.h
deleted file mode 100644
index 4d83c191f3c..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x7/keymaps/default/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2012 Jun Wako
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-#define MASTER_LEFT
-//#define MASTER_RIGHT
-
-//#define EE_HANDS
diff --git a/keyboards/handwired/dactyl_manuform/5x7/keymaps/via/config.h b/keyboards/handwired/dactyl_manuform/5x7/keymaps/via/config.h
deleted file mode 100644
index 4d83c191f3c..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x7/keymaps/via/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2012 Jun Wako
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-#define MASTER_LEFT
-//#define MASTER_RIGHT
-
-//#define EE_HANDS
diff --git a/keyboards/handwired/dactyl_manuform/6x6/keymaps/default/config.h b/keyboards/handwired/dactyl_manuform/6x6/keymaps/default/config.h
deleted file mode 100644
index 4d83c191f3c..00000000000
--- a/keyboards/handwired/dactyl_manuform/6x6/keymaps/default/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2012 Jun Wako
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-#define MASTER_LEFT
-//#define MASTER_RIGHT
-
-//#define EE_HANDS
diff --git a/keyboards/handwired/dactyl_minidox/keymaps/dlford/config.h b/keyboards/handwired/dactyl_minidox/keymaps/dlford/config.h
index a37a54c8fc1..f2ba9af16aa 100644
--- a/keyboards/handwired/dactyl_minidox/keymaps/dlford/config.h
+++ b/keyboards/handwired/dactyl_minidox/keymaps/dlford/config.h
@@ -18,9 +18,6 @@ along with this program. If not, see .
//#define USE_MATRIX_I2C
/* Select hand configuration */
-
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
#define EE_HANDS // ./util/docker_build.sh crkbd:dlford:dfu-split-[left|right] (or avrdude-split[left|right])
#define TAPPING_TOGGLE 2 // number of taps to toggle TT
@@ -46,7 +43,7 @@ along with this program. If not, see .
// # define RGB_MATRIX_SLEEP // turn off effects when suspended
# define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
# define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
-# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
+# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
# define RGB_MATRIX_HUE_STEP 8
# define RGB_MATRIX_SAT_STEP 8
# define RGB_MATRIX_VAL_STEP 8
@@ -78,7 +75,7 @@ along with this program. If not, see .
// # define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS // Randomly changes a single key's hue and saturation
// # define ENABLE_RGB_MATRIX_HUE_BREATHING // Hue shifts up a slight ammount at the same time then shifts back
// # define ENABLE_RGB_MATRIX_HUE_PENDULUM // Hue shifts up a slight ammount in a wave to the right then back to the left
-# define ENABLE_RGB_MATRIX_HUE_WAVE // Hue shifts up a slight ammount and then back down in a wave to the right
+# define ENABLE_RGB_MATRIX_HUE_WAVE // Hue shifts up a slight ammount and then back down in a wave to the right
// # define RGB_MATRIX_FRAMEBUFFER_EFFECTS // Required for the following two effects
// # define ENABLE_RGB_MATRIX_TYPING_HEATMAP // How hot is your WPM!
// # define ENABLE_RGB_MATRIX_DIGITAL_RAIN // That famous computer simulation
diff --git a/keyboards/handwired/dactyl_minidox/keymaps/via/config.h b/keyboards/handwired/dactyl_minidox/keymaps/via/config.h
index bb5b0bf6af6..2a3f904dbb6 100644
--- a/keyboards/handwired/dactyl_minidox/keymaps/via/config.h
+++ b/keyboards/handwired/dactyl_minidox/keymaps/via/config.h
@@ -17,7 +17,4 @@ along with this program. If not, see .
#pragma once
/* Select hand configuration */
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
-
#define EE_HANDS
diff --git a/keyboards/handwired/elrgo_s/keymaps/default/config.h b/keyboards/handwired/elrgo_s/keymaps/default/config.h
deleted file mode 100644
index b5f8c85421c..00000000000
--- a/keyboards/handwired/elrgo_s/keymaps/default/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2021 Yaroslav Smirnov
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-#pragma once
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
diff --git a/keyboards/handwired/ks63/config.h b/keyboards/handwired/ks63/config.h
index 9b05e85d644..e35e4a7e5ed 100644
--- a/keyboards/handwired/ks63/config.h
+++ b/keyboards/handwired/ks63/config.h
@@ -44,5 +44,4 @@ along with this program. If not, see .
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
-#define MASTER_LEFT
diff --git a/keyboards/handwired/not_so_minidox/config.h b/keyboards/handwired/not_so_minidox/config.h
deleted file mode 100644
index 7b7d4c06ae9..00000000000
--- a/keyboards/handwired/not_so_minidox/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2012 Jun Wako
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-//#define EE_HANDS
-
-#define MASTER_LEFT
-//#define MASTER_RIGHT
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/handwired/qc60/keymaps/default/config.h b/keyboards/handwired/qc60/keymaps/default/config.h
index 6202f57ec5d..eaf0f1b249e 100644
--- a/keyboards/handwired/qc60/keymaps/default/config.h
+++ b/keyboards/handwired/qc60/keymaps/default/config.h
@@ -2,4 +2,3 @@
#define USE_I2C
-#define MASTER_LEFT
diff --git a/keyboards/handwired/stef9998/split_5x7/keymaps/default/config.h b/keyboards/handwired/stef9998/split_5x7/keymaps/default/config.h
index 4afee280a08..a0dfe233aae 100644
--- a/keyboards/handwired/stef9998/split_5x7/keymaps/default/config.h
+++ b/keyboards/handwired/stef9998/split_5x7/keymaps/default/config.h
@@ -20,7 +20,5 @@ along with this program. If not, see .
#define USE_I2C
/* Select hand configuration */
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
#define EE_HANDS
diff --git a/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/config.h b/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/config.h
index 22d68ab3907..b0d6f7113e4 100644
--- a/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/config.h
+++ b/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/config.h
@@ -20,8 +20,6 @@ along with this program. If not, see .
#define USE_I2C
/* Select hand configuration */
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
#define EE_HANDS
#define LCPO_KEYS KC_LCTL,KC_TRNS,KC_LBRC
diff --git a/keyboards/handwired/unk/keymaps/default/config.h b/keyboards/handwired/unk/keymaps/default/config.h
deleted file mode 100644
index 3d8851ac436..00000000000
--- a/keyboards/handwired/unk/keymaps/default/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2020 Herpiko Dwi Aguno
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-
-#pragma once
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
diff --git a/keyboards/handwired/unk/rev1/config.h b/keyboards/handwired/unk/rev1/config.h
deleted file mode 100644
index 4e339bd5530..00000000000
--- a/keyboards/handwired/unk/rev1/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-Copyright 2020 Herpiko Dwi Aguno
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-
-#define MASTER_LEFT // Comment this line for the right half firmware
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-// #define NO_DEBUG
-
-/* disable print */
-// #define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/handwired/xealous/config.h b/keyboards/handwired/xealous/config.h
index a8788a8ad79..6cc6b4d1de4 100644
--- a/keyboards/handwired/xealous/config.h
+++ b/keyboards/handwired/xealous/config.h
@@ -21,9 +21,6 @@ along with this program. If not, see .
#define USE_I2C
#define SCL_CLOCK 800000UL
-/* Select hand configuration */
-#define MASTER_LEFT
-
//#define DEBUG_MATRIX_SCAN_RATE //Use this to determine scan-rate.
#ifdef AUDIO_ENABLE
diff --git a/keyboards/helix/pico/config.h b/keyboards/helix/pico/config.h
index e1cd9c2e909..6ba88a559cb 100644
--- a/keyboards/helix/pico/config.h
+++ b/keyboards/helix/pico/config.h
@@ -24,11 +24,6 @@ along with this program. If not, see .
#define SERIAL_SLAVE_BUFFER_LENGTH ((MATRIX_ROWS)/2)
#define SERIAL_MASTER_BUFFER_LENGTH ((MATRIX_ROWS)/2)
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
/* key matrix size */
// Rows are doubled-up
#define MATRIX_ROWS 8
diff --git a/keyboards/helix/rev2/config.h b/keyboards/helix/rev2/config.h
index 8af2a44ecc7..67af5038829 100644
--- a/keyboards/helix/rev2/config.h
+++ b/keyboards/helix/rev2/config.h
@@ -21,11 +21,6 @@ along with this program. If not, see .
#define QUICK_TAP_TERM 0
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
#define OLED_UPDATE_INTERVAL 50
// Helix keyboard RGB LED support
diff --git a/keyboards/ibnuda/squiggle/rev1/config.h b/keyboards/ibnuda/squiggle/rev1/config.h
deleted file mode 100644
index 10887bdf189..00000000000
--- a/keyboards/ibnuda/squiggle/rev1/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define MASTER_LEFT
diff --git a/keyboards/jian/rev1/config.h b/keyboards/jian/rev1/config.h
index 7ee2effd511..9d45e84064e 100644
--- a/keyboards/jian/rev1/config.h
+++ b/keyboards/jian/rev1/config.h
@@ -20,8 +20,6 @@ along with this program. If not, see .
#define USE_I2C
/* Select hand configuration */
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
#define EE_HANDS
// different Jian configs
diff --git a/keyboards/jiran/config.h b/keyboards/jiran/config.h
deleted file mode 100644
index 16a45b256b3..00000000000
--- a/keyboards/jiran/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-Copyright 2020 Vladislav Morozov
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-#define MASTER_LEFT
diff --git a/keyboards/kagizaraya/miniaxe/config.h b/keyboards/kagizaraya/miniaxe/config.h
deleted file mode 100644
index a0e31b0f1a2..00000000000
--- a/keyboards/kagizaraya/miniaxe/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright 2018 ENDO Katsuhiro
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-
-//#define EE_HANDS
-#define I2C_MASTER_LEFT
-//#define I2C_MASTER_RIGHT
diff --git a/keyboards/kagizaraya/scythe/config.h b/keyboards/kagizaraya/scythe/config.h
deleted file mode 100644
index e9f7198f44e..00000000000
--- a/keyboards/kagizaraya/scythe/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2019 ENDO Katsuhiro
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-
-/* Serial settings */
-//#define EE_HANDS
-#define I2C_MASTER_LEFT
-//#define I2C_MASTER_RIGHT
diff --git a/keyboards/kapl/rev1/config.h b/keyboards/kapl/rev1/config.h
deleted file mode 100644
index 80db6dce607..00000000000
--- a/keyboards/kapl/rev1/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2022 Alexander Lozyuk (@keyzog)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-/* Select hand configuration */
-#define MASTER_LEFT
diff --git a/keyboards/keycapsss/kimiko/keymaps/default/config.h b/keyboards/keycapsss/kimiko/keymaps/default/config.h
index 52faaf2b652..8be15d964a7 100644
--- a/keyboards/keycapsss/kimiko/keymaps/default/config.h
+++ b/keyboards/keycapsss/kimiko/keymaps/default/config.h
@@ -17,11 +17,6 @@
#pragma once
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
#define OLED_FONT_H "keyboards/keycapsss/kimiko/keymaps/default/glcdfont.c"
// #define OLED_FONT_WIDTH 5
// #define OLED_FONT_HEIGHT 7
diff --git a/keyboards/kumaokobo/kudox/config.h b/keyboards/kumaokobo/kudox/config.h
deleted file mode 100644
index ba80a927977..00000000000
--- a/keyboards/kumaokobo/kudox/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Kumao Kobo
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-#pragma once
-
-
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
diff --git a/keyboards/kumaokobo/kudox_full/config.h b/keyboards/kumaokobo/kudox_full/config.h
deleted file mode 100644
index 9512ffea8af..00000000000
--- a/keyboards/kumaokobo/kudox_full/config.h
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2021 Kumao Kobo (@kumaokobo)
-// SPDX-License-Identifier: GPL-2.0+
-
-#pragma once
-
-
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-
diff --git a/keyboards/kumaokobo/kudox_game/config.h b/keyboards/kumaokobo/kudox_game/config.h
deleted file mode 100644
index f998de9534e..00000000000
--- a/keyboards/kumaokobo/kudox_game/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2019 Kumao Kobo
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
diff --git a/keyboards/kumaokobo/pico/config.h b/keyboards/kumaokobo/pico/config.h
deleted file mode 100644
index ba80a927977..00000000000
--- a/keyboards/kumaokobo/pico/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Kumao Kobo
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-#pragma once
-
-
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
diff --git a/keyboards/lets_split/keymaps/default/config.h b/keyboards/lets_split/keymaps/default/config.h
index d9787a247f8..0bf36b324c6 100644
--- a/keyboards/lets_split/keymaps/default/config.h
+++ b/keyboards/lets_split/keymaps/default/config.h
@@ -25,8 +25,3 @@ along with this program. If not, see .
SONG(COLEMAK_SOUND), \
SONG(DVORAK_SOUND) \
}
-
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
diff --git a/keyboards/lets_split/keymaps/via/config.h b/keyboards/lets_split/keymaps/via/config.h
index 03853dc3919..020ddacf7be 100644
--- a/keyboards/lets_split/keymaps/via/config.h
+++ b/keyboards/lets_split/keymaps/via/config.h
@@ -26,10 +26,6 @@ along with this program. If not, see .
SONG(DVORAK_SOUND) \
}
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
#undef RGBLIGHT_LED_COUNT
#define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/lily58/keymaps/default/config.h b/keyboards/lily58/keymaps/default/config.h
index 5b45770f38f..10330a16af9 100644
--- a/keyboards/lily58/keymaps/default/config.h
+++ b/keyboards/lily58/keymaps/default/config.h
@@ -20,12 +20,6 @@ along with this program. If not, see .
#pragma once
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
#define QUICK_TAP_TERM 0
#define TAPPING_TERM 100
diff --git a/keyboards/lily58/keymaps/lily58l/config.h b/keyboards/lily58/keymaps/lily58l/config.h
index c61a32042b8..1fe44f8d39e 100644
--- a/keyboards/lily58/keymaps/lily58l/config.h
+++ b/keyboards/lily58/keymaps/lily58l/config.h
@@ -21,11 +21,6 @@ along with this program. If not, see .
#pragma once
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
#ifdef RGBLIGHT_ENABLE
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/lily58/keymaps/via/config.h b/keyboards/lily58/keymaps/via/config.h
index 284d3944b96..fbe8af64069 100644
--- a/keyboards/lily58/keymaps/via/config.h
+++ b/keyboards/lily58/keymaps/via/config.h
@@ -22,12 +22,6 @@ along with this program. If not, see .
//#define USE_MATRIX_I2C
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
#define QUICK_TAP_TERM 0
#define TAPPING_TERM 100
diff --git a/keyboards/lily58/keymaps/via_mechboards/config.h b/keyboards/lily58/keymaps/via_mechboards/config.h
index bd4e11fb0e6..959e6b15431 100644
--- a/keyboards/lily58/keymaps/via_mechboards/config.h
+++ b/keyboards/lily58/keymaps/via_mechboards/config.h
@@ -21,12 +21,6 @@ along with this program. If not, see .
#pragma once
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
#define TAPPING_FORCE_HOLD
#define TAPPING_TERM 100
diff --git a/keyboards/malevolti/lyra/keymaps/default/config.h b/keyboards/malevolti/lyra/keymaps/default/config.h
index 3e8db641e16..caaeea52c0f 100644
--- a/keyboards/malevolti/lyra/keymaps/default/config.h
+++ b/keyboards/malevolti/lyra/keymaps/default/config.h
@@ -20,11 +20,5 @@ along with this program. If not, see .
#pragma once
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
#define QUICK_TAP_TERM 0
#define TAPPING_TERM 100
diff --git a/keyboards/malevolti/lyra/keymaps/via/config.h b/keyboards/malevolti/lyra/keymaps/via/config.h
index 3e8db641e16..caaeea52c0f 100644
--- a/keyboards/malevolti/lyra/keymaps/via/config.h
+++ b/keyboards/malevolti/lyra/keymaps/via/config.h
@@ -20,11 +20,5 @@ along with this program. If not, see .
#pragma once
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
#define QUICK_TAP_TERM 0
#define TAPPING_TERM 100
diff --git a/keyboards/mechwild/mokulua/mirrored/config.h b/keyboards/mechwild/mokulua/mirrored/config.h
index c6504ff392c..135b9ad9081 100644
--- a/keyboards/mechwild/mokulua/mirrored/config.h
+++ b/keyboards/mechwild/mokulua/mirrored/config.h
@@ -5,5 +5,3 @@
#define OLED_FONT_H "keyboards/mechwild/mokulua/glcdfont.c"
-#define MASTER_LEFT
-//#define MASTER_RIGHT
diff --git a/keyboards/mechwild/mokulua/standard/config.h b/keyboards/mechwild/mokulua/standard/config.h
index c3b067e5ba3..adab4e6deab 100644
--- a/keyboards/mechwild/mokulua/standard/config.h
+++ b/keyboards/mechwild/mokulua/standard/config.h
@@ -5,9 +5,6 @@
#define OLED_FONT_H "keyboards/mechwild/mokulua/glcdfont.c"
-#define MASTER_LEFT
-//#define MASTER_RIGHT
-
/*
* Feature disable options
* These options are also useful to firmware size reduction.
diff --git a/keyboards/merge/um70/config.h b/keyboards/merge/um70/config.h
index 2d9f73d61ab..5f999594cf2 100644
--- a/keyboards/merge/um70/config.h
+++ b/keyboards/merge/um70/config.h
@@ -1,23 +1,22 @@
-/* Copyright 2021 duoshock
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
+/* Copyright 2021 duoshock
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
#pragma once
#define SPLIT_USB_DETECT
-#define MASTER_LEFT
#define SPLIT_MODS_ENABLE
#define B6_AUDIO
diff --git a/keyboards/merge/um80/config.h b/keyboards/merge/um80/config.h
index d23f9163a72..d8e896c14b4 100644
--- a/keyboards/merge/um80/config.h
+++ b/keyboards/merge/um80/config.h
@@ -1,23 +1,22 @@
-/* Copyright 2021 duoshock
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
+/* Copyright 2021 duoshock
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
#pragma once
#define SPLIT_USB_DETECT
-#define MASTER_LEFT
#define SPLIT_MODS_ENABLE
#define AUDIO_PIN B6
diff --git a/keyboards/omkbd/ergodash/mini/keymaps/default/config.h b/keyboards/omkbd/ergodash/mini/keymaps/default/config.h
deleted file mode 100644
index a597d848e2e..00000000000
--- a/keyboards/omkbd/ergodash/mini/keymaps/default/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/default/config.h b/keyboards/omkbd/ergodash/rev1/keymaps/default/config.h
deleted file mode 100644
index a597d848e2e..00000000000
--- a/keyboards/omkbd/ergodash/rev1/keymaps/default/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
diff --git a/keyboards/omkbd/runner3680/3x6/keymaps/default/config.h b/keyboards/omkbd/runner3680/3x6/keymaps/default/config.h
deleted file mode 100644
index 43a82f38a0a..00000000000
--- a/keyboards/omkbd/runner3680/3x6/keymaps/default/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-//#define USE_MATRIX_I2C
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
diff --git a/keyboards/omkbd/runner3680/3x7/keymaps/default/config.h b/keyboards/omkbd/runner3680/3x7/keymaps/default/config.h
deleted file mode 100644
index 43a82f38a0a..00000000000
--- a/keyboards/omkbd/runner3680/3x7/keymaps/default/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-//#define USE_MATRIX_I2C
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
diff --git a/keyboards/omkbd/runner3680/3x8/keymaps/default/config.h b/keyboards/omkbd/runner3680/3x8/keymaps/default/config.h
deleted file mode 100644
index 43a82f38a0a..00000000000
--- a/keyboards/omkbd/runner3680/3x8/keymaps/default/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-//#define USE_MATRIX_I2C
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
diff --git a/keyboards/omkbd/runner3680/4x6/keymaps/default/config.h b/keyboards/omkbd/runner3680/4x6/keymaps/default/config.h
deleted file mode 100644
index 43a82f38a0a..00000000000
--- a/keyboards/omkbd/runner3680/4x6/keymaps/default/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-//#define USE_MATRIX_I2C
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
diff --git a/keyboards/omkbd/runner3680/4x7/keymaps/default/config.h b/keyboards/omkbd/runner3680/4x7/keymaps/default/config.h
deleted file mode 100644
index 43a82f38a0a..00000000000
--- a/keyboards/omkbd/runner3680/4x7/keymaps/default/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-//#define USE_MATRIX_I2C
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
diff --git a/keyboards/omkbd/runner3680/4x8/keymaps/default/config.h b/keyboards/omkbd/runner3680/4x8/keymaps/default/config.h
deleted file mode 100644
index 43a82f38a0a..00000000000
--- a/keyboards/omkbd/runner3680/4x8/keymaps/default/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-//#define USE_MATRIX_I2C
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
diff --git a/keyboards/omkbd/runner3680/5x6/keymaps/default/config.h b/keyboards/omkbd/runner3680/5x6/keymaps/default/config.h
deleted file mode 100644
index 43a82f38a0a..00000000000
--- a/keyboards/omkbd/runner3680/5x6/keymaps/default/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-//#define USE_MATRIX_I2C
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
diff --git a/keyboards/omkbd/runner3680/5x6_5x8/keymaps/default/config.h b/keyboards/omkbd/runner3680/5x6_5x8/keymaps/default/config.h
deleted file mode 100644
index a21551badf3..00000000000
--- a/keyboards/omkbd/runner3680/5x6_5x8/keymaps/default/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2021 omkbd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-#pragma once
-
-//#define USE_MATRIX_I2C
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
diff --git a/keyboards/omkbd/runner3680/5x6_5x8/keymaps/jis/config.h b/keyboards/omkbd/runner3680/5x6_5x8/keymaps/jis/config.h
deleted file mode 100644
index a21551badf3..00000000000
--- a/keyboards/omkbd/runner3680/5x6_5x8/keymaps/jis/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2021 omkbd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-#pragma once
-
-//#define USE_MATRIX_I2C
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
diff --git a/keyboards/omkbd/runner3680/5x6_5x8/keymaps/via/config.h b/keyboards/omkbd/runner3680/5x6_5x8/keymaps/via/config.h
deleted file mode 100644
index a21551badf3..00000000000
--- a/keyboards/omkbd/runner3680/5x6_5x8/keymaps/via/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2021 omkbd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-#pragma once
-
-//#define USE_MATRIX_I2C
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
diff --git a/keyboards/omkbd/runner3680/5x7/keymaps/default/config.h b/keyboards/omkbd/runner3680/5x7/keymaps/default/config.h
deleted file mode 100644
index 43a82f38a0a..00000000000
--- a/keyboards/omkbd/runner3680/5x7/keymaps/default/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-//#define USE_MATRIX_I2C
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
diff --git a/keyboards/omkbd/runner3680/5x8/keymaps/JIS/config.h b/keyboards/omkbd/runner3680/5x8/keymaps/JIS/config.h
deleted file mode 100644
index 43a82f38a0a..00000000000
--- a/keyboards/omkbd/runner3680/5x8/keymaps/JIS/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-//#define USE_MATRIX_I2C
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
diff --git a/keyboards/omkbd/runner3680/5x8/keymaps/default/config.h b/keyboards/omkbd/runner3680/5x8/keymaps/default/config.h
deleted file mode 100644
index 43a82f38a0a..00000000000
--- a/keyboards/omkbd/runner3680/5x8/keymaps/default/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-//#define USE_MATRIX_I2C
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
diff --git a/keyboards/orthodox/keymaps/default/config.h b/keyboards/orthodox/keymaps/default/config.h
index 3ba91a8fb24..ba12b8f493c 100644
--- a/keyboards/orthodox/keymaps/default/config.h
+++ b/keyboards/orthodox/keymaps/default/config.h
@@ -22,9 +22,6 @@ along with this program. If not, see .
#pragma once
/* Select hand configuration */
-
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
#define EE_HANDS
#ifdef AUDIO_ENABLE
diff --git a/keyboards/orthodox/keymaps/oscillope/config.h b/keyboards/orthodox/keymaps/oscillope/config.h
index 1068d7efdf1..2169d85082c 100644
--- a/keyboards/orthodox/keymaps/oscillope/config.h
+++ b/keyboards/orthodox/keymaps/oscillope/config.h
@@ -19,19 +19,9 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
+#pragma once
#define USE_I2C
-/* Select hand configuration */
-
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
#define TAPPING_TERM 200
#define TAPPING_TOGGLE 3
-
-#endif
diff --git a/keyboards/pinky/3/keymaps/default/config.h b/keyboards/pinky/3/keymaps/default/config.h
index 3671c13a384..8a52fd041a9 100644
--- a/keyboards/pinky/3/keymaps/default/config.h
+++ b/keyboards/pinky/3/keymaps/default/config.h
@@ -18,12 +18,6 @@
//#define USE_MATRIX_I2C
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
#define QUICK_TAP_TERM 0
#define TAPPING_TERM 200
#define RETRO_TAPPPING
diff --git a/keyboards/pinky/3/keymaps/via/config.h b/keyboards/pinky/3/keymaps/via/config.h
index 3671c13a384..8a52fd041a9 100644
--- a/keyboards/pinky/3/keymaps/via/config.h
+++ b/keyboards/pinky/3/keymaps/via/config.h
@@ -18,12 +18,6 @@
//#define USE_MATRIX_I2C
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
#define QUICK_TAP_TERM 0
#define TAPPING_TERM 200
#define RETRO_TAPPPING
diff --git a/keyboards/pinky/4/keymaps/default/config.h b/keyboards/pinky/4/keymaps/default/config.h
index 3671c13a384..8a52fd041a9 100644
--- a/keyboards/pinky/4/keymaps/default/config.h
+++ b/keyboards/pinky/4/keymaps/default/config.h
@@ -18,12 +18,6 @@
//#define USE_MATRIX_I2C
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
#define QUICK_TAP_TERM 0
#define TAPPING_TERM 200
#define RETRO_TAPPPING
diff --git a/keyboards/pinky/4/keymaps/via/config.h b/keyboards/pinky/4/keymaps/via/config.h
index 3671c13a384..8a52fd041a9 100644
--- a/keyboards/pinky/4/keymaps/via/config.h
+++ b/keyboards/pinky/4/keymaps/via/config.h
@@ -18,12 +18,6 @@
//#define USE_MATRIX_I2C
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
#define QUICK_TAP_TERM 0
#define TAPPING_TERM 200
#define RETRO_TAPPPING
diff --git a/keyboards/qwertyydox/keymaps/default/config.h b/keyboards/qwertyydox/keymaps/default/config.h
index 504bee96de8..5e2d6c7cd07 100644
--- a/keyboards/qwertyydox/keymaps/default/config.h
+++ b/keyboards/qwertyydox/keymaps/default/config.h
@@ -18,7 +18,5 @@ along with this program. If not, see .
#pragma once
/* Select hand configuration */
-
-// #define MASTER_LEFT
#define MASTER_RIGHT
-// #define EE_HANDS
+
diff --git a/keyboards/redox/keymaps/default/config.h b/keyboards/redox/keymaps/default/config.h
index ab4d588cb0b..8c49d47026b 100644
--- a/keyboards/redox/keymaps/default/config.h
+++ b/keyboards/redox/keymaps/default/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see .
#pragma once
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
#undef RGBLIGHT_LED_COUNT
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/redox/keymaps/via/config.h b/keyboards/redox/keymaps/via/config.h
index 7b9be07d977..839e53b0f92 100644
--- a/keyboards/redox/keymaps/via/config.h
+++ b/keyboards/redox/keymaps/via/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see .
#pragma once
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
#undef RGBLIGHT_LED_COUNT
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/redox_media/keymaps/default/config.h b/keyboards/redox_media/keymaps/default/config.h
index 5970733b207..793c7a89bbd 100644
--- a/keyboards/redox_media/keymaps/default/config.h
+++ b/keyboards/redox_media/keymaps/default/config.h
@@ -18,5 +18,4 @@ along with this program. If not, see .
#pragma once
/* Select hand configuration */
-// #define MASTER_LEFT
#define EE_HANDS
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/default/config.h b/keyboards/rgbkb/zen/rev1/keymaps/default/config.h
index e9d6659d603..0480ccbfbd9 100644
--- a/keyboards/rgbkb/zen/rev1/keymaps/default/config.h
+++ b/keyboards/rgbkb/zen/rev1/keymaps/default/config.h
@@ -17,13 +17,6 @@ along with this program. If not, see .
#pragma once
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
#undef RGBLIGHT_LED_COUNT
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/rura66/rev1/config.h b/keyboards/rura66/rev1/config.h
index 4c82cee9103..b24773e8e71 100644
--- a/keyboards/rura66/rev1/config.h
+++ b/keyboards/rura66/rev1/config.h
@@ -17,10 +17,7 @@ along with this program. If not, see .
#pragma once
-/* Split hand configration */
-#define MASTER_LEFT
-
- #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RGB_TEST
+#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RGB_TEST
/* Custom font */
#define OLED_FONT_H "keyboards/rura66/common/glcdfont.c"
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/default/config.h b/keyboards/salicylic_acid3/naked48/keymaps/default/config.h
index c3d26106ca5..728b2a40d49 100644
--- a/keyboards/salicylic_acid3/naked48/keymaps/default/config.h
+++ b/keyboards/salicylic_acid3/naked48/keymaps/default/config.h
@@ -16,11 +16,5 @@
#pragma once
-/* Select hand configuration */
-
-//#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
#define QUICK_TAP_TERM 0
#define TAPPING_TERM 180
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/config.h b/keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/config.h
index f2a365a52e6..edb2caf9ddb 100644
--- a/keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/config.h
+++ b/keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/config.h
@@ -16,12 +16,6 @@
#pragma once
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
#define QUICK_TAP_TERM 0
#define TAPPING_TERM 180
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/config.h b/keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/config.h
index d0f71f4f9f7..8e4754de06d 100644
--- a/keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/config.h
+++ b/keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/config.h
@@ -16,12 +16,6 @@
#pragma once
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
#define QUICK_TAP_TERM 0
#define TAPPING_TERM 180
diff --git a/keyboards/salicylic_acid3/naked60/keymaps/default_with_nafuda/config.h b/keyboards/salicylic_acid3/naked60/keymaps/default_with_nafuda/config.h
index ed08dc121cb..728b2a40d49 100644
--- a/keyboards/salicylic_acid3/naked60/keymaps/default_with_nafuda/config.h
+++ b/keyboards/salicylic_acid3/naked60/keymaps/default_with_nafuda/config.h
@@ -16,11 +16,5 @@
#pragma once
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
#define QUICK_TAP_TERM 0
#define TAPPING_TERM 180
diff --git a/keyboards/salicylic_acid3/naked60/keymaps/default_with_setta21/config.h b/keyboards/salicylic_acid3/naked60/keymaps/default_with_setta21/config.h
index ed08dc121cb..728b2a40d49 100644
--- a/keyboards/salicylic_acid3/naked60/keymaps/default_with_setta21/config.h
+++ b/keyboards/salicylic_acid3/naked60/keymaps/default_with_setta21/config.h
@@ -16,11 +16,5 @@
#pragma once
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
#define QUICK_TAP_TERM 0
#define TAPPING_TERM 180
diff --git a/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/config.h b/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/config.h
index ebc2b46717c..0b2c9ee938a 100644
--- a/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/config.h
+++ b/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/config.h
@@ -16,12 +16,6 @@
#pragma once
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
#define QUICK_TAP_TERM 0
#define TAPPING_TERM 180
diff --git a/keyboards/sofle/keymaps/rgb_default/config.h b/keyboards/sofle/keymaps/rgb_default/config.h
index 314322c9293..0d45b5ea272 100644
--- a/keyboards/sofle/keymaps/rgb_default/config.h
+++ b/keyboards/sofle/keymaps/rgb_default/config.h
@@ -22,11 +22,6 @@
///https://thomasbaart.nl/2018/12/01/reducing-firmware-size-in-qmk/
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
#define CUSTOM_FONT
#define CUSTOM_LAYER_READ //if you remove this it causes issues - needs better guarding
diff --git a/keyboards/supersplit/config.h b/keyboards/supersplit/config.h
deleted file mode 100644
index f3bd23764b1..00000000000
--- a/keyboards/supersplit/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2022 tarneo (tarneo@tarneo.fr)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-#pragma once
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-//
-
-#define MASTER_LEFT
diff --git a/keyboards/unikeyboard/diverge3/keymaps/iso_uk/config.h b/keyboards/unikeyboard/diverge3/keymaps/iso_uk/config.h
index 83f65979c7e..6309c84294f 100755
--- a/keyboards/unikeyboard/diverge3/keymaps/iso_uk/config.h
+++ b/keyboards/unikeyboard/diverge3/keymaps/iso_uk/config.h
@@ -18,7 +18,6 @@
// place overrides here
-#define MASTER_LEFT
#define PERMISSIVE_HOLD
#define TAPPING_TERM 150
diff --git a/keyboards/viktus/sp_mini/config.h b/keyboards/viktus/sp_mini/config.h
index 6c7ecf85151..2be5904550f 100644
--- a/keyboards/viktus/sp_mini/config.h
+++ b/keyboards/viktus/sp_mini/config.h
@@ -20,7 +20,6 @@ along with this program. If not, see .
/* Split Defines */
#define SPLIT_USB_DETECT
-#define MASTER_LEFT
#define USE_I2C
/*
diff --git a/keyboards/vitamins_included/keymaps/default/config.h b/keyboards/vitamins_included/keymaps/default/config.h
index 95dd8ec4643..8df0c312a44 100644
--- a/keyboards/vitamins_included/keymaps/default/config.h
+++ b/keyboards/vitamins_included/keymaps/default/config.h
@@ -28,12 +28,6 @@ along with this program. If not, see .
// Rev1: EE_HANDS
// Rev2: SPLIT_HAND_PIN B4
-// You can override the defaults (rev1 doesn't support SPLIT_HAND_PIN)
-//#define EE_HANDS
-//#define MASTER_LEFT
-//#define MASTER_RIGHT
-
-
#ifdef AUDIO_ENABLE
#define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
SONG(DVORAK_SOUND), \
diff --git a/keyboards/yosino58/keymaps/default/config.h b/keyboards/yosino58/keymaps/default/config.h
index e82254fff17..76ebf095abf 100644
--- a/keyboards/yosino58/keymaps/default/config.h
+++ b/keyboards/yosino58/keymaps/default/config.h
@@ -20,12 +20,6 @@ along with this program. If not, see .
#pragma once
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
#define QUICK_TAP_TERM 0
#define TAPPING_TERM 100
diff --git a/keyboards/zigotica/z34/config.h b/keyboards/zigotica/z34/config.h
index 10c442f2066..928524696a0 100644
--- a/keyboards/zigotica/z34/config.h
+++ b/keyboards/zigotica/z34/config.h
@@ -16,6 +16,4 @@ along with this program. If not, see .
#pragma once
-// EE_HANDS MASTER_RIGHT MASTER_LEFT
#define MASTER_RIGHT
-
diff --git a/keyboards/zigotica/z34/keymaps/default/config.h b/keyboards/zigotica/z34/keymaps/default/config.h
index 2bcd017d72d..928524696a0 100644
--- a/keyboards/zigotica/z34/keymaps/default/config.h
+++ b/keyboards/zigotica/z34/keymaps/default/config.h
@@ -16,6 +16,4 @@ along with this program. If not, see .
#pragma once
-
-// EE_HANDS MASTER_RIGHT MASTER_LEFT
#define MASTER_RIGHT