clean up generate-api errors

37 files changed, 18 insertions, 102 deletions

diff --git a/keyboards/40percentclub/foobar/info.json b/keyboards/40percentclub/foobar/info.json
index 6d722ae6e..c9bbda67c 100644
--- a/keyboards/40percentclub/foobar/info.json
+++ b/keyboards/40percentclub/foobar/info.json
@@ -6,8 +6,6 @@
     "height": 3,
     "layouts": {
         "LAYOUT_macro": {
-            "width": 5,
-            "height": 3,
             "key_count": 15,
             "layout": [
               {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0},
diff --git a/keyboards/40percentclub/tomato/info.json b/keyboards/40percentclub/tomato/info.json
index f01f5e7e0..b24f97bcd 100644
--- a/keyboards/40percentclub/tomato/info.json
+++ b/keyboards/40percentclub/tomato/info.json
@@ -2,7 +2,6 @@
   "keyboard_name": "Tomato",
   "url": "",
   "maintainer": "qmk",
-  "bootloader": "",
   "width": 10,
   "height": 3,
   "layouts": {
diff --git a/keyboards/4by3/info.json b/keyboards/4by3/info.json
index 9cc07a924..fb78f05d5 100644
--- a/keyboards/4by3/info.json
+++ b/keyboards/4by3/info.json
@@ -7,8 +7,6 @@
     "layouts": {
         "LAYOUT_horizontal": {
             "key_count": 12,
-            "width": 4,
-            "height": 3,
             "layout": [
                 { "x": 0, "y": 0 }, { "x": 1, "y": 0 }, { "x": 2, "y": 0 }, { "x": 3, "y": 0 },
                 { "x": 0, "y": 1 }, { "x": 1, "y": 1 }, { "x": 2, "y": 1 }, { "x": 3, "y": 1 },
@@ -17,8 +15,6 @@
         },
         "LAYOUT_vertical_right": {
             "key_count": 12,
-            "width": 3,
-            "height": 4,
             "layout": [
                 { "x": 0, "y": 0 }, { "x": 1, "y": 0 }, { "x": 2, "y": 0 },
                 { "x": 0, "y": 1 }, { "x": 1, "y": 1 }, { "x": 2, "y": 1 },
@@ -28,8 +24,6 @@
         },
         "LAYOUT_vertical_left": {
             "key_count": 12,
-            "width": 3,
-            "height": 4,
             "layout": [
                 { "x": 0, "y": 0 }, { "x": 1, "y": 0 }, { "x": 2, "y": 0 },
                 { "x": 0, "y": 1 }, { "x": 1, "y": 1 }, { "x": 2, "y": 1 },
diff --git a/keyboards/ai03/lunar/info.json b/keyboards/ai03/lunar/info.json
index e18a10bde..f3024be43 100644
--- a/keyboards/ai03/lunar/info.json
+++ b/keyboards/ai03/lunar/info.json
@@ -2,7 +2,6 @@
     "keyboard_name": "Lunar", 
     "url": "https://geekhack.org/index.php?topic=96112.0", 
     "maintainer": "ai03", 
-    "bootloader": "", 
     "width": 16, 
     "height": 5, 
     "layouts": {
@@ -81,4 +80,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/alf/dc60/info.json b/keyboards/alf/dc60/info.json
index 1c3ebf4f0..9482e0b40 100644
--- a/keyboards/alf/dc60/info.json
+++ b/keyboards/alf/dc60/info.json
@@ -1,8 +1,6 @@
 {
     "keyboard_name": "dc60", 
-    "url": "", 
     "maintainer": "qmk", 
-    "bootloader": "", 
     "width": 15, 
     "height": 5, 
     "layouts": {
@@ -10,4 +8,4 @@
             "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.75}, {"x":6.5, "y":4, "w":1.25}, {"x":7.75, "y":4, "w":2.25}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/alpha/info.json b/keyboards/alpha/info.json
index b08e6d9a4..0c03a51aa 100644
--- a/keyboards/alpha/info.json
+++ b/keyboards/alpha/info.json
@@ -1,8 +1,6 @@
 {
   "keyboard_name": "Alpha", 
-  "url": "", 
   "maintainer": "qmk", 
-  "bootloader": "", 
   "width": 10, 
   "height": 3, 
   "layouts": {
diff --git a/keyboards/amj40/info.json b/keyboards/amj40/info.json
index ddbd34a7c..1b25106e0 100644
--- a/keyboards/amj40/info.json
+++ b/keyboards/amj40/info.json
@@ -1,8 +1,6 @@
 {
   "keyboard_name": "AMJ40", 
-  "url": "", 
   "maintainer": "qmk", 
-  "bootloader": "", 
   "width": 12, 
   "height": 4, 
   "layouts": {
diff --git a/keyboards/atomic/info.json b/keyboards/atomic/info.json
index b07a07025..6e543b7b5 100644
--- a/keyboards/atomic/info.json
+++ b/keyboards/atomic/info.json
@@ -1,8 +1,6 @@
 {
   "keyboard_name": "Atomic", 
-  "url": "", 
   "maintainer": "qmk", 
-  "bootloader": "", 
   "width": 15, 
   "height": 5, 
   "layouts": {
diff --git a/keyboards/bpiphany/unloved_bastard/info.json b/keyboards/bpiphany/unloved_bastard/info.json
index b0e3346e0..ff8c52d9c 100644
--- a/keyboards/bpiphany/unloved_bastard/info.json
+++ b/keyboards/bpiphany/unloved_bastard/info.json
@@ -1,8 +1,6 @@
 {
   "keyboard_name": "unloved_bastard",
-  "url": "",
   "maintainer": "qmk",
-  "bootloader": "",
   "width": 18.25,
   "height": 6.5,
   "layouts": {
diff --git a/keyboards/chidori/info.json b/keyboards/chidori/info.json
index 8a24d1a92..0c892aa08 100644
--- a/keyboards/chidori/info.json
+++ b/keyboards/chidori/info.json
@@ -14,7 +14,6 @@
             ]
         },
         "LAYOUT_extended": {
-            "width": 20,
             "layout": [
                 {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":16, "y":0}, {"x":17, "y":0}, {"x":18, "y":0}, {"x":19, "y":0},
                 {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":16, "y":1}, {"x":17, "y":1}, {"x":18, "y":1}, {"x":19, "y":1},
diff --git a/keyboards/converter/adb_usb/info.json b/keyboards/converter/adb_usb/info.json
index e06f9c1ad..e00b3b05f 100644
--- a/keyboards/converter/adb_usb/info.json
+++ b/keyboards/converter/adb_usb/info.json
@@ -114,8 +114,6 @@
       ]
     },
     "LAYOUT_m0116_ansi": {
-      "width": 19.5,
-      "height": 6.25,
       "layout": [
         {"label":"Power", "x":5, "y":0, "w":2},
         {"label":"Esc", "x":0, "y":1.25},
diff --git a/keyboards/converter/hp_46010a/config.h b/keyboards/converter/hp_46010a/config.h
index b7297ab88..a1345c66d 100644
--- a/keyboards/converter/hp_46010a/config.h
+++ b/keyboards/converter/hp_46010a/config.h
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define VENDOR_ID         0xFEED
 #define PRODUCT_ID        0x6060
-#define DEVICE_VER        1
+#define DEVICE_VER        0x0001
 #define MANUFACTURER      QMK
 #define PRODUCT           46010A keyboard converter
 #define DESCRIPTION       46010A keyboard converter
diff --git a/keyboards/converter/ibm_5291/config.h b/keyboards/converter/ibm_5291/config.h
index 9701bdfe9..f4c41d070 100644
--- a/keyboards/converter/ibm_5291/config.h
+++ b/keyboards/converter/ibm_5291/config.h
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define VENDOR_ID           0xFEED
 #define PRODUCT_ID          0x6060
-#define DEVICE_VER          1
+#define DEVICE_VER          0x0001
 #define MANUFACTURER        QMK
 #define PRODUCT             5291 keyboard converter
 #define DESCRIPTION         5291 keyboard converter
diff --git a/keyboards/doro67/regular/info.json b/keyboards/doro67/regular/info.json
index ebdfa4db6..e5ea4c16a 100644
--- a/keyboards/doro67/regular/info.json
+++ b/keyboards/doro67/regular/info.json
@@ -1,6 +1,4 @@
 {
-    "keyboard_name": "",
-    "url": "",
     "maintainer": "qmk",
     "width": 16,
     "height": 5,
@@ -79,4 +77,4 @@
       }
     }
   }
-  
\ No newline at end of file
+  
diff --git a/keyboards/ep/40/info.json b/keyboards/ep/40/info.json
index 1c57ac674..51c000e74 100644
--- a/keyboards/ep/40/info.json
+++ b/keyboards/ep/40/info.json
@@ -1,6 +1,5 @@
 {
     "keyboard_name":"ep40",
-    "url":null,
     "maintainer":"e11i0t23",
     "width":12,
     "hight":4,
diff --git a/keyboards/ergodox_stm32/config.h b/keyboards/ergodox_stm32/config.h
index e1b3d7b14..e0255875a 100644
--- a/keyboards/ergodox_stm32/config.h
+++ b/keyboards/ergodox_stm32/config.h
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define VENDOR_ID 0xFEED
 #define PRODUCT_ID 0x1308
-#define DEVICE_VER 0x101
+#define DEVICE_VER 0x0101
 #define MANUFACTURER ErgoDox
 #define PRODUCT ErgoDox STM
 #define DESCRIPTION ErgoDox STM32 Keyboard
diff --git a/keyboards/ergotravel/info.json b/keyboards/ergotravel/info.json
index c0e5cc636..5cd19ced5 100644
--- a/keyboards/ergotravel/info.json
+++ b/keyboards/ergotravel/info.json
@@ -4,6 +4,7 @@
   "identifier": "0x1256",
   "url": "https://github.com/jpconstantineau/ErgoTravel",
   "maintainer": "qmk",
+  "bootloader": "caterina",
   "processor": "atmega32u4",
   "width": 16,
   "height": 5,
diff --git a/keyboards/ergotravel/rules.mk b/keyboards/ergotravel/rules.mk
index 5fd2a23da..ab0ae83c1 100644
--- a/keyboards/ergotravel/rules.mk
+++ b/keyboards/ergotravel/rules.mk
@@ -1,16 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-#   Teensy       halfkay
-#   Pro Micro    caterina
-#   Atmel DFU    atmel-dfu
-#   LUFA DFU     lufa-dfu
-#   QMK DFU      qmk-dfu
-#   ATmega32A    bootloadHID
-#   ATmega328P   USBasp
-BOOTLOADER = caterina
-
 # 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
@@ -32,4 +19,4 @@ SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 
 SPLIT_KEYBOARD = yes
 
-DEFAULT_FOLDER = ergotravel/rev1
\ No newline at end of file
+DEFAULT_FOLDER = ergotravel/rev1
diff --git a/keyboards/exclusive/e6v2/le_bmc/info.json b/keyboards/exclusive/e6v2/le_bmc/info.json
index 413db8abc..4604f5756 100644
--- a/keyboards/exclusive/e6v2/le_bmc/info.json
+++ b/keyboards/exclusive/e6v2/le_bmc/info.json
@@ -1,6 +1,4 @@
 {
-    "keyboard_name": "", 
-    "url": "", 
     "maintainer": "qmk", 
     "width": 15, 
     "height": 5, 
diff --git a/keyboards/exclusive/e6v2/oe_bmc/info.json b/keyboards/exclusive/e6v2/oe_bmc/info.json
index 413db8abc..4604f5756 100644
--- a/keyboards/exclusive/e6v2/oe_bmc/info.json
+++ b/keyboards/exclusive/e6v2/oe_bmc/info.json
@@ -1,6 +1,4 @@
 {
-    "keyboard_name": "", 
-    "url": "", 
     "maintainer": "qmk", 
     "width": 15, 
     "height": 5, 
diff --git a/keyboards/flehrad/bigswitch/info.json b/keyboards/flehrad/bigswitch/info.json
index 8d3d746f5..37095ade3 100644
--- a/keyboards/flehrad/bigswitch/info.json
+++ b/keyboards/flehrad/bigswitch/info.json
@@ -1,8 +1,6 @@
 {
     "keyboard_name": "Bigswitch PCB",
-    "url": "",
     "maintainer": "qmk",
-    "bootloader": "",
     "width": 4,
     "height": 4,
     "layouts": {
diff --git a/keyboards/flehrad/downbubble/info.json b/keyboards/flehrad/downbubble/info.json
index c5cd97de5..a7e68e7f6 100644
--- a/keyboards/flehrad/downbubble/info.json
+++ b/keyboards/flehrad/downbubble/info.json
@@ -1,6 +1,5 @@
 {
   "keyboard_name": "downbubble",
-  "url": "",
   "maintainer": "flehrad",
   "width": 22.75,
   "height": 6,
@@ -429,7 +428,7 @@
         {"label":"K53", "x":3.75, "y":5, "w":1.25},
         {"label":"K54", "x":5, "y":5, "w":2.25},
         {"label":"K56", "x":7.75, "y":5},
-        {"Label":"K57", "x":8.75, "y":5},
+        {"label":"K57", "x":8.75, "y":5},
         {"label":"K58", "x":9.75, "y":5},
         {"label":"K59", "x":10.75, "y":5},
         {"label":"K510", "x":13, "y":5, "w":2},
diff --git a/keyboards/fleuron/info.json b/keyboards/fleuron/info.json
index 2f357d3bf..78fe64e3a 100644
--- a/keyboards/fleuron/info.json
+++ b/keyboards/fleuron/info.json
@@ -1,8 +1,6 @@
 {
     "keyboard_name": "Fleuron v1.0", 
-    "url": "", 
     "maintainer": "qmk", 
-    "bootloader": "", 
     "width": 16, 
     "height": 6, 
     "layouts": {
@@ -106,4 +104,4 @@
                 {"label":"Enter", "x":15, "y":5}]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/handwired/frenchdev/info.json b/keyboards/handwired/frenchdev/info.json
index 28f09a3aa..2477302be 100644
--- a/keyboards/handwired/frenchdev/info.json
+++ b/keyboards/handwired/frenchdev/info.json
@@ -1,8 +1,5 @@
 {
-  "keyboard_name": "",
-  "url": "",
   "maintainer": "qmk",
-  "bootloader": "",
   "width": 20,
   "height": 9.5,
   "layouts": {
diff --git a/keyboards/handwired/ibm122m/info.json b/keyboards/handwired/ibm122m/info.json
index b9ce9e8f8..46db3c0d7 100644
--- a/keyboards/handwired/ibm122m/info.json
+++ b/keyboards/handwired/ibm122m/info.json
@@ -1,8 +1,6 @@
 {
   "keyboard_name": "IBM Model M 122-key",
-  "url": "",
   "maintainer": "qmk",
-  "bootloader": "",
   "width": 24.75,
   "height": 8,
   "layouts": {
diff --git a/keyboards/keebio/nyquist/info.json b/keyboards/keebio/nyquist/info.json
index 6e44d98a1..d948baaa1 100644
--- a/keyboards/keebio/nyquist/info.json
+++ b/keyboards/keebio/nyquist/info.json
@@ -1,6 +1,5 @@
 {
   "keyboard_name": "Nyquist",
-  "url": "",
   "maintainer": "qmk",
   "width": 13,
   "height": 5,
@@ -12,7 +11,6 @@
       "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}]
     },
     "LAYOUT_ortho_4x12": {
-      "height": 4,
       "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}]
     }
   }
diff --git a/keyboards/kmac/info.json b/keyboards/kmac/info.json
index 2fe0ef269..6a98fab0a 100644
--- a/keyboards/kmac/info.json
+++ b/keyboards/kmac/info.json
@@ -1,8 +1,6 @@
 {
   "keyboard_name": "kmac",
-  "url": "",
   "maintainer": "qmk",
-  "bootloader": "",
   "width": 18.25,
   "height": 6.5,
   "layouts": {
diff --git a/keyboards/matrix/noah/info.json b/keyboards/matrix/noah/info.json
index 69fc0fccf..bb06a16d7 100644
--- a/keyboards/matrix/noah/info.json
+++ b/keyboards/matrix/noah/info.json
@@ -84,7 +84,7 @@
           "y": 0
         },
         {
-          "Label": "Ins",
+          "label": "Ins",
           "x": 15,
           "y": 0
         },
@@ -440,7 +440,7 @@
           "y": 0
         },
         {
-          "Label": "Ins",
+          "label": "Ins",
           "x": 15,
           "y": 0
         },
@@ -807,7 +807,7 @@
           "y": 0
         },
         {
-          "Label": "Ins",
+          "label": "Ins",
           "x": 15,
           "y": 0
         },
diff --git a/keyboards/mechmini/v2/info.json b/keyboards/mechmini/v2/info.json
index c69771c1f..f24b8648c 100644
--- a/keyboards/mechmini/v2/info.json
+++ b/keyboards/mechmini/v2/info.json
@@ -2,7 +2,6 @@
   "keyboard_name": "MechMini 2",
   "url": "https://mechkeys.ca/pages/mechmini-2-guide",
   "maintainer": "qmk",
-  "bootloader": "",
   "width": 12,
   "height": 4,
   "layouts": {
diff --git a/keyboards/pabile/p40_ortho/info.json b/keyboards/pabile/p40_ortho/info.json
index a4d757be9..fb64234e5 100644
--- a/keyboards/pabile/p40_ortho/info.json
+++ b/keyboards/pabile/p40_ortho/info.json
@@ -1,6 +1,4 @@
 {
-    "keyboard_name": "", 
-    "url": "", 
     "maintainer": "qmk", 
     "width": 10, 
     "height": 4, 
diff --git a/keyboards/pearl/info.json b/keyboards/pearl/info.json
index 5bc4e0494..c86fcb9df 100644
--- a/keyboards/pearl/info.json
+++ b/keyboards/pearl/info.json
@@ -1,8 +1,6 @@
 {
   "keyboard_name": "Pearl",
-  "url": "",
   "maintainer": "qmk",
-  "bootloader": "",
   "width": 13,
   "height": 4,
   "layouts": {
diff --git a/keyboards/qwertyydox/info.json b/keyboards/qwertyydox/info.json
index 8616f274e..2a7efc199 100644
--- a/keyboards/qwertyydox/info.json
+++ b/keyboards/qwertyydox/info.json
@@ -4,6 +4,7 @@
   "identifier": "0x1256",
   "url": "",
   "maintainer": "qmk",
+  "bootloader": "caterina",
   "processor": "atmega32u4",
   "width": 16.25,
   "height": 5,
diff --git a/keyboards/qwertyydox/rules.mk b/keyboards/qwertyydox/rules.mk
index bad5a268a..3e66c233a 100644
--- a/keyboards/qwertyydox/rules.mk
+++ b/keyboards/qwertyydox/rules.mk
@@ -1,16 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-#   Teensy       halfkay
-#   Pro Micro    caterina
-#   Atmel DFU    atmel-dfu
-#   LUFA DFU     lufa-dfu
-#   QMK DFU      qmk-dfu
-#   ATmega32A    bootloadHID
-#   ATmega328P   USBasp
-BOOTLOADER = caterina
-
 # 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
diff --git a/keyboards/redscarf_i/info.json b/keyboards/redscarf_i/info.json
index a2ea71f3a..3bf1ae693 100644
--- a/keyboards/redscarf_i/info.json
+++ b/keyboards/redscarf_i/info.json
@@ -5,7 +5,6 @@
     "width": 4,
     "layouts": {
         "LAYOUT_ortho_5x4": {
-            "height": 5,
             "key_count": 20,
             "layout": [
                 {"x":0, "y":0},
@@ -31,7 +30,6 @@
             ]
         },
         "LAYOUT_ortho_6x4": {
-            "height": 6,
             "key_count": 24,
             "layout": [
                 {"x":0, "y":0},
@@ -61,7 +59,6 @@
             ]
         },
         "LAYOUT_numpad_5x4": {
-            "height": 5,
             "key_count": 17,
             "layout": [
                 {"x":0, "y":0},
@@ -84,7 +81,6 @@
             ]
         },
         "LAYOUT_numpad_6x4": {
-            "height": 6,
             "key_count": 21,
             "layout": [
                 {"x":0, "y":0},
diff --git a/keyboards/waldo/info.json b/keyboards/waldo/info.json
index 5cdc12d5e..11fa5182e 100644
--- a/keyboards/waldo/info.json
+++ b/keyboards/waldo/info.json
@@ -1,6 +1,4 @@
 {
-    "keyboard_name": "", 
-    "url": "", 
     "maintainer": "qmk", 
     "width": 15, 
     "height": 5, 
@@ -21,4 +19,4 @@
             "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":13.75, "y":4, "w":1.25}]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/xd004/info.json b/keyboards/xd004/info.json
index 72c15da7f..6f7082a14 100644
--- a/keyboards/xd004/info.json
+++ b/keyboards/xd004/info.json
@@ -1,6 +1,6 @@
 {
     "keyboard_name": "XD004", 
-    "maintainer": "", 
+    "maintainer": "qmk", 
     "width": 4, 
     "height": 1, 
     "layouts": {
diff --git a/keyboards/ymdk_np21/info.json b/keyboards/ymdk_np21/info.json
index bc5b101c9..845c0bb81 100644
--- a/keyboards/ymdk_np21/info.json
+++ b/keyboards/ymdk_np21/info.json
@@ -1,11 +1,10 @@
 {
     "keyboard_name": "YMDK NP21",
-    "url": "",
     "maintainer": "qmk",
+    "width": 4,
+    "height": 6.25,
     "layouts": {
         "LAYOUT_ortho_6x4": {
-            "width": 4,
-            "height": 6.25,
             "layout": [
                 {"x": 0, "y": 0},
                 {"x": 1, "y": 0},
@@ -39,8 +38,6 @@
             ]
         },
         "LAYOUT_ortho_4x6": {
-            "width": 6.25,
-            "height": 4,
             "layout": [
                 {"x": 0, "y": 0},
                 {"x": 1, "y": 0},
@@ -72,8 +69,6 @@
             ]
         },
         "LAYOUT_numpad_6x4": {
-            "width": 4,
-            "height": 6.25,
             "layout": [
                 {"x": 0, "y": 0},
                 {"x": 1, "y": 0},