diff --git a/ampel-firmware/lorawan.cpp b/ampel-firmware/lorawan.cpp
index c7302e73274e93156b9d0fe9402d9ff687bcc81f..dfb256a37fff21f6135d17f3976cae702e2f7bcf 100644
--- a/ampel-firmware/lorawan.cpp
+++ b/ampel-firmware/lorawan.cpp
@@ -98,8 +98,7 @@ namespace lorawan {
         u1_t nwkKey[16];
         u1_t artKey[16];
         LMIC_getSessionKeys(&netid, &devaddr, nwkKey, artKey);
-        //TODO: Save session keys to EEPROM?
-        //e.g. with https://github.com/Edzelf/LoRa/blob/master/ESP_lora_tracker/ESP8266_loratracker.ino
+        //NOTE: Saving session to EEPROM seems like a good idea at first, but unfortunately: too much info is needed, and a counter would need to be save every single time data is sent.
         Serial.print(F("  netid: "));
         Serial.println(netid, DEC);
         Serial.print(F("  devaddr: "));
diff --git a/ampel-firmware/web_config.cpp b/ampel-firmware/web_config.cpp
index a3451ac9ae8932f6c3b4a0250ed7ee56ad5475fc..e8fa324dab9e274de667311e683d9dd06e8f0af9 100644
--- a/ampel-firmware/web_config.cpp
+++ b/ampel-firmware/web_config.cpp
@@ -255,8 +255,6 @@ namespace web_config {
     iotWebConf->setWifiConnectionTimeoutMs(1000UL * config::wifi_timeout);
 
     iotWebConf->skipApStartup();
-    //TODO: Add callbacks
-    //TODO: Save LoRaWAN key if possible?
 
     iotWebConf->init();