diff --git a/src/runtime2/connector.rs b/src/runtime2/connector.rs
index 62d8485b808bf218348168b754d3be9965cefb34..7705f4569af80e9519147c0bce2d6a763eb7d0c6 100644
--- a/src/runtime2/connector.rs
+++ b/src/runtime2/connector.rs
@@ -517,15 +517,6 @@ impl ConnectorPDL {
             RoundConclusion::Failure => None,
         };
 
-        // TODO: Hack
-        ctx.remove_messages(|m| match m {
-            Message::Data(_) | Message::SyncPort(_) | Message::SyncControl(_) | Message::Control(_) => false,
-            Message::SyncComp(m) => match m.content {
-                SyncCompContent::Notification | SyncCompContent::Presence(_) => true,
-                _ => false,
-            }
-        });
-
         if let Some(solution_branch_id) = final_branch_id {
             let mut fake_vec = Vec::new();
             self.tree.end_sync(solution_branch_id);