diff --git a/src/client.cpp b/src/client.cpp
index 950a58e..7bd8c21 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -606,7 +606,6 @@ void Context::Pvt::tickSearch()
             to_wire(H, Header{CMD_SEARCH, pva_flags::Server, uint32_t(consumed-8u)});
         }
         for(auto& pair : searchDest) {
-            // TODO: unicast/bcast
             *pflags = pair.second ? 0x80 : 0x00;
 
             int ntx = sendto(searchTx.sock, (char*)searchMsg.data(), consumed, 0, &pair.first->sa, pair.first.size());
diff --git a/src/data.cpp b/src/data.cpp
index 4ffcf1e..17d1b79 100644
--- a/src/data.cpp
+++ b/src/data.cpp
@@ -69,7 +69,6 @@ Value::Value(const std::shared_ptr<const impl::FieldDesc>& desc)
 Value::Value(const std::shared_ptr<const impl::FieldDesc>& desc, Value& parent)
     :Value(desc)
 {
-    // TODO ref. loop detection
     store->top->enclosing = parent.store;
 }
 
diff --git a/src/servermon.cpp b/src/servermon.cpp
index b7676ff..9d5634a 100644
--- a/src/servermon.cpp
+++ b/src/servermon.cpp
@@ -232,7 +232,6 @@ struct ServerMonitorControl : public server::MonitorControlOp
             // nope
         }
 
-        // TODO unnecessary wakeups?
         if(auto serv = server.lock())
             MonitorOp::maybeReply(serv.get(), mon);