diff --git a/src/main.cpp b/src/main.cpp
index 976ad625..087bf867 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -427,12 +427,10 @@ void setup() {
 #warning you did not specify a time source, time will not be synched
 #endif
 
-/*
 // initialize gps time
 #if (HAS_GPS)
   fetch_gpsTime();
 #endif
-*/
 
 #if (defined HAS_IF482 || defined HAS_DCF77)
   ESP_LOGI(TAG, "Starting Clock Controller...");
@@ -452,15 +450,8 @@ void setup() {
   // show compiled features
   ESP_LOGI(TAG, "Features:%s", features);
 
+  vTaskDelete(NULL);
+
 } // setup()
 
-void loop() {
-
-  while (1) {
-#if (HAS_LORA)
-    os_runloop_once(); // execute lmic scheduled jobs and events
-#else
-    delay(2); // yield to CPU
-#endif
-  }
-}
+void loop() { vTaskDelete(NULL); }