diff --git a/src/runtime2/connector.rs b/src/runtime2/connector.rs
index 0407db8aa68a774673bd42935987886773a78196..38250412efb892714887391c708e79c51977df4c 100644
--- a/src/runtime2/connector.rs
+++ b/src/runtime2/connector.rs
@@ -33,13 +33,10 @@ use crate::{PortId, ProtocolDescription};
 use crate::common::ComponentState;
 use crate::protocol::eval::{EvalContinuation, EvalError, Prompt, Value, ValueGroup};
 use crate::protocol::{RunContext, RunResult};
-use crate::runtime2::branch::PreparedStatement;
-use crate::runtime2::consensus::RoundConclusion;
-use crate::runtime2::inbox::SyncPortMessage;
 
-use super::branch::{BranchId, ExecTree, QueueKind, SpeculativeState};
-use super::consensus::{Consensus, Consistency, find_ports_in_value_group};
-use super::inbox::{DataMessage, DataContent, Message, SyncCompMessage, PublicInbox};
+use super::branch::{BranchId, ExecTree, QueueKind, SpeculativeState, PreparedStatement};
+use super::consensus::{Consensus, Consistency, RoundConclusion, find_ports_in_value_group};
+use super::inbox::{DataMessage, Message, SyncCompMessage, SyncPortMessage, PublicInbox};
 use super::native::Connector;
 use super::port::{PortKind, PortIdLocal};
 use super::scheduler::{ComponentCtx, SchedulerCtx};
@@ -228,7 +225,7 @@ impl ConnectorPDL {
 
             debug_assert!(receiving_branch.awaiting_port == message.data_header.target_port);
             receiving_branch.awaiting_port = PortIdLocal::new_invalid();
-            receiving_branch.prepared = PreparedStatement::PerformedGet(message.content.as_message().unwrap().clone());
+            receiving_branch.prepared = PreparedStatement::PerformedGet(message.content.clone());
             self.consensus.notify_of_received_message(receiving_branch_id, &message, ctx);
 
             // And prepare the branch for running
@@ -326,7 +323,7 @@ impl ConnectorPDL {
                         let receiving_branch_id = self.tree.fork_branch(branch_id);
                         let branch = &mut self.tree[receiving_branch_id];
                         branch.awaiting_port = PortIdLocal::new_invalid();
-                        branch.prepared = PreparedStatement::PerformedGet(message.content.as_message().unwrap().clone());
+                        branch.prepared = PreparedStatement::PerformedGet(message.content.clone());
 
                         self.consensus.notify_of_new_branch(branch_id, receiving_branch_id);
                         self.consensus.notify_of_received_message(receiving_branch_id, &message, comp_ctx);
@@ -370,7 +367,7 @@ impl ConnectorPDL {
                 let (sync_header, data_header) = self.consensus.handle_message_to_send(branch_id, port_id, &content, comp_ctx);
                 if let Err(_) = comp_ctx.submit_message(Message::Data(DataMessage {
                     sync_header, data_header,
-                    content: DataContent::Message(content),
+                    content,
                 })) {
                     // We don't own the port
                     let pd = &sched_ctx.runtime.protocol_description;
@@ -500,7 +497,6 @@ impl ConnectorPDL {
             return ConnectorScheduling::Immediate;
         } else {
             // No final branch, because we're supposed to exit!
-            panic!("TEMPTEMP: NOOOOOOOOO 1");
             self.last_finished_handled = None;
             self.mode = Mode::Error;
             return ConnectorScheduling::Exit;