diff --git a/src/runtime2/native.rs b/src/runtime2/native.rs
index 92670a262990d897136c2a1317979d3d1848f258..0b8891c0696a36688f310327125984d11753f596 100644
--- a/src/runtime2/native.rs
+++ b/src/runtime2/native.rs
@@ -14,7 +14,7 @@ use super::port::{Port, PortIdLocal, Channel, PortKind};
 use super::consensus::{Consensus, Consistency, find_ports_in_value_group};
 use super::connector::{ConnectorScheduling, ConnectorPDL};
 use super::inbox::{
-    Message, DataContent, DataMessage,
+    Message, DataMessage,
     SyncCompMessage, SyncPortMessage,
     ControlContent, ControlMessage
 };
@@ -144,7 +144,7 @@ impl ConnectorApplication {
             self.consensus.notify_of_new_branch(branch_id, receiving_branch_id);
             let receiving_branch = &mut self.tree[receiving_branch_id];
 
-            receiving_branch.insert_message(message.data_header.target_port, message.content.as_message().unwrap().clone());
+            receiving_branch.insert_message(message.data_header.target_port, message.content.clone());
             self.consensus.notify_of_received_message(receiving_branch_id, &message, ctx);
 
             // And prepare the branch for running
@@ -199,7 +199,7 @@ impl ConnectorApplication {
                     let message = Message::Data(DataMessage {
                         sync_header,
                         data_header,
-                        content: DataContent::Message(content.clone()),
+                        content: content.clone(),
                     });
                     comp_ctx.submit_message(message);
                     self.tree.push_into_queue(QueueKind::Runnable, branch_id);
@@ -222,7 +222,7 @@ impl ConnectorApplication {
                             debug_assert!(receiving_branch_id.index as usize == self.branch_extra.len());
                             self.branch_extra.push(instruction_idx + 1);
 
-                            branch.insert_message(port_id, message.content.as_message().unwrap().clone());
+                            branch.insert_message(port_id, 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);