diff --git a/drivers/avr/ws2812.c b/drivers/avr/ws2812.c
index 6f73223593..63237c08f7 100644
--- a/drivers/avr/ws2812.c
+++ b/drivers/avr/ws2812.c
@@ -149,7 +149,7 @@ void WS2812_init(void) {
 
 }
 
-void WS2812_set_color( uint8_t index, uint8_t red, uint8_t green, uint8_t blue ) {
+void WS2812_set_color( int index, uint8_t red, uint8_t green, uint8_t blue ) {
   led_array[index].r = red;
   led_array[index].g = green;
   led_array[index].b = blue;
diff --git a/drivers/avr/ws2812.h b/drivers/avr/ws2812.h
index 522913f53e..283d43d127 100644
--- a/drivers/avr/ws2812.h
+++ b/drivers/avr/ws2812.h
@@ -31,7 +31,7 @@
 #include "rgblight_types.h"
 
 void WS2812_init(void);
-void WS2812_set_color( uint8_t index, uint8_t red, uint8_t green, uint8_t blue );
+void WS2812_set_color( int index, uint8_t red, uint8_t green, uint8_t blue );
 void WS2812_set_color_all( uint8_t red, uint8_t green, uint8_t blue );
 void WS2812_send_colors(void);
 
diff --git a/quantum/rgb_matrix.c b/quantum/rgb_matrix.c
index f175c53696..a811b5eeb6 100644
--- a/quantum/rgb_matrix.c
+++ b/quantum/rgb_matrix.c
@@ -847,37 +847,6 @@ void rgb_matrix_init(void) {
   eeconfig_debug_rgb_matrix(); // display current eeprom values
 }
 
-void rgb_matrix_setup_drivers(void) {
-  // Initialize TWI
-#ifdef IS31FL3731
-  i2c_init();
-  IS31FL3731_init( DRIVER_ADDR_1 );
-  IS31FL3731_init( DRIVER_ADDR_2 );
-#elif defined (IS31FL3733)
-  i2c_init();
-  IS31FL3733_init( DRIVER_ADDR_1 );
-#elif defined(WS2812)
-  WS2812_init();
-#endif
-
-  for ( int index = 0; index < DRIVER_LED_TOTAL; index++ ) {
-    __attribute__((unused))
-    bool enabled = true;
-    // This only caches it for later
-#ifdef IS31FL3731
-    IS31FL3731_set_led_control_register( index, enabled, enabled, enabled );
-#elif defined (IS31FL3733)
-    IS31FL3733_set_led_control_register( index, enabled, enabled, enabled );
-#endif
-  }
-  // This actually updates the LED drivers
-#ifdef IS31FL3731
-  IS31FL3731_update_led_control_registers( DRIVER_ADDR_1, DRIVER_ADDR_2 );
-#elif defined (IS31FL3733)
-  IS31FL3733_update_led_control_registers( DRIVER_ADDR_1, DRIVER_ADDR_2 );
-#endif
-}
-
 // Deals with the messy details of incrementing an integer
 uint8_t increment( uint8_t value, uint8_t step, uint8_t min, uint8_t max ) {
     int16_t new_value = value;