diff --git a/src/shrpx_connection_handler.cc b/src/shrpx_connection_handler.cc
index 7b862a47..e5cbe9a2 100644
--- a/src/shrpx_connection_handler.cc
+++ b/src/shrpx_connection_handler.cc
@@ -818,7 +818,7 @@ void ConnectionHandler::handle_serial_event() {
   for (auto &sev : q) {
     switch (sev.type) {
     case SEV_REPLACE_DOWNSTREAM:
-      // TODO make sure that none of worker uses
+      // Mmake sure that none of worker uses
       // get_config()->conn.downstream
       mod_config()->conn.downstream = sev.downstreamconf;
 
diff --git a/src/shrpx_http2_upstream.cc b/src/shrpx_http2_upstream.cc
index 6f7aa393..28647631 100644
--- a/src/shrpx_http2_upstream.cc
+++ b/src/shrpx_http2_upstream.cc
@@ -416,8 +416,6 @@ void Http2Upstream::initiate_downstream(Downstream *downstream) {
   auto &req = downstream->request();
   if (!req.http2_expect_body) {
     downstream->end_upload_data();
-    // TODO is this necessary?
-    handler_->signal_write();
   }
 
   return;