diff --git a/keyboards/boston_meetup/2019/config.h b/keyboards/boston_meetup/2019/config.h
index a7dd952cd6a..d5a476d9991 100644
--- a/keyboards/boston_meetup/2019/config.h
+++ b/keyboards/boston_meetup/2019/config.h
@@ -85,6 +85,4 @@
 #define DRV2605L_ZC_DET_TIME 0
 #define DRV2605L_AUTO_CAL_TIME 3
 
-#define RGB_MATRIX_LED_COUNT 10
-
 #define SOLENOID_PIN A14
diff --git a/keyboards/doio/kb30/config.h b/keyboards/doio/kb30/config.h
index 04730a1f18c..3dc7a76367f 100644
--- a/keyboards/doio/kb30/config.h
+++ b/keyboards/doio/kb30/config.h
@@ -27,8 +27,6 @@
 #    define I2C_DRIVER I2CD2
 #endif
 
-#define RGB_MATRIX_LED_COUNT 36
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/ferris/0_2/bling/bling.c b/keyboards/ferris/0_2/bling/bling.c
index 69fbe411ebe..b33b05c727e 100644
--- a/keyboards/ferris/0_2/bling/bling.c
+++ b/keyboards/ferris/0_2/bling/bling.c
@@ -16,8 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "quantum.h"
 
-#include "drivers/led/issi/is31fl3731.h"
-
+#ifdef RGB_MATRIX_ENABLE
 /*
 |      Left        ||    Right       |
 |    | 3  |   | 0  || 0 |   | 3  |   |
@@ -49,36 +48,4 @@ const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
     {0, C9_11, C8_11, C7_11},  // Left  RGB 4
     {0, C9_9, C8_9, C7_9},     // Left  RGB 6
 };
-// clang-format off
-led_config_t g_led_config = {
-    // Key Matrix to LED Index
-    {
-        { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
-        { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
-        { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
-        { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
-        { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
-        { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
-        { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
-        { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
-    }, {
-        // LED Index to Physical Position. The unit is roughly milimiters in the real world
-        //    |      Left      ||    Right        |
-        // x->| 10  | 32  | 64 || 160 | 192 | 214 |
-        // y  |_____|_____|____||_____|_____|_____|
-        // 0  |     | 1   | 2  || 3   |   4 |     |
-        // 16 | 0   |     |    ||     |     | 5   |
-        // 35 |     |     | 11 || 8   |     |     |
-        // 45 |     | 12  |    ||     |   7 |     |
-        // 50 | 13  |     | 10 || 9   |     | 6   |
-        // 0         1        2         3         4         5
-        {10, 16}, {32, 0}, {64, 0}, {160, 0}, {192, 0}, {214, 16},
-        //  6          7          8          9
-        {214, 50}, {192, 45}, {160, 35}, {160, 50},
-        //  10       11        12       13
-        {64, 50}, {64, 35}, {32, 45}, {10, 50},
-    }, {
-        // LED Index to Flag
-        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
-    }
-};
+#endif
diff --git a/keyboards/ferris/0_2/bling/config.h b/keyboards/ferris/0_2/bling/config.h
index 2325463e1f0..e1365033fce 100644
--- a/keyboards/ferris/0_2/bling/config.h
+++ b/keyboards/ferris/0_2/bling/config.h
@@ -20,5 +20,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* LED Drivers */
 #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
 #define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SCL
-
-#define RGB_MATRIX_LED_COUNT 14
diff --git a/keyboards/ferris/0_2/bling/keyboard.json b/keyboards/ferris/0_2/bling/keyboard.json
index 22ef500d6da..ce35aef2ae9 100644
--- a/keyboards/ferris/0_2/bling/keyboard.json
+++ b/keyboards/ferris/0_2/bling/keyboard.json
@@ -49,7 +49,23 @@
             "solid_splash": true,
             "solid_multisplash": true
         },
-        "driver": "is31fl3731"
+        "driver": "is31fl3731",
+        "layout": [
+            {"x": 0, "y": 16, "flags": 4},
+            {"x": 36, "y": 0, "flags": 4},
+            {"x": 72, "y": 0, "flags": 4},
+            {"x": 152, "y": 0, "flags": 4},
+            {"x": 188, "y": 0, "flags": 4},
+            {"x": 224, "y": 16, "flags": 4},
+            {"x": 224, "y": 64, "flags": 4},
+            {"x": 188, "y": 48, "flags": 4},
+            {"x": 152, "y": 36, "flags": 4},
+            {"x": 152, "y": 64, "flags": 4},
+            {"x": 72, "y": 64, "flags": 4},
+            {"x": 72, "y": 36, "flags": 4},
+            {"x": 36, "y": 48, "flags": 4},
+            {"x": 0, "y": 64, "flags": 4}
+        ]
     },
     "features": {
         "rgb_matrix": true
diff --git a/keyboards/horrortroll/handwired_k552/config.h b/keyboards/horrortroll/handwired_k552/config.h
index bc7924165d9..44233133cb5 100644
--- a/keyboards/horrortroll/handwired_k552/config.h
+++ b/keyboards/horrortroll/handwired_k552/config.h
@@ -39,5 +39,3 @@
     /* Use the custom font */
     #define OLED_FONT_H "lib/glcdfont.c"
 #endif
-
-#define RGB_MATRIX_LED_COUNT 24
diff --git a/keyboards/work_louder/work_board/config.h b/keyboards/work_louder/work_board/config.h
index 36dadf6d4e0..a643cd767dd 100644
--- a/keyboards/work_louder/work_board/config.h
+++ b/keyboards/work_louder/work_board/config.h
@@ -21,5 +21,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGBLIGHT_DEFAULT_MODE         RGBLIGHT_MODE_STATIC_GRADIENT + 9
 
-#define RGB_MATRIX_LED_COUNT              49
 #define RGB_MATRIX_DISABLE_KEYCODES