diff --git a/keyboards/sirius/unigo66/main.c b/keyboards/sirius/unigo66/main.c
index b4a0d97aa..76e88922c 100644
--- a/keyboards/sirius/unigo66/main.c
+++ b/keyboards/sirius/unigo66/main.c
@@ -79,18 +79,12 @@ int main(void)
      */
     sei();
 
-/* Some keyboards bootup quickly and cannot be initialized with this startup wait.*/
+/* Some keyboards bootup quickly and cannot be initialized with this startup wait.
     // wait for startup of sendchar routine
     while (USB_DeviceState != DEVICE_STATE_Configured) ;
     if (debug_enable) {
         _delay_ms(1000);
     }
-
-
-/*  // wait for USB startup & debug output
-    uint8_t timeout=255
-    while (timeout-- && USB_DeviceState != DEVICE_STATE_Configured) {
-    wait_ms(4);
 */
 
     debug("init: done\n");
diff --git a/keyboards/sirius/unigo66/rules.mk b/keyboards/sirius/unigo66/rules.mk
index e716aa86f..562b2b694 100644
--- a/keyboards/sirius/unigo66/rules.mk
+++ b/keyboards/sirius/unigo66/rules.mk
@@ -26,7 +26,5 @@ EXTRAKEY_ENABLE		= yes	# Audio control and System control(+450)
 USB_HID_ENABLE = yes
 
 CUSTOM_MATRIX = yes
-SRC = custom_matrix.cpp
-
-CUSTOM_MATRIX = yes
-SRC = custom_matrix.cpp
+SRC += custom_matrix.cpp \
+			main.c