6 files changed, 8 insertions, 40 deletions
diff --git a/keyboards/delikeeb/waaffle/rev3/config.h b/keyboards/delikeeb/waaffle/rev3/config.h
index 739cda1145..db26f1d236 100644
--- a/keyboards/delikeeb/waaffle/rev3/config.h
+++ b/keyboards/delikeeb/waaffle/rev3/config.h
@@ -37,10 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-//#define BACKLIGHT_PIN B7
-//#define BACKLIGHT_LEVELS 3
-//#define BACKLIGHT_BREATHING
-
 /*rotary encoder setting*/
 #define ENCODERS_PAD_A { B7, F1 }
 #define ENCODERS_PAD_B { D5, F0 }
@@ -70,9 +66,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
 #endif
 
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -84,27 +77,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define GRAVE_ESC_CTRL_OVERRIDE
 
 /*
- * Force NKRO
- *
- * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
- * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
- * makefile for this to work.)
- *
- * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
- * until the next keyboard reset.
- *
- * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
- * fully operational during normal computer usage.
- *
- * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
- * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
- * bootmagic, NKRO mode will always be enabled until it is toggled again during a
- * power-up.
- *
- */
-//#define FORCE_NKRO
-
-/*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
  */
diff --git a/keyboards/delikeeb/waaffle/rev3/elite_c/info.json b/keyboards/delikeeb/waaffle/rev3/elite_c/info.json
new file mode 100644
index 0000000000..042c41f34d
--- /dev/null
+++ b/keyboards/delikeeb/waaffle/rev3/elite_c/info.json
@@ -0,0 +1,4 @@
+{
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu"
+}
diff --git a/keyboards/delikeeb/waaffle/rev3/elite_c/rules.mk b/keyboards/delikeeb/waaffle/rev3/elite_c/rules.mk
index 8b5026cb03..307296b1ba 100644
--- a/keyboards/delikeeb/waaffle/rev3/elite_c/rules.mk
+++ b/keyboards/delikeeb/waaffle/rev3/elite_c/rules.mk
@@ -1,6 +1,3 @@
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # supported on Elite-C controllers
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 ENCODER_ENABLE = yes        # Enable Rotary Encoder
diff --git a/keyboards/delikeeb/waaffle/rev3/pro_micro/info.json b/keyboards/delikeeb/waaffle/rev3/pro_micro/info.json
new file mode 100644
index 0000000000..4369a04103
--- /dev/null
+++ b/keyboards/delikeeb/waaffle/rev3/pro_micro/info.json
@@ -0,0 +1,4 @@
+{
+    "processor": "atmega32u4",
+    "bootloader": "caterina"
+}
diff --git a/keyboards/delikeeb/waaffle/rev3/pro_micro/rules.mk b/keyboards/delikeeb/waaffle/rev3/pro_micro/rules.mk
index bdc4842c57..17c9907319 100644
--- a/keyboards/delikeeb/waaffle/rev3/pro_micro/rules.mk
+++ b/keyboards/delikeeb/waaffle/rev3/pro_micro/rules.mk
@@ -1,6 +1,3 @@
-# Bootloader selection
-BOOTLOADER = caterina
-
 # not supported on Pro Micro controllers
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 ENCODER_ENABLE = no         # Enable Rotary Encoder
diff --git a/keyboards/delikeeb/waaffle/rev3/rules.mk b/keyboards/delikeeb/waaffle/rev3/rules.mk
index 7467b612c1..f00d165fbf 100644
--- a/keyboards/delikeeb/waaffle/rev3/rules.mk
+++ b/keyboards/delikeeb/waaffle/rev3/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #