diff --git a/keyboards/barleycorn_smd/config.h b/keyboards/barleycorn_smd/config.h
index 2d53b280f71..167c3b5c87c 100644
--- a/keyboards/barleycorn_smd/config.h
+++ b/keyboards/barleycorn_smd/config.h
@@ -54,9 +54,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-#define USB_MAX_POWER_CONSUMPTION 400
-
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/barleycorn_smd/info.json b/keyboards/barleycorn_smd/info.json
index b37d4003f7d..0f759e5f4d5 100644
--- a/keyboards/barleycorn_smd/info.json
+++ b/keyboards/barleycorn_smd/info.json
@@ -5,7 +5,8 @@
     "usb": {
         "vid": "0x7033",
         "pid": "0x4749",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "max_power": 400
     },
     "indicators": {
         "caps_lock": "B2",
diff --git a/keyboards/basketweave/config.h b/keyboards/basketweave/config.h
index 87864e2bf4b..36054e7bb6f 100644
--- a/keyboards/basketweave/config.h
+++ b/keyboards/basketweave/config.h
@@ -16,8 +16,6 @@
 
 #pragma once
 
-#define USB_MAX_POWER_CONSUMPTION 100
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/basketweave/info.json b/keyboards/basketweave/info.json
index 825364424b9..8f9be9b4062 100644
--- a/keyboards/basketweave/info.json
+++ b/keyboards/basketweave/info.json
@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0x6B62",
         "pid": "0x8989",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "max_power": 100
     },
     "matrix_pins": {
         "cols": ["A0", "A1", "A2", "A3", "A4", "B0", "B1", "B2", "D5", "D6", "C5", "C4", "C3", "C2", "C1"],
diff --git a/keyboards/chavdai40/rev1/config.h b/keyboards/chavdai40/rev1/config.h
index 277219f16d0..8f5f5496a26 100644
--- a/keyboards/chavdai40/rev1/config.h
+++ b/keyboards/chavdai40/rev1/config.h
@@ -19,6 +19,3 @@
 
 
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP FALSE
-
-/* usb power settings */
-#define USB_MAX_POWER_CONSUMPTION 100
diff --git a/keyboards/chavdai40/rev1/info.json b/keyboards/chavdai40/rev1/info.json
index 511dff4ad1e..67705c25bb5 100644
--- a/keyboards/chavdai40/rev1/info.json
+++ b/keyboards/chavdai40/rev1/info.json
@@ -1,7 +1,8 @@
 {
     "keyboard_name": "Chavdai40",
     "usb": {
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "max_power": 100
     },
     "matrix_pins": {
         "cols": ["B8", "B4", "B3", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1"],
diff --git a/keyboards/chavdai40/rev2/config.h b/keyboards/chavdai40/rev2/config.h
index 277219f16d0..8f5f5496a26 100644
--- a/keyboards/chavdai40/rev2/config.h
+++ b/keyboards/chavdai40/rev2/config.h
@@ -19,6 +19,3 @@
 
 
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP FALSE
-
-/* usb power settings */
-#define USB_MAX_POWER_CONSUMPTION 100
diff --git a/keyboards/chavdai40/rev2/info.json b/keyboards/chavdai40/rev2/info.json
index 97cd474fa01..acefcabdc70 100644
--- a/keyboards/chavdai40/rev2/info.json
+++ b/keyboards/chavdai40/rev2/info.json
@@ -1,7 +1,8 @@
 {
     "keyboard_name": "Chavdai40 rev2",
     "usb": {
-        "device_version": "0.0.2"
+        "device_version": "0.0.2",
+        "max_power": 100
     },
     "matrix_pins": {
         "cols": ["B7", "B4", "B3", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1"],
diff --git a/keyboards/coseyfannitutti/discipad/config.h b/keyboards/coseyfannitutti/discipad/config.h
index edcaedfb794..31a3fe8cb01 100644
--- a/keyboards/coseyfannitutti/discipad/config.h
+++ b/keyboards/coseyfannitutti/discipad/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define USB_MAX_POWER_CONSUMPTION 100
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/coseyfannitutti/discipad/info.json b/keyboards/coseyfannitutti/discipad/info.json
index d7291698b31..9ce76c840a1 100644
--- a/keyboards/coseyfannitutti/discipad/info.json
+++ b/keyboards/coseyfannitutti/discipad/info.json
@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0x6B62",
         "pid": "0x1769",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "max_power": 100
     },
     "matrix_pins": {
         "cols": ["C0", "C1", "C2", "C3"],
diff --git a/keyboards/coseyfannitutti/discipline/config.h b/keyboards/coseyfannitutti/discipline/config.h
index d43ae80cb95..0acee7345a5 100644
--- a/keyboards/coseyfannitutti/discipline/config.h
+++ b/keyboards/coseyfannitutti/discipline/config.h
@@ -16,8 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define USB_MAX_POWER_CONSUMPTION 100
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/coseyfannitutti/discipline/info.json b/keyboards/coseyfannitutti/discipline/info.json
index e699bc0a465..f28e0cd4d80 100644
--- a/keyboards/coseyfannitutti/discipline/info.json
+++ b/keyboards/coseyfannitutti/discipline/info.json
@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0x6B62",
         "pid": "0x6869",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "max_power": 100
     },
     "matrix_pins": {
         "cols": ["A2", "B3", "A3", "B4", "A4", "D5", "D6", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "D7"],
diff --git a/keyboards/crimsonkeyboards/resume1800/config.h b/keyboards/crimsonkeyboards/resume1800/config.h
index 7c66ab16c64..bdc484a3b31 100644
--- a/keyboards/crimsonkeyboards/resume1800/config.h
+++ b/keyboards/crimsonkeyboards/resume1800/config.h
@@ -16,8 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define USB_MAX_POWER_CONSUMPTION 100
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/crimsonkeyboards/resume1800/info.json b/keyboards/crimsonkeyboards/resume1800/info.json
index b8cd36dbed1..664a69e22ec 100644
--- a/keyboards/crimsonkeyboards/resume1800/info.json
+++ b/keyboards/crimsonkeyboards/resume1800/info.json
@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0xFEED",
         "pid": "0xC18B",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "max_power": 100
     },
     "matrix_pins": {
         "cols": ["A2", "B3", "A3", "B4", "A4", "D1", "D5", "D6", "A6", "A7", "C7", "C6", "C5", "C4", "D7", "C3", "C2", "C1", "C0", "D0"],
diff --git a/keyboards/dm9records/plaid/config.h b/keyboards/dm9records/plaid/config.h
index b4b541dbfc6..71400c3cf88 100644
--- a/keyboards/dm9records/plaid/config.h
+++ b/keyboards/dm9records/plaid/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define USB_MAX_POWER_CONSUMPTION 100
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/dm9records/plaid/info.json b/keyboards/dm9records/plaid/info.json
index cedf1fae5dc..a18de0accdb 100644
--- a/keyboards/dm9records/plaid/info.json
+++ b/keyboards/dm9records/plaid/info.json
@@ -6,7 +6,8 @@
   "usb": {
     "vid": "0x16C0",
     "pid": "0x27DB",
-    "device_version": "0.0.2"
+    "device_version": "0.0.2",
+    "max_power": 100
   },
   "matrix_pins": {
     "cols": ["B0", "D7", "D6", "D5", "B2", "B1", "C0", "C1", "C2", "C3", "D1", "D0"],
diff --git a/keyboards/ericrlau/numdiscipline/rev1/config.h b/keyboards/ericrlau/numdiscipline/rev1/config.h
index d5c2b1438e0..055e8afe380 100644
--- a/keyboards/ericrlau/numdiscipline/rev1/config.h
+++ b/keyboards/ericrlau/numdiscipline/rev1/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define USB_MAX_POWER_CONSUMPTION 100
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/ericrlau/numdiscipline/rev1/info.json b/keyboards/ericrlau/numdiscipline/rev1/info.json
index dd5a8a7a161..efcbcf2ab04 100644
--- a/keyboards/ericrlau/numdiscipline/rev1/info.json
+++ b/keyboards/ericrlau/numdiscipline/rev1/info.json
@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0x454C",
         "pid": "0x0001",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "max_power": 100
     },
     "matrix_pins": {
         "cols": ["A2", "B3", "A3", "B4", "A4", "D5", "D6", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "D7", "A5", "A6", "A7"],
diff --git a/keyboards/gboards/ergotaco/config.h b/keyboards/gboards/ergotaco/config.h
index ba0078e71bb..456eb3f9d91 100644
--- a/keyboards/gboards/ergotaco/config.h
+++ b/keyboards/gboards/ergotaco/config.h
@@ -43,5 +43,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* key combination for command */
 #define IS_COMMAND() (get_mods() == MOD_MASK_CTRL || get_mods() == MOD_MASK_SHIFT)
-
-#define USB_MAX_POWER_CONSUMPTION 500
diff --git a/keyboards/gboards/georgi/config.h b/keyboards/gboards/georgi/config.h
index 99bdd06bb5c..db2ff42a1e8 100644
--- a/keyboards/gboards/georgi/config.h
+++ b/keyboards/gboards/georgi/config.h
@@ -51,5 +51,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \
     get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \
 )
-
-#define USB_MAX_POWER_CONSUMPTION 500
diff --git a/keyboards/gboards/gergo/config.h b/keyboards/gboards/gergo/config.h
index 37d4fe84999..dbff6ccf6f1 100644
--- a/keyboards/gboards/gergo/config.h
+++ b/keyboards/gboards/gergo/config.h
@@ -55,5 +55,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \
     get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \
 )
-
-#define USB_MAX_POWER_CONSUMPTION 500
diff --git a/keyboards/handwired/dactyl/config.h b/keyboards/handwired/dactyl/config.h
index 0b98f64a4f6..f37a8f2722c 100644
--- a/keyboards/handwired/dactyl/config.h
+++ b/keyboards/handwired/dactyl/config.h
@@ -49,5 +49,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* fix space cadet rollover issue */
 #define DISABLE_SPACE_CADET_ROLLOVER
-
-#define USB_MAX_POWER_CONSUMPTION 500
diff --git a/keyboards/handwired/dc/mc/001/config.h b/keyboards/handwired/dc/mc/001/config.h
index 4e9dfdea8cc..533f50e0186 100644
--- a/keyboards/handwired/dc/mc/001/config.h
+++ b/keyboards/handwired/dc/mc/001/config.h
@@ -32,5 +32,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define NO_ACTION_LAYER
 #define NO_ACTION_TAPPING
 #define NO_ACTION_ONESHOT
-
-#define USB_MAX_POWER_CONSUMPTION 100
diff --git a/keyboards/handwired/dc/mc/001/info.json b/keyboards/handwired/dc/mc/001/info.json
index 852915569ed..404cf2e45dc 100644
--- a/keyboards/handwired/dc/mc/001/info.json
+++ b/keyboards/handwired/dc/mc/001/info.json
@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0x4443",
         "pid": "0x4D43",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "max_power": 100
     },
     "encoder": {
         "rotary": [
diff --git a/keyboards/handwired/frenchdev/config.h b/keyboards/handwired/frenchdev/config.h
index fc5d819060c..9cb309c78ff 100644
--- a/keyboards/handwired/frenchdev/config.h
+++ b/keyboards/handwired/frenchdev/config.h
@@ -25,8 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LED_BRIGHTNESS_LO       15
 #define LED_BRIGHTNESS_HI       255
 
-#define USB_MAX_POWER_CONSUMPTION 500
-
 #define MOUSEKEY_INTERVAL       20
 #define MOUSEKEY_DELAY          0
 #define MOUSEKEY_TIME_TO_MAX    5
diff --git a/keyboards/handwired/hnah40/config.h b/keyboards/handwired/hnah40/config.h
index 3ebccf9ad2d..611a6960cb5 100644
--- a/keyboards/handwired/hnah40/config.h
+++ b/keyboards/handwired/hnah40/config.h
@@ -21,8 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define USB_MAX_POWER_CONSUMPTION 100
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/handwired/hnah40/info.json b/keyboards/handwired/hnah40/info.json
index a4ed0756e7a..728d6dbc59d 100644
--- a/keyboards/handwired/hnah40/info.json
+++ b/keyboards/handwired/hnah40/info.json
@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0xFEED",
         "pid": "0x0000",
-        "device_version": "0.0.2"
+        "device_version": "0.0.2",
+        "max_power": 100
     },
     "matrix_pins": {
         "cols": ["B0", "D7", "D6", "D5", "B2", "B1", "C0", "C1", "C2", "C3", "D1"],
diff --git a/keyboards/handwired/lovelive9/config.h b/keyboards/handwired/lovelive9/config.h
index e6499e9111a..092e83d9d55 100644
--- a/keyboards/handwired/lovelive9/config.h
+++ b/keyboards/handwired/lovelive9/config.h
@@ -19,6 +19,5 @@
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
 #define RGBLIGHT_VAL_STEP 17
-#define USB_MAX_POWER_CONSUMPTION 400
 
 #define TAPPING_TERM 200
diff --git a/keyboards/handwired/lovelive9/info.json b/keyboards/handwired/lovelive9/info.json
index 25dc85704d0..4000b543c31 100644
--- a/keyboards/handwired/lovelive9/info.json
+++ b/keyboards/handwired/lovelive9/info.json
@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0xFEED",
         "pid": "0x0007",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "max_power": 400
     },
     "matrix_pins": {
         "cols": ["B4", "B6", "B2", "D7", "B1", "F7", "F6", "F5", "F4"],
diff --git a/keyboards/hotdox/config.h b/keyboards/hotdox/config.h
index 56eda36984c..4e801399da2 100644
--- a/keyboards/hotdox/config.h
+++ b/keyboards/hotdox/config.h
@@ -34,8 +34,6 @@
 /* fix space cadet rollover issue */
 #define DISABLE_SPACE_CADET_ROLLOVER
 
-#define USB_MAX_POWER_CONSUMPTION 500
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/jkdlab/binary_monkey/config.h b/keyboards/jkdlab/binary_monkey/config.h
deleted file mode 100644
index 3b83277d42e..00000000000
--- a/keyboards/jkdlab/binary_monkey/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2021 JKDLAB. <jkdlab.co@gmail.com>
- * Copyright 2021 Jaehee <ljh34210329@gmail.com>
- * 
- * 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 3 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 https://www.gnu.org/licenses/.
- */
- 
-#pragma once
-
-#define USB_MAX_POWER_CONSUMPTION 100
diff --git a/keyboards/jkdlab/binary_monkey/info.json b/keyboards/jkdlab/binary_monkey/info.json
index 43ba1468541..50b92ff899b 100644
--- a/keyboards/jkdlab/binary_monkey/info.json
+++ b/keyboards/jkdlab/binary_monkey/info.json
@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0x4934",
         "pid": "0x0101",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "max_power": 100
     },
     "matrix_pins": {
         "cols": ["D1", "D2", "D3"],
diff --git a/keyboards/kagizaraya/chidori/config.h b/keyboards/kagizaraya/chidori/config.h
index 51f8958e20f..eb719e95049 100644
--- a/keyboards/kagizaraya/chidori/config.h
+++ b/keyboards/kagizaraya/chidori/config.h
@@ -48,7 +48,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_ONESHOT
 
 /* USB config */
-#define USB_MAX_POWER_CONSUMPTION 100
 #define USB_COUNT_SOF 0
 #define USB_INTR_CFG_SET (1 << ISC01)
 #define USB_INTR_ENABLE_BIT INT0
diff --git a/keyboards/kagizaraya/chidori/info.json b/keyboards/kagizaraya/chidori/info.json
index 16cd17f9422..6603f54b036 100644
--- a/keyboards/kagizaraya/chidori/info.json
+++ b/keyboards/kagizaraya/chidori/info.json
@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0xFEED",
         "pid": "0x3942",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "max_power": 100
     },
     "processor": "atmega328p",
     "bootloader": "usbasploader",
diff --git a/keyboards/keycapsss/plaid_pad/config.h b/keyboards/keycapsss/plaid_pad/config.h
index 0ac7d2ee62e..984323f63c9 100644
--- a/keyboards/keycapsss/plaid_pad/config.h
+++ b/keyboards/keycapsss/plaid_pad/config.h
@@ -16,7 +16,5 @@
 
 #pragma once
 
-#define USB_MAX_POWER_CONSUMPTION 100
-
 // Fix for volume controll with encoder (steadily in/decrease)
 #define TAP_CODE_DELAY 60
diff --git a/keyboards/keycapsss/plaid_pad/info.json b/keyboards/keycapsss/plaid_pad/info.json
index 6ff2d2cea26..9fe02448d02 100644
--- a/keyboards/keycapsss/plaid_pad/info.json
+++ b/keyboards/keycapsss/plaid_pad/info.json
@@ -4,7 +4,8 @@
     "maintainer": "BenRoe",
     "usb": {
         "vid": "0x7983",
-        "pid": "0x5050"
+        "pid": "0x5050",
+        "max_power": 100
     },
     "matrix_pins": {
         "cols": ["B0", "D7", "D6", "D5"],
diff --git a/keyboards/kinesis/kint2pp/config.h b/keyboards/kinesis/kint2pp/config.h
deleted file mode 100644
index b81985f1ef1..00000000000
--- a/keyboards/kinesis/kint2pp/config.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-// The Teensy 2++ consumes about 60 mA of current at its full speed of 16 MHz as
-// per https://www.pjrc.com/teensy/low_power.html
-#define USB_MAX_POWER_CONSUMPTION 100
diff --git a/keyboards/kinesis/kint2pp/info.json b/keyboards/kinesis/kint2pp/info.json
index b2ddfb80b01..74d96d59e04 100644
--- a/keyboards/kinesis/kint2pp/info.json
+++ b/keyboards/kinesis/kint2pp/info.json
@@ -4,7 +4,8 @@
     "usb": {
         "vid": "0xFEED",
         "pid": "0x6060",
-        "device_version": "0.0.2"
+        "device_version": "0.0.2",
+        "max_power": 100
     },
     "matrix_pins": {
         "cols": ["E7", "F0", "F7", "B1", "B3", "B0", "D5"],
diff --git a/keyboards/kinesis/kint36/config.h b/keyboards/kinesis/kint36/config.h
index 8b291df88eb..94e523e9ef2 100644
--- a/keyboards/kinesis/kint36/config.h
+++ b/keyboards/kinesis/kint36/config.h
@@ -16,8 +16,4 @@
 
 #pragma once
 
-// The Teensy 3.6 consumes about 80 mA of current at its full speed of 180 MHz:
-// https://forum.pjrc.com/threads/47256-What-is-the-power-consumption-of-the-Teensy-3-6
-#define USB_MAX_POWER_CONSUMPTION 100
-
 #define EEPROM_SIZE 4096
diff --git a/keyboards/kinesis/kint36/info.json b/keyboards/kinesis/kint36/info.json
index 2d71fc0eb3c..815b6cb8719 100644
--- a/keyboards/kinesis/kint36/info.json
+++ b/keyboards/kinesis/kint36/info.json
@@ -4,7 +4,8 @@
     "usb": {
         "vid": "0x1209",
         "pid": "0x345C",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "max_power": 100
     },
     "matrix_pins": {
         "cols": ["B3", "D1", "C0", "D5", "C1", "B2", "D4"],
diff --git a/keyboards/kinesis/kint41/config.h b/keyboards/kinesis/kint41/config.h
index 74d1a8a78f5..e620abd09e6 100644
--- a/keyboards/kinesis/kint41/config.h
+++ b/keyboards/kinesis/kint41/config.h
@@ -16,10 +16,6 @@
 
 #pragma once
 
-// The Teensy 4.1 consumes about 100 mA of current at its full speed of 600 MHz
-// as per https://www.pjrc.com/store/teensy41.html
-#define USB_MAX_POWER_CONSUMPTION 100
-
 /* We use the i.MX RT1060 high-speed GPIOs (GPIO6-9) which are connected to the
  * AHB bus (AHB_CLK_ROOT), which runs at the same speed as the ARM Core Clock,
  * i.e. 600 MHz. See MIMXRT1062, page 949, 12.1 Chip-specific GPIO information.
diff --git a/keyboards/kinesis/kint41/info.json b/keyboards/kinesis/kint41/info.json
index 0a6424641ad..1901ed1d3bb 100644
--- a/keyboards/kinesis/kint41/info.json
+++ b/keyboards/kinesis/kint41/info.json
@@ -4,7 +4,8 @@
     "usb": {
         "vid": "0x1209",
         "pid": "0x345C",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "max_power": 100
     },
     "matrix_pins": {
         "cols": ["LINE_PIN18", "LINE_PIN14", "LINE_PIN15", "LINE_PIN20", "LINE_PIN22", "LINE_PIN19", "LINE_PIN6"],
diff --git a/keyboards/kinesis/kintlc/config.h b/keyboards/kinesis/kintlc/config.h
index a5610a4c8cb..e620abd09e6 100644
--- a/keyboards/kinesis/kintlc/config.h
+++ b/keyboards/kinesis/kintlc/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-// The Teensy LC power consumption is unknown as per
-// https://www.pjrc.com/store/teensylc.html but since
-// https://www.pjrc.com/store/teensy41.html says 100mA, let's go with half.
-#define USB_MAX_POWER_CONSUMPTION 50
-
 /* We use the i.MX RT1060 high-speed GPIOs (GPIO6-9) which are connected to the
  * AHB bus (AHB_CLK_ROOT), which runs at the same speed as the ARM Core Clock,
  * i.e. 600 MHz. See MIMXRT1062, page 949, 12.1 Chip-specific GPIO information.
diff --git a/keyboards/kinesis/kintlc/info.json b/keyboards/kinesis/kintlc/info.json
index 6c8938ab359..da8e8f7e45e 100644
--- a/keyboards/kinesis/kintlc/info.json
+++ b/keyboards/kinesis/kintlc/info.json
@@ -4,7 +4,8 @@
     "usb": {
         "vid": "0x1209",
         "pid": "0x345C",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "max_power": 50
     },
     "matrix_pins": {
         "cols": ["LINE_PIN18", "LINE_PIN14", "LINE_PIN15", "LINE_PIN20", "LINE_PIN22", "LINE_PIN19", "LINE_PIN6"],
diff --git a/keyboards/kprepublic/jj40/config.h b/keyboards/kprepublic/jj40/config.h
index f26971a5a3e..d77984fc699 100644
--- a/keyboards/kprepublic/jj40/config.h
+++ b/keyboards/kprepublic/jj40/config.h
@@ -27,5 +27,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-
-#define USB_MAX_POWER_CONSUMPTION 100
diff --git a/keyboards/kprepublic/jj40/info.json b/keyboards/kprepublic/jj40/info.json
index c41c1396066..e5dacd90da8 100644
--- a/keyboards/kprepublic/jj40/info.json
+++ b/keyboards/kprepublic/jj40/info.json
@@ -6,7 +6,8 @@
   "usb": {
     "vid": "0x4B50",
     "pid": "0x0040",
-    "device_version": "2.0.0"
+    "device_version": "2.0.0",
+    "max_power": 100
   },
   "matrix_pins": {
     "cols": ["C4", "C5", "C6", "C7", "A4", "A5", "A6", "A7", "A3", "A2", "A1", "A0"],
diff --git a/keyboards/kprepublic/jj4x4/config.h b/keyboards/kprepublic/jj4x4/config.h
index c0220254b96..5646d4c6536 100644
--- a/keyboards/kprepublic/jj4x4/config.h
+++ b/keyboards/kprepublic/jj4x4/config.h
@@ -30,5 +30,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-
-#define USB_MAX_POWER_CONSUMPTION 100
diff --git a/keyboards/kprepublic/jj4x4/info.json b/keyboards/kprepublic/jj4x4/info.json
index 337b532f973..fce30c67b04 100644
--- a/keyboards/kprepublic/jj4x4/info.json
+++ b/keyboards/kprepublic/jj4x4/info.json
@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0x4B50",
         "pid": "0x0044",
-        "device_version": "2.0.0"
+        "device_version": "2.0.0",
+        "max_power": 100
     },
     "matrix_pins": {
         "cols": ["A1", "A0", "A2", "A3"],
diff --git a/keyboards/littlealby/mute/config.h b/keyboards/littlealby/mute/config.h
index bd2aa9c26b9..3a5b0356a94 100644
--- a/keyboards/littlealby/mute/config.h
+++ b/keyboards/littlealby/mute/config.h
@@ -15,8 +15,6 @@
  */
 #pragma once
 
-#define USB_MAX_POWER_CONSUMPTION 100
-
 #ifdef RGBLIGHT_ENABLE
 #define RGBLED_NUM 1
 #endif
diff --git a/keyboards/littlealby/mute/info.json b/keyboards/littlealby/mute/info.json
index 9d2a172116d..a6392a76e78 100644
--- a/keyboards/littlealby/mute/info.json
+++ b/keyboards/littlealby/mute/info.json
@@ -6,7 +6,8 @@
   "usb": {
     "vid": "0x4142",
     "pid": "0x4D55",
-    "device_version": "0.0.1"
+    "device_version": "0.0.1",
+    "max_power": 100
   },
   "ws2812": {
     "pin": "B6"
diff --git a/keyboards/orthocode/config.h b/keyboards/orthocode/config.h
index 3964ccec158..10987d87af5 100644
--- a/keyboards/orthocode/config.h
+++ b/keyboards/orthocode/config.h
@@ -16,8 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define USB_MAX_POWER_CONSUMPTION 100
-
 #define TAP_CODE_DELAY 10
 
   #define RGBLED_NUM 10  /*Change for the number of leds on the strip you attach*/
diff --git a/keyboards/orthocode/info.json b/keyboards/orthocode/info.json
index 144075fde15..6b283da6cf1 100644
--- a/keyboards/orthocode/info.json
+++ b/keyboards/orthocode/info.json
@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0x3415",
         "pid": "0x0001",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "max_power": 100
     },
     "matrix_pins": {
         "cols": ["C4", "C3", "C2", "C1", "C0", "D7", "D6", "A7", "A4", "A5", "A6", "A3", "A2", "A1", "A0"],
diff --git a/keyboards/p3d/glitch/config.h b/keyboards/p3d/glitch/config.h
index 2db0b8566c3..a7548280532 100644
--- a/keyboards/p3d/glitch/config.h
+++ b/keyboards/p3d/glitch/config.h
@@ -29,8 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 
-#define USB_MAX_POWER_CONSUMPTION 400
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/p3d/glitch/info.json b/keyboards/p3d/glitch/info.json
index 9ff596476f4..25dc17b820d 100644
--- a/keyboards/p3d/glitch/info.json
+++ b/keyboards/p3d/glitch/info.json
@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0x7033",
         "pid": "0x3568",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "max_power": 400
     },
     "matrix_pins": {
         "cols": ["B2", "D2", "B3", "B7", "F5", "F4", "F1", "F0"],
diff --git a/keyboards/peej/lumberjack/config.h b/keyboards/peej/lumberjack/config.h
deleted file mode 100644
index 0079764d8e4..00000000000
--- a/keyboards/peej/lumberjack/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2020 Paul James
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define USB_MAX_POWER_CONSUMPTION 100
diff --git a/keyboards/peej/lumberjack/info.json b/keyboards/peej/lumberjack/info.json
index c65c4bea479..83b4a6e6c22 100644
--- a/keyboards/peej/lumberjack/info.json
+++ b/keyboards/peej/lumberjack/info.json
@@ -6,7 +6,8 @@
   "usb": {
     "vid": "0x706A",
     "pid": "0x0002",
-    "device_version": "0.0.1"
+    "device_version": "0.0.1",
+    "max_power": 100
   },
   "matrix_pins": {
     "cols": ["B0", "D7", "D6", "D5", "D4", "D1", "D0", "C1", "C2", "C3"],
diff --git a/keyboards/peej/rosaline/config.h b/keyboards/peej/rosaline/config.h
index 18505def827..d36ddb96e93 100644
--- a/keyboards/peej/rosaline/config.h
+++ b/keyboards/peej/rosaline/config.h
@@ -16,7 +16,5 @@
 
 #pragma once
 
-#define USB_MAX_POWER_CONSUMPTION 100
-
 #define LED1 C5
 #define LED2 C4
diff --git a/keyboards/peej/rosaline/ortho/info.json b/keyboards/peej/rosaline/ortho/info.json
index c175aafb425..9fb9d3cb40d 100644
--- a/keyboards/peej/rosaline/ortho/info.json
+++ b/keyboards/peej/rosaline/ortho/info.json
@@ -6,7 +6,8 @@
   "usb": {
     "vid": "0x706A",
     "pid": "0x0003",
-    "device_version": "0.0.1"
+    "device_version": "0.0.1",
+    "max_power": 100
   },
   "matrix_pins": {
     "cols": ["B0", "D7", "D6", "C2", "D4", "D1", "D0", "C1"],
diff --git a/keyboards/peej/rosaline/staggered/info.json b/keyboards/peej/rosaline/staggered/info.json
index 0608f2a9f79..99796675e16 100644
--- a/keyboards/peej/rosaline/staggered/info.json
+++ b/keyboards/peej/rosaline/staggered/info.json
@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0x706A",
         "pid": "0x0003",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "max_power": 100
     },
     "matrix_pins": {
         "cols": ["B0", "D7", "D6", "C2", "D4", "D1", "D0", "C1"],
diff --git a/keyboards/ploopyco/mouse/config.h b/keyboards/ploopyco/mouse/config.h
index bc7e587ee77..9747969db48 100644
--- a/keyboards/ploopyco/mouse/config.h
+++ b/keyboards/ploopyco/mouse/config.h
@@ -23,8 +23,6 @@
 #define UNUSABLE_PINS \
     { B4, D6, F1, F5, F6, F7 }
 
-#define USB_MAX_POWER_CONSUMPTION 100
-
 /* disable action features */
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
diff --git a/keyboards/ploopyco/mouse/info.json b/keyboards/ploopyco/mouse/info.json
index 96b91d89a6a..e31a1eb4cd0 100644
--- a/keyboards/ploopyco/mouse/info.json
+++ b/keyboards/ploopyco/mouse/info.json
@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0x5043",
         "pid": "0x4D6F",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "max_power": 100
     },
     "bootmagic": {
         "matrix": [0, 3]
diff --git a/keyboards/ploopyco/trackball/config.h b/keyboards/ploopyco/trackball/config.h
index de94eab9baf..de0ed1ebece 100644
--- a/keyboards/ploopyco/trackball/config.h
+++ b/keyboards/ploopyco/trackball/config.h
@@ -23,8 +23,6 @@
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-#define USB_MAX_POWER_CONSUMPTION 100
-
 #define ROTATIONAL_TRANSFORM_ANGLE 20
 
 // If board has a debug LED, you can enable it by defining this
diff --git a/keyboards/ploopyco/trackball/info.json b/keyboards/ploopyco/trackball/info.json
index a1f9c532845..ef6682f9e45 100644
--- a/keyboards/ploopyco/trackball/info.json
+++ b/keyboards/ploopyco/trackball/info.json
@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0x5043",
         "pid": "0x5442",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "max_power": 100
     },
     "bootmagic": {
         "matrix": [0, 3]
diff --git a/keyboards/ploopyco/trackball_mini/config.h b/keyboards/ploopyco/trackball_mini/config.h
index 2cb236fcd01..789deb5a5f1 100644
--- a/keyboards/ploopyco/trackball_mini/config.h
+++ b/keyboards/ploopyco/trackball_mini/config.h
@@ -24,8 +24,6 @@
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-#define USB_MAX_POWER_CONSUMPTION 100
-
 // If board has a debug LED, you can enable it by defining this
 // #define DEBUG_LED_PIN F7
 
diff --git a/keyboards/ploopyco/trackball_mini/info.json b/keyboards/ploopyco/trackball_mini/info.json
index e3daea05757..7d040aa5bfe 100644
--- a/keyboards/ploopyco/trackball_mini/info.json
+++ b/keyboards/ploopyco/trackball_mini/info.json
@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0x5043",
         "pid": "0x1EAB",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "max_power": 100
     },
     "bootmagic": {
         "matrix": [0, 3]
diff --git a/keyboards/ploopyco/trackball_nano/config.h b/keyboards/ploopyco/trackball_nano/config.h
index c8e74cc271e..e2ebde32635 100644
--- a/keyboards/ploopyco/trackball_nano/config.h
+++ b/keyboards/ploopyco/trackball_nano/config.h
@@ -24,8 +24,6 @@
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-#define USB_MAX_POWER_CONSUMPTION 100
-
 #define ADNS5050_SCLK_PIN         B7
 #define ADNS5050_SDIO_PIN         C6
 #define ADNS5050_CS_PIN           B4
diff --git a/keyboards/ploopyco/trackball_nano/info.json b/keyboards/ploopyco/trackball_nano/info.json
index 522ff43d990..52955485739 100644
--- a/keyboards/ploopyco/trackball_nano/info.json
+++ b/keyboards/ploopyco/trackball_nano/info.json
@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0x5043",
         "pid": "0x54A3",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "max_power": 100
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/punk75/config.h b/keyboards/punk75/config.h
index a8b9af7999f..b314f6dae97 100644
--- a/keyboards/punk75/config.h
+++ b/keyboards/punk75/config.h
@@ -19,8 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define LED A0
 
-#define USB_MAX_POWER_CONSUMPTION 500
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/rgbkb/pan/config.h b/keyboards/rgbkb/pan/config.h
index f1b323bc178..2bd147df5b3 100644
--- a/keyboards/rgbkb/pan/config.h
+++ b/keyboards/rgbkb/pan/config.h
@@ -30,7 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_MATRIX_LED_COUNT RGBLED_NUM
 
 #define RGBLIGHT_LIMIT_VAL 120
-#define USB_MAX_POWER_CONSUMPTION 500
 
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
diff --git a/keyboards/ryanskidmore/rskeys100/config.h b/keyboards/ryanskidmore/rskeys100/config.h
index 84fd3381eda..1ec96ddfdfb 100644
--- a/keyboards/ryanskidmore/rskeys100/config.h
+++ b/keyboards/ryanskidmore/rskeys100/config.h
@@ -42,6 +42,3 @@
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* Set the max power consumption for the keyboard, which is 500 mA. */
-#define USB_MAX_POWER_CONSUMPTION 500
diff --git a/keyboards/sendyyeah/pix/config.h b/keyboards/sendyyeah/pix/config.h
index 2030d914d62..88d255f6c02 100644
--- a/keyboards/sendyyeah/pix/config.h
+++ b/keyboards/sendyyeah/pix/config.h
@@ -25,8 +25,6 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define USB_MAX_POWER_CONSUMPTION 500
-
 #define RGBLED_NUM 15
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/tokyokeyboard/tokyo60/config.h b/keyboards/tokyokeyboard/tokyo60/config.h
index 800cb31a2f6..dd58e34f08f 100644
--- a/keyboards/tokyokeyboard/tokyo60/config.h
+++ b/keyboards/tokyokeyboard/tokyo60/config.h
@@ -1,8 +1,5 @@
 #pragma once
 
-/* Set power consumption to work with mobile devices */
-#define USB_MAX_POWER_CONSUMPTION 100
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/tokyokeyboard/tokyo60/info.json b/keyboards/tokyokeyboard/tokyo60/info.json
index cd2cfe2248a..aae81a4a6b6 100644
--- a/keyboards/tokyokeyboard/tokyo60/info.json
+++ b/keyboards/tokyokeyboard/tokyo60/info.json
@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0x5436",
         "pid": "0x6060",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "max_power": 100
     },
     "matrix_pins": {
         "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B2", "B5", "B4", "D7", "D6", "B3"],
diff --git a/keyboards/torn/config.h b/keyboards/torn/config.h
index 0b56ef812d1..6025d55b1cd 100644
--- a/keyboards/torn/config.h
+++ b/keyboards/torn/config.h
@@ -45,6 +45,4 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-#define USB_MAX_POWER_CONSUMPTION 100
-
 #define OLED_TIMEOUT 60000
diff --git a/keyboards/torn/info.json b/keyboards/torn/info.json
index c5294d14afc..c1b83188f06 100644
--- a/keyboards/torn/info.json
+++ b/keyboards/torn/info.json
@@ -6,7 +6,8 @@
   "usb": {
     "vid": "0x7274",
     "pid": "0x0001",
-    "device_version": "0.0.1"
+    "device_version": "0.0.1",
+    "max_power": 100
   },
   "encoder": {
     "rotary": [
diff --git a/keyboards/trashman/ketch/config.h b/keyboards/trashman/ketch/config.h
index 64c34a8008b..0f391f70ba5 100644
--- a/keyboards/trashman/ketch/config.h
+++ b/keyboards/trashman/ketch/config.h
@@ -22,7 +22,6 @@ SOFTWARE.
 
 #pragma once
 
-#define USB_MAX_POWER_CONSUMPTION 100
 #define RGBLED_NUM 10
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/trashman/ketch/info.json b/keyboards/trashman/ketch/info.json
index 02dc364a35e..21f3bb7ec3a 100644
--- a/keyboards/trashman/ketch/info.json
+++ b/keyboards/trashman/ketch/info.json
@@ -6,7 +6,8 @@
   "usb": {
     "vid": "0xFEAE",
     "pid": "0x8947",
-    "device_version": "0.0.1"
+    "device_version": "0.0.1",
+    "max_power": 100
   },
   "ws2812": {
     "pin": "F4"
diff --git a/keyboards/tronguylabs/m122_3270/config.h b/keyboards/tronguylabs/m122_3270/config.h
deleted file mode 100644
index 754e0977c4d..00000000000
--- a/keyboards/tronguylabs/m122_3270/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2021 James R. Maynard III <jaymaynard@gmail.com>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-// Both controllers draw 100 mA or less
-#define USB_MAX_POWER_CONSUMPTION 100
diff --git a/keyboards/tronguylabs/m122_3270/info.json b/keyboards/tronguylabs/m122_3270/info.json
index 2dae824cc4f..364ab250dcc 100644
--- a/keyboards/tronguylabs/m122_3270/info.json
+++ b/keyboards/tronguylabs/m122_3270/info.json
@@ -4,7 +4,8 @@
     "maintainer": "jmaynard",
     "usb": {
         "vid": "0x1209",
-        "pid": "0x3270"
+        "pid": "0x3270",
+        "max_power": 100
     },
     "debounce": 15,
     "layouts": {
diff --git a/keyboards/uranuma/config.h b/keyboards/uranuma/config.h
index 39bb20f2a89..7bc78f68d69 100644
--- a/keyboards/uranuma/config.h
+++ b/keyboards/uranuma/config.h
@@ -1,9 +1,5 @@
 #pragma once
 
-// fix iPhone and iPad power adapter issue
-// iOS device need lessthan 100
-#define USB_MAX_POWER_CONSUMPTION 100
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/uranuma/info.json b/keyboards/uranuma/info.json
index 2dd2bd9e534..f7019e0c862 100644
--- a/keyboards/uranuma/info.json
+++ b/keyboards/uranuma/info.json
@@ -6,7 +6,8 @@
   "usb": {
     "vid": "0xFEED",
     "pid": "0x112D",
-    "device_version": "0.0.1"
+    "device_version": "0.0.1",
+    "max_power": 100
   },
   "matrix_pins": {
     "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D2", "D4"],
diff --git a/keyboards/work_louder/loop/config.h b/keyboards/work_louder/loop/config.h
index 4d5bcf9dba2..93b3b541843 100644
--- a/keyboards/work_louder/loop/config.h
+++ b/keyboards/work_louder/loop/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define USB_MAX_POWER_CONSUMPTION 100
-
 #define RGBLIGHT_DI_PIN E6
 //#    define RGBLIGHT_HUE_STEP 8
 //#    define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/work_louder/loop/info.json b/keyboards/work_louder/loop/info.json
index 64aed890deb..be5d470382e 100644
--- a/keyboards/work_louder/loop/info.json
+++ b/keyboards/work_louder/loop/info.json
@@ -5,7 +5,8 @@
     "maintainer": "Work Louder",
     "usb": {
         "vid": "0x574C",
-        "pid": "0x1DF9"
+        "pid": "0x1DF9",
+        "max_power": 100
     },
     "rgb_matrix": {
         "driver": "WS2812"
diff --git a/keyboards/work_louder/micro/config.h b/keyboards/work_louder/micro/config.h
index f23c5a4ef14..234b1de6023 100644
--- a/keyboards/work_louder/micro/config.h
+++ b/keyboards/work_louder/micro/config.h
@@ -4,12 +4,6 @@
 #pragma once
 
 
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-#define USB_MAX_POWER_CONSUMPTION 100
-
 #define RGB_MATRIX_LED_COUNT 12
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
 #define RGB_MATRIX_DISABLE_KEYCODES
diff --git a/keyboards/work_louder/micro/info.json b/keyboards/work_louder/micro/info.json
index f6b45226a0d..80c1c259f5d 100644
--- a/keyboards/work_louder/micro/info.json
+++ b/keyboards/work_louder/micro/info.json
@@ -49,7 +49,8 @@
     "usb": {
         "device_version": "1.0.0",
         "pid": "0xE6E3",
-        "vid": "0x574C"
+        "vid": "0x574C",
+        "max_power": 100
     },
     "encoder": {
         "rotary": [
diff --git a/keyboards/work_louder/nano/config.h b/keyboards/work_louder/nano/config.h
index 265da302e57..74427859cb6 100644
--- a/keyboards/work_louder/nano/config.h
+++ b/keyboards/work_louder/nano/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define USB_MAX_POWER_CONSUMPTION 100
-
 #define RGBLIGHT_DI_PIN        C7
 #define RGBLED_NUM             6
 //#    define RGBLIGHT_HUE_STEP 8
diff --git a/keyboards/work_louder/nano/info.json b/keyboards/work_louder/nano/info.json
index 70da0e4cc48..097ad1f045d 100644
--- a/keyboards/work_louder/nano/info.json
+++ b/keyboards/work_louder/nano/info.json
@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0x574C",
         "pid": "0xE6F0",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "max_power": 100
     },
     "rgb_matrix": {
         "driver": "WS2812"
diff --git a/keyboards/work_louder/work_board/config.h b/keyboards/work_louder/work_board/config.h
index 8f392bd0507..1d8feeff589 100644
--- a/keyboards/work_louder/work_board/config.h
+++ b/keyboards/work_louder/work_board/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define USB_MAX_POWER_CONSUMPTION 100
-
 #define RGBLIGHT_DI_PIN        D2
 //#    define RGBLIGHT_HUE_STEP 8
 //#    define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/work_louder/work_board/info.json b/keyboards/work_louder/work_board/info.json
index b79a1144a1c..1b3bd41520f 100644
--- a/keyboards/work_louder/work_board/info.json
+++ b/keyboards/work_louder/work_board/info.json
@@ -5,7 +5,8 @@
     "maintainer": "Work Louder",
     "usb": {
       "vid": "0x574C",
-      "pid": "0xDCD1"
+      "pid": "0xDCD1",
+      "max_power": 100
     },
     "rgb_matrix": {
       "driver": "WS2812"
diff --git a/keyboards/yiancardesigns/barleycorn/config.h b/keyboards/yiancardesigns/barleycorn/config.h
index 5eed7521ffc..5e90dd35159 100644
--- a/keyboards/yiancardesigns/barleycorn/config.h
+++ b/keyboards/yiancardesigns/barleycorn/config.h
@@ -41,9 +41,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-#define USB_MAX_POWER_CONSUMPTION 100
-
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/yiancardesigns/barleycorn/info.json b/keyboards/yiancardesigns/barleycorn/info.json
index ad19574eae8..99786319b3e 100644
--- a/keyboards/yiancardesigns/barleycorn/info.json
+++ b/keyboards/yiancardesigns/barleycorn/info.json
@@ -5,7 +5,8 @@
     "usb": {
       "vid": "0x8968",
       "pid": "0x4749",
-      "device_version": "0.0.1"
+      "device_version": "0.0.1",
+      "max_power": 100
     },
     "processor": "atmega328p",
     "bootloader": "usbasploader",
diff --git a/keyboards/yiancardesigns/gingham/config.h b/keyboards/yiancardesigns/gingham/config.h
index cf19c1bb220..fe06114dd56 100644
--- a/keyboards/yiancardesigns/gingham/config.h
+++ b/keyboards/yiancardesigns/gingham/config.h
@@ -41,8 +41,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-#define USB_MAX_POWER_CONSUMPTION 100
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/yiancardesigns/gingham/info.json b/keyboards/yiancardesigns/gingham/info.json
index c09db755647..c0b1644fea8 100644
--- a/keyboards/yiancardesigns/gingham/info.json
+++ b/keyboards/yiancardesigns/gingham/info.json
@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0x8968",
         "pid": "0x4748",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "max_power": 100
     },
     "processor": "atmega328p",
     "bootloader": "usbasploader",
diff --git a/keyboards/yiancardesigns/seigaiha/config.h b/keyboards/yiancardesigns/seigaiha/config.h
index de93e5ecb26..70ce1c29abf 100644
--- a/keyboards/yiancardesigns/seigaiha/config.h
+++ b/keyboards/yiancardesigns/seigaiha/config.h
@@ -41,8 +41,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-#define USB_MAX_POWER_CONSUMPTION 100
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/yiancardesigns/seigaiha/info.json b/keyboards/yiancardesigns/seigaiha/info.json
index fca905283ea..26ab6ab528a 100644
--- a/keyboards/yiancardesigns/seigaiha/info.json
+++ b/keyboards/yiancardesigns/seigaiha/info.json
@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0x8968",
         "pid": "0x4750",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "max_power": 100
     },
     "bootmagic": {
         "matrix": [1, 0]
diff --git a/keyboards/ymdk/np21/config.h b/keyboards/ymdk/np21/config.h
index 81bfa2e81a7..e97ca9ea63c 100644
--- a/keyboards/ymdk/np21/config.h
+++ b/keyboards/ymdk/np21/config.h
@@ -54,5 +54,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-#define USB_MAX_POWER_CONSUMPTION 100
diff --git a/keyboards/ymdk/np21/info.json b/keyboards/ymdk/np21/info.json
index 1c4651c94c4..62fdf7e20c7 100644
--- a/keyboards/ymdk/np21/info.json
+++ b/keyboards/ymdk/np21/info.json
@@ -5,7 +5,8 @@
     "usb": {
         "vid": "0x594D",
         "pid": "0x5021",
-        "device_version": "2.0.0"
+        "device_version": "2.0.0",
+        "max_power": 100
     },
     "matrix_pins": {
         "cols": ["A0", "A1", "A2", "A3", "A4", "A5"],
diff --git a/keyboards/ymdk/ymd96/config.h b/keyboards/ymdk/ymd96/config.h
index 3b6ffded666..ecb03b59175 100644
--- a/keyboards/ymdk/ymd96/config.h
+++ b/keyboards/ymdk/ymd96/config.h
@@ -21,8 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define TAPPING_TOGGLE 3
 
-#define USB_MAX_POWER_CONSUMPTION 100
-
 /* RGB underglow */
 #define RGBLED_NUM 18
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/ymdk/ymd96/info.json b/keyboards/ymdk/ymd96/info.json
index d24d4fa4cdc..96f83d34129 100644
--- a/keyboards/ymdk/ymd96/info.json
+++ b/keyboards/ymdk/ymd96/info.json
@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0x20A0",
         "pid": "0x422D",
-        "device_version": "2.0.0"
+        "device_version": "2.0.0",
+        "max_power": 100
     },
     "matrix_pins": {
         "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"],