diff --git a/examples/dds/fairmq-start-ex-dds.sh.in b/examples/dds/fairmq-start-ex-dds.sh.in
index dd3b7d2f..daef100c 100755
--- a/examples/dds/fairmq-start-ex-dds.sh.in
+++ b/examples/dds/fairmq-start-ex-dds.sh.in
@@ -56,7 +56,6 @@ dds-info --executing-count --wait ${requiredNofSlots}
 
 echo "------------------------"
 echo "...waiting for Topology to finish..."
-# TODO Retrieve number of devices from DDS topology API instead of having the user pass it explicitely
 fairmq-dds-command-ui -w "IDLE"
 fairmq-dds-command-ui -c i
 fairmq-dds-command-ui -c k
diff --git a/examples/n-m/fairmq-start-ex-n-m-dds.sh.in b/examples/n-m/fairmq-start-ex-n-m-dds.sh.in
index 95a09e61..e9e9ef9b 100755
--- a/examples/n-m/fairmq-start-ex-n-m-dds.sh.in
+++ b/examples/n-m/fairmq-start-ex-n-m-dds.sh.in
@@ -47,7 +47,6 @@ dds-info --executing-count --wait ${requiredNofSlots}
 
 echo "------------------------"
 echo "...waiting for Topology to finish..."
-# TODO Retrieve number of devices from DDS topology API instead of having the user pass it explicitely
 fairmq-dds-command-ui -w "IDLE"
 fairmq-dds-command-ui -c i
 fairmq-dds-command-ui -c k
diff --git a/examples/n-m/fairmq-start-ex-n-m-pair-dds.sh.in b/examples/n-m/fairmq-start-ex-n-m-pair-dds.sh.in
index 52de25e7..b3a9cd5e 100755
--- a/examples/n-m/fairmq-start-ex-n-m-pair-dds.sh.in
+++ b/examples/n-m/fairmq-start-ex-n-m-pair-dds.sh.in
@@ -47,7 +47,6 @@ dds-info --executing-count --wait ${requiredNofSlots}
 
 echo "------------------------"
 echo "...waiting for Topology to finish..."
-# TODO Retrieve number of devices from DDS topology API instead of having the user pass it explicitely
 fairmq-dds-command-ui -w "IDLE"
 fairmq-dds-command-ui -c i
 fairmq-dds-command-ui -c k
diff --git a/examples/qc/fairmq-start-ex-qc.sh.in b/examples/qc/fairmq-start-ex-qc.sh.in
index b253ddfe..57a70f32 100755
--- a/examples/qc/fairmq-start-ex-qc.sh.in
+++ b/examples/qc/fairmq-start-ex-qc.sh.in
@@ -50,7 +50,6 @@ dds-info --executing-count --wait ${requiredNofSlots}
 
 echo "------------------------"
 echo "...waiting for Topology to finish..."
-# TODO Retrieve number of devices from DDS topology API instead of having the user pass it explicitely
 fairmq-dds-command-ui -w "IDLE"
 fairmq-dds-command-ui -c i
 fairmq-dds-command-ui -c k