diff --git a/src/debug-agent.cc b/src/debug-agent.cc
index 06ede7fdef4aa9..93d2ce71f11a38 100644
--- a/src/debug-agent.cc
+++ b/src/debug-agent.cc
@@ -285,7 +285,6 @@ void Agent::ChildSignalCb(uv_async_t* signal) {
     }
 
     // Waiting for client, do not send anything just yet
-    // TODO(indutny): move this to js-land
     if (a->wait_) {
       a->messages_.PushFront(msg);  // Push message back into the ready queue.
       break;
diff --git a/src/debug-agent.h b/src/debug-agent.h
index f18683a8287f39..0c465b8e1b6996 100644
--- a/src/debug-agent.h
+++ b/src/debug-agent.h
@@ -109,7 +109,6 @@ class Agent {
     kRunning
   };
 
-  // TODO(indutny): Verify that there are no races
   State state_;
 
   int port_;
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
index 6cb79aa4b978bd..8af318791cc49a 100644
--- a/src/node_crypto.cc
+++ b/src/node_crypto.cc
@@ -5177,7 +5177,7 @@ void PBKDF2(const FunctionCallbackInfo<Value>& args) {
 
   if (args[5]->IsFunction()) {
     obj->Set(env->ondone_string(), args[5]);
-    // XXX(trevnorris): This will need to go with the rest of domains.
+
     if (env->in_domain())
       obj->Set(env->domain_string(), env->domain_array()->Get(0));
     uv_queue_work(env->event_loop(),
@@ -5338,7 +5338,7 @@ void RandomBytes(const FunctionCallbackInfo<Value>& args) {
 
   if (args[1]->IsFunction()) {
     obj->Set(FIXED_ONE_BYTE_STRING(args.GetIsolate(), "ondone"), args[1]);
-    // XXX(trevnorris): This will need to go with the rest of domains.
+
     if (env->in_domain())
       obj->Set(env->domain_string(), env->domain_array()->Get(0));
     uv_queue_work(env->event_loop(),