diff --git a/devices/clients/tcp_replicator.py b/devices/clients/tcp_replicator.py
index ce3ba0d3baa713045d5967c36c39b474eadd51a5..b9738ee26113c84fbaa3e4bab3ca8145ea2208c9 100644
--- a/devices/clients/tcp_replicator.py
+++ b/devices/clients/tcp_replicator.py
@@ -140,8 +140,8 @@ class TCPReplicator(Thread, StatisticsClientThread):
             # Create the event loop, must be done in the new thread
             self._loop = asyncio.new_event_loop()
 
-            # TODO(Corne): REMOVE ME
-            self._loop.set_debug(True)
+            # When wanting to debug event loop behavior, uncomment this
+            # self._loop.set_debug(True)
 
             # Schedule the task to create the server
             self._loop.create_task(TCPReplicator._run_server(
diff --git a/devices/integration_test/client/test_tcp_replicator.py b/devices/integration_test/client/test_tcp_replicator.py
index 2bac9356a1623d63225b9545c1151ed29e5aef8f..440aa43f5670ff56144b3dbf2487d3edf35a7a82 100644
--- a/devices/integration_test/client/test_tcp_replicator.py
+++ b/devices/integration_test/client/test_tcp_replicator.py
@@ -16,8 +16,6 @@ from clients.tcp_replicator import TCPReplicator
 
 from integration_test import base
 
-import timeout_decorator
-
 logger = logging.getLogger()
 
 
@@ -36,9 +34,6 @@ class TestTCPReplicator(base.IntegrationTestCase):
 
         replicator = TCPReplicator(test_options)
 
-    def test_start_except(self):
-
-
     def test_start_transmit_empty_stop(self):
         """Test transmitting without clients"""