   }
 }
 
-void loopHandler() {
-  // Check if keepalive is supported and expired
-  if (EEpromData.keepAliveTimeOut != 0 && (millis() - keepAliveReceived) > EEpromData.keepAliveTimeOut*1000 )
-  {
-    ESP.restart();
-  }
-  if (watchDogCounterStart!=0 && EEpromData.watchDogTimeOut!=0 && (millis() - watchDogCounterStart) > EEpromData.watchDogTimeOut * 1000 )
-  {
-    HomieRange emptyRange;
-    //relayTimerHandler(emptyRange, "10"); // Disable relay for 10 sec
-    watchDogCounterStart = millis();
-  }
-
-  // Update button state
-  button1.Update();
-
-  // Save click codes in function, as click codes are reset at next Update()
-  if(button1.clicks != 0) function = button1.clicks;
-
-  // These are single event button presses.
-  // Handle them and reset function back to 0
-  if ( function > 0 ) {
-    Serial.println("One-shot");
-    if ( function == 1 ) {
-      #ifdef IMMEDIATEON
-        digitalWrite(PIN_RELAY, HIGH);
-        relayNode.setProperty("relayState").send("ON");
-        Serial.println("Relay is on");
-      #endif
-      Serial.println("SINGLE click");
-      buttonNode.setProperty("event").setRetained(false).send("SINGLE");
-    }
-
-    if ( function == 2 ) {
-      buttonNode.setProperty("event").setRetained(false).send("DOUBLE");
-      Serial.println("DOUBLE click");
-    }
-
-    if ( function == 3 ) {
-      buttonNode.setProperty("event").setRetained(false).send("TRIPLE");
-      Serial.println("TRIPLE click");
-    }
-    // This has been a single event.
-    function = 0;
-  }
-
-  // These are repeat events, where the button is being held down.
-  // Handle them, but don't reset function back to 0 unless the button is released.
-  if ( function < 0 ) {
-    if ( millis() - previousMillis >= waitInterval ) {
-      previousMillis = millis();
-      if ( function == -1 ) {
-        buttonNode.setProperty("event").setRetained(false).send("SINGLEHELD");
-        Serial.println("SINGLE LONG click");
-      }
-
-      if ( function == -2 ) {
-        buttonNode.setProperty("event").setRetained(false).send("DOUBLEHELD");
-        Serial.println("DOUBLE LONG click");
-      }
-
-      if ( function == -3 ) {
-        buttonNode.setProperty("event").setRetained(false).send("TRIPLEHELD");
-        Serial.println("TRIPLE LONG click");
-      }
-    }
-
-    // Decide whether the button is being held or not
-    if ( button1.depressed == 1 ) {
-      // This will need rate limited
-      Serial.println("Held");
-    }
-    if ( button1.depressed == 0 ) {
-      Serial.println("Released");
-      function = 0;
-    }
-    // Rate limit...
-    delay(5);
-  }
-
-  }
+// void loopHandler() {
+//   //
+// }
 
 void onHomieEvent(const HomieEvent& event) {
   // Homie event handler

    };
  }

  Homie.loop();
}

  // state on the relayState topic.
  if (value == "ON") {
    digitalWrite(PIN_RELAY, HIGH);
    if ( Homie.isConnected() ) { relayNode.setProperty("relayState").send("ON"); }
    Serial.println("Relay is on");
  } else if (value == "OFF") {
    digitalWrite(PIN_RELAY, LOW);
    if ( Homie.isConnected() ) { relayNode.setProperty("relayState").send("OFF"); }
    Serial.println("Relay is off");
  } else {
    Serial.print("Unknown value: ");
