diff --git a/src/Kaleidoscope.cpp b/src/Kaleidoscope.cpp
index ac35c64c..054b82cf 100644
--- a/src/Kaleidoscope.cpp
+++ b/src/Kaleidoscope.cpp
@@ -9,12 +9,8 @@ Kaleidoscope_::Kaleidoscope_(void) {
 
 void
 Kaleidoscope_::setup(void) {
-#ifdef __AVR__
-    wdt_disable();
-#endif
-    delay(100);
-    Keyboard.begin();
     KeyboardHardware.setup();
+    Keyboard.begin();
 
     // A workaround, so that the compiler does not optimize this out...
     handle_keyswitch_event (Key_NoKey, 255, 255, 0);
diff --git a/src/Kaleidoscope.h b/src/Kaleidoscope.h
index 4a1ecbec..0fba6d0f 100644
--- a/src/Kaleidoscope.h
+++ b/src/Kaleidoscope.h
@@ -18,9 +18,6 @@ void setup();
 
 #include <stdio.h>
 #include <math.h>
-#ifdef __AVR__
-#include <avr/wdt.h>
-#endif
 
 #include KALEIDOSCOPE_HARDWARE_H
 #include "key_events.h"