diff --git a/src/runtime2/mod.rs b/src/runtime2/mod.rs
index ea8d309c8d8839233385c2fb61efec3fdcfa794a..a627f41c6d1ff9b47a00965c43b13e9cc8bc2b07 100644
--- a/src/runtime2/mod.rs
+++ b/src/runtime2/mod.rs
@@ -2,12 +2,12 @@
 
 mod runtime;
 mod messages;
-mod connector;
+// mod connector;
 mod branch;
 mod native;
 mod port;
 mod scheduler;
-mod inbox;
+// mod inbox;
 mod consensus;
 mod inbox2;
 
@@ -24,13 +24,11 @@ use std::thread::{self, JoinHandle};
 use crate::collections::RawVec;
 use crate::ProtocolDescription;
 
-use inbox::Message;
 use connector2::{ConnectorPDL, ConnectorPublic, ConnectorScheduling};
-use scheduler::{Scheduler, ControlMessageHandler};
+use scheduler::{Scheduler, ComponentCtxFancy, SchedulerCtx, ControlMessageHandler};
 use native::{Connector, ConnectorApplication, ApplicationInterface};
-use crate::runtime2::inbox2::MessageFancy;
-use crate::runtime2::port::{ChannelId, Port, PortState};
-use crate::runtime2::scheduler::{ComponentCtxFancy, SchedulerCtx};
+use inbox2::MessageFancy;
+use port::{ChannelId, Port, PortState};
 
 /// A kind of token that, once obtained, allows mutable access to a connector.
 /// We're trying to use move semantics as much as possible: the owner of this