diff --git a/src/network/multicastsocket.c b/src/network/multicastsocket.c
index 648fd47..4d87fcb 100644
--- a/src/network/multicastsocket.c
+++ b/src/network/multicastsocket.c
@@ -11,8 +11,6 @@
 
 #include "multicastsocket.h"
 
-// TODO: Consider to remove this...
-
 // based on: http://openbook.rheinwerk-verlag.de/linux_unix_programmierung/Kap11-018.htm
 
 static struct ip_mreq command;
diff --git a/src/utils/ubus.c b/src/utils/ubus.c
index 02c349c..2804aa3 100644
--- a/src/utils/ubus.c
+++ b/src/utils/ubus.c
@@ -1162,7 +1162,8 @@ static void ubus_add_oject() {
 
 static void respond_to_notify(uint32_t id) {
     // This is needed to respond to the ubus notify ...
-    // TODO: Maybe we need to disable on shutdown...
+    // Maybe we need to disable on shutdown...
+    // But it is not possible when we disable the notify that other daemons are running that relay on this notify...
     int ret;
 
     blob_buf_init(&b, 0);