diff --git a/server/services/mqtt_brokers_service.go b/server/services/mqtt_brokers_service.go
index 093de8b..6e89a3e 100644
--- a/server/services/mqtt_brokers_service.go
+++ b/server/services/mqtt_brokers_service.go
@@ -202,9 +202,6 @@ func (s *MQTTBrokersService) EnsureListeners() {
 		return
 	}
 
-	// TODO: This needs to be refreshed when a new broker is added or a broker is updated
-	// TODO: Save all the coroutines and stop them when the server is stopped
-
 	s.MqttWaitGroup = &sync.WaitGroup{}
 
 	for _, broker := range brokers {