diff --git a/src/runtime2/scheduler.rs b/src/runtime2/scheduler.rs
index e4a3d4d6cefef1cf9392a792a80778a67e54a0fe..6f1e70631389c68c8e28119649d77b76aff2bceb 100644
--- a/src/runtime2/scheduler.rs
+++ b/src/runtime2/scheduler.rs
@@ -277,10 +277,7 @@ impl Scheduler {
                     // may end up being rerouted.
                     let port_desc = scheduled.ctx.get_port_by_id(content.data_header.sending_port).unwrap();
                     debug_assert_eq!(port_desc.peer_id, content.data_header.target_port);
-
-                    if port_desc.state == PortState::Closed {
-                        todo!("handle sending over a closed port")
-                    }
+                    debug_assert_eq!(port_desc.state, PortState::Open); // checked when adding to context
 
                     (port_desc.peer_connector, true)
                 },
@@ -294,9 +291,7 @@ impl Scheduler {
                 Message::SyncPort(content) => {
                     let port_desc = scheduled.ctx.get_port_by_id(content.source_port).unwrap();
                     debug_assert_eq!(port_desc.peer_id, content.target_port);
-                    if port_desc.state == PortState::Closed {
-                        todo!("handle sending over a closed port")
-                    }
+                    debug_assert_eq!(port_desc.state, PortState::Open); // checked when adding to context
 
                     (port_desc.peer_connector, true)
                 },
@@ -415,7 +410,6 @@ impl Scheduler {
         }
     }
 
-    // TODO: Remove, this is debugging stuff
     fn debug(&self, message: &str) {
         println!("DEBUG [thrd:{:02} conn:  ]: {}", self.scheduler_id, message);
     }