diff --git a/include/aws/io/event_loop.h b/include/aws/io/event_loop.h
index e021ab4b5..09b534554 100644
--- a/include/aws/io/event_loop.h
+++ b/include/aws/io/event_loop.h
@@ -204,7 +204,7 @@ struct aws_event_loop *aws_event_loop_new_default_with_options(
     struct aws_allocator *alloc,
     const struct aws_event_loop_options *options);
 
-// DEBUG WIP We should expose or condense all these def specific function APIs and not make them
+// TODO: We should expose or condense all these def specific function APIs and not make them
 // defined specific. Consolidation of them should work and branched logic within due to all the
 // arguments being the same. Let's move away from different API based on framework and instead
 // raise an unsupported platform error or simply use branching in implementation.
diff --git a/tests/channel_test.c b/tests/channel_test.c
index e63bc514b..e7528fe90 100644
--- a/tests/channel_test.c
+++ b/tests/channel_test.c
@@ -837,7 +837,7 @@ static int s_test_channel_connect_some_hosts_timeout(struct aws_allocator *alloc
 
     aws_io_library_clean_up();
 
-    // DEBUG WIP, sleep to wait for reference release
+    // sleep to wait for reference release
     aws_thread_current_sleep(1000000000);
 
     return 0;
diff --git a/tests/socket_test.c b/tests/socket_test.c
index adc3986ce..d45c8a445 100644
--- a/tests/socket_test.c
+++ b/tests/socket_test.c
@@ -402,7 +402,7 @@ static int s_test_socket_ex(
 
     aws_event_loop_destroy(event_loop);
 
-    // DEBUG WIP, sleep to wait for reference release
+    // wait for socket ref count drop and released
     aws_thread_current_sleep(1000000000);
 
     return 0;
@@ -440,7 +440,7 @@ static int s_test_socket_udp_dispatch_queue(
 
     ASSERT_SUCCESS(aws_socket_listen(&listener, 1024));
     ASSERT_SUCCESS(aws_socket_start_accept(&listener, event_loop, s_local_listener_incoming, &listener_args));
-    // DEBUG WIP, sleep to wait for reference release
+    // wait for incoming listener come back
     aws_thread_current_sleep(1000000000);
 
     struct local_outgoing_args outgoing_args = {
@@ -581,7 +581,7 @@ static int s_test_socket_udp_dispatch_queue(
 
     aws_event_loop_destroy(event_loop);
 
-    // DEBUG WIP, sleep to wait for reference release
+    // wait for socket ref count drop and released
     aws_thread_current_sleep(5000000000);
 
     return 0;
@@ -1616,7 +1616,7 @@ static int s_cleanup_in_accept_doesnt_explode(struct aws_allocator *allocator, v
     aws_socket_clean_up(&outgoing);
     aws_event_loop_destroy(event_loop);
 
-    // DEBUG WIP, sleep to wait for reference release
+    // wait for socket ref count drop and released
     aws_thread_current_sleep(1000000000);
 
     return 0;
@@ -1761,7 +1761,7 @@ static int s_cleanup_in_write_cb_doesnt_explode(struct aws_allocator *allocator,
     aws_socket_clean_up(&listener);
     aws_event_loop_destroy(event_loop);
 
-    // DEBUG WIP, sleep to wait for reference release
+    // wait for socket ref count drop and released
     aws_thread_current_sleep(1000000000);
 
     return 0;
diff --git a/tests/tls_handler_test.c b/tests/tls_handler_test.c
index b3857a79a..0fbd4a325 100644
--- a/tests/tls_handler_test.c
+++ b/tests/tls_handler_test.c
@@ -196,7 +196,7 @@ static int s_tls_common_tester_clean_up(struct tls_common_tester *tester) {
 
     aws_condition_variable_clean_up(&tester->condition_variable);
     aws_mutex_clean_up(&tester->mutex);
-    // DEBUG WIP, sleep to wait for reference release
+    // wait for socket ref count drop and released
     aws_thread_current_sleep(1000000000);
 
     return AWS_OP_SUCCESS;