diff --git a/main.c b/main.c
--- a/main.c
+++ b/main.c
@@ -1,5 +1,4 @@
 #include "main.h"
-#include "stm32l100c_discovery.h"
 #include "ssd1306.h"
 #include "config.h"
 #include "eeprom_min.h"
@@ -7,11 +6,11 @@
 #include "spi.h"
 
 // USB includes
-#include "hw_config.h"
-#include "usb_lib.h"
-#include "usb_desc.h"
-#include "usb_pwr.h"
-#include "stringhelpers.h"
+//#include "hw_config.h"
+//#include "usb_lib.h"
+//#include "usb_desc.h"
+//#include "usb_pwr.h"
+//#include "stringhelpers.h"
 
 // TODO: Grab buttonpresses with interrupts
 
@@ -102,6 +101,7 @@ int main(void)
     ssd1306_clearscreen();
 
     // Check for problems on startup
+    uint8_t clock_fail = 0; // FIXME implement in system
     if(clock_fail) {
         //ssd1306_DrawStringBig("ERROR: Check Xtal", 2, 0);
         ssd1306_DrawStringBig("NO XTAL", 2, 0);
@@ -111,9 +111,9 @@ int main(void)
 
     // Init USB
     //Set_System(); // hw_config.h
-    Set_USBClock();
-    USB_Interrupts_Config();
-    USB_Init();
+    //Set_USBClock();
+    //SB_Interrupts_Config();
+    //SB_Init();
     //SYSCFG_USBPuCmd(ENABLE);
     //PowerOn();