diff --git a/ampel-firmware/ntp.cpp b/ampel-firmware/ntp.cpp
index 9bd4c89ce0cdae8cf67653f45b8675d1f308d171..03915a6b4987d8709edb5edc78b2b12d9157e88c 100644
--- a/ampel-firmware/ntp.cpp
+++ b/ampel-firmware/ntp.cpp
@@ -19,7 +19,7 @@ namespace ntp {
     Serial.print("NTP - Trying to connect to : ");
     Serial.println(config::ntp_server);
     timeClient.begin();
-    sensor_console::defineIntCommand("set_time", ntp::setLocalTime, F("1618829570 (Sets time to the given UNIX time)"));
+    sensor_console::defineIntCommand("set_time", ntp::setLocalTime, F("1618829570 (Sets time to the given UNIX time)")); //TODO: Define even without internet
   }
 
   void update() {
diff --git a/ampel-firmware/web_config.h b/ampel-firmware/web_config.h
index e7d2ad38cc7af84adda46f9d5504c79d0409f747..69132fc32a6f170a716f0412c915dac9398773d4 100644
--- a/ampel-firmware/web_config.h
+++ b/ampel-firmware/web_config.h
@@ -1,7 +1,7 @@
 #ifndef AMPEL_WEB_CONFIG_H_
 #define AMPEL_WEB_CONFIG_H_
 
-#define STRING_LEN 64
+#define STRING_LEN 64 //TODO: Shorter?
 
 #if defined(ESP8266)
 #  include <ESP8266WebServer.h>
@@ -32,7 +32,7 @@ namespace config {
   extern bool &daylight_saving_time; // [true / false]
 
   //CSV
-  bool csv_active();
+  bool csv_active(); //TODO: Find better names?
   extern uint16_t &csv_interval; // [s]
 
   // MQTT
@@ -56,7 +56,6 @@ namespace web_config {
   void setWifiConnectionCallback(void (*success_function)());
   void setWifiFailCallback(void (*fail_function)());
   void update();
-  //TODO: Add saveConfig(), for e.g. after custom setters. Or simply reset after each configchange?
 
 #if defined(ESP8266)
   extern ESP8266WebServer http;
diff --git a/ampel-firmware/web_server.cpp b/ampel-firmware/web_server.cpp
index 11c5f61182cf542aa0365b095426df355e49fc5a..b1ab82cf74aacc90c979a2dfd95d880d26da4798 100644
--- a/ampel-firmware/web_server.cpp
+++ b/ampel-firmware/web_server.cpp
@@ -11,9 +11,6 @@
 #include "mqtt.h"
 #include "lorawan.h"
 
-#include <IotWebConf.h>
-#include <IotWebConfUsing.h> // This loads aliases for easier class names.
-#include <IotWebConfTParameter.h>
 #if defined(ESP8266)
 #  include <ESP8266WebServer.h>
 #elif defined(ESP32)