diff --git a/src/refit/replica/mccoupling/REFITMCExecutorCouplingStage.java b/src/refit/replica/mccoupling/REFITMCExecutorCouplingStage.java
index 04487e0b7e70d5a8347e8ab5567bf5703c64ab34..eb03f7cd5b1c51e973db1bc21b411ea9d72a4e3a 100644
--- a/src/refit/replica/mccoupling/REFITMCExecutorCouplingStage.java
+++ b/src/refit/replica/mccoupling/REFITMCExecutorCouplingStage.java
@@ -10,10 +10,7 @@ import refit.replica.REFITObserver;
 import refit.replica.REFITReplicaGroups;
 import refit.replica.REFITStage;
 import refit.replica.multichannel.REFITChannelItem;
-import refit.replica.order.REFITOrderProtocol;
-import refit.replica.order.REFITOrderProtocolInstance;
-import refit.replica.order.REFITOrderProtocolTransitionInstance;
-import refit.replica.order.REFITOrderStageSlot;
+import refit.replica.order.REFITStubOrderProtocol;
 import refit.scheduler.REFITSchedulerTaskType;
 
 public class REFITMCExecutorCouplingStage extends REFITStage {
@@ -42,34 +39,7 @@ public class REFITMCExecutorCouplingStage extends REFITStage {
 		progressSender.broadcast(new REFITChannelProgress((short) 0, 0, -1, REFITConfig.MAXIMUM_EXECUTION_INSTANCES_IN_PROGRESS));
 
 		// send configuration notification with stub protocol to execution
-		configSender.broadcast(new REFITConfigurationNotification(
-				new REFITOrderProtocol() {
-					@Override
-					public REFITOrderProtocolInstance createInstance(REFITOrderStageSlot slot) {
-						throw new UnsupportedOperationException("Nope");
-					}
-
-					@Override
-					public REFITOrderProtocolTransitionInstance createTransitionInstance(REFITOrderStageSlot slot) {
-						throw new UnsupportedOperationException("Nope");
-					}
-
-					@Override
-					public boolean useLightweightCheckpoints() {
-						return false;
-					}
-
-					@Override
-					public boolean hasCheckpointRecipients() {
-						return true;
-					}
-
-					@Override
-					public boolean hasUpdateRecipients() {
-						return false;
-					}
-				}, -1, -1)
-		);
+		configSender.broadcast(new REFITConfigurationNotification(new REFITStubOrderProtocol(), -1, -1));
 	}
 
 	@Override
diff --git a/src/refit/replica/order/REFITStubOrderProtocol.java b/src/refit/replica/order/REFITStubOrderProtocol.java
new file mode 100644
index 0000000000000000000000000000000000000000..5d491fd174f529955d550778913045940c0128e0
--- /dev/null
+++ b/src/refit/replica/order/REFITStubOrderProtocol.java
@@ -0,0 +1,28 @@
+package refit.replica.order;
+
+public class REFITStubOrderProtocol extends REFITOrderProtocol {
+	@Override
+	public REFITOrderProtocolInstance createInstance(REFITOrderStageSlot slot) {
+		throw new UnsupportedOperationException("Nope");
+	}
+
+	@Override
+	public REFITOrderProtocolTransitionInstance createTransitionInstance(REFITOrderStageSlot slot) {
+		throw new UnsupportedOperationException("Nope");
+	}
+
+	@Override
+	public boolean useLightweightCheckpoints() {
+		return false;
+	}
+
+	@Override
+	public boolean hasCheckpointRecipients() {
+		return true;
+	}
+
+	@Override
+	public boolean hasUpdateRecipients() {
+		return false;
+	}
+}
diff --git a/src/refit/replica/stewardorder/REFITStewardOrderStage.java b/src/refit/replica/stewardorder/REFITStewardOrderStage.java
index 21d85f1b8b3a8b3704fb975ac66263aac8493f8e..758303c2649176378c152a4b673638e2974f49c3 100644
--- a/src/refit/replica/stewardorder/REFITStewardOrderStage.java
+++ b/src/refit/replica/stewardorder/REFITStewardOrderStage.java
@@ -13,10 +13,7 @@ import refit.message.REFITOrderRequest;
 import refit.replica.REFITBaseReplica;
 import refit.replica.REFITObserver;
 import refit.replica.REFITStage;
-import refit.replica.order.REFITOrderProtocol;
-import refit.replica.order.REFITOrderProtocolInstance;
-import refit.replica.order.REFITOrderProtocolTransitionInstance;
-import refit.replica.order.REFITOrderStageSlot;
+import refit.replica.order.REFITStubOrderProtocol;
 import refit.replica.stewardorder.REFITStewardOrderMessages.REFITStewardAccept;
 import refit.replica.stewardorder.REFITStewardOrderMessages.REFITStewardAcceptShare;
 import refit.replica.stewardorder.REFITStewardOrderMessages.REFITStewardProposal;
@@ -68,34 +65,7 @@ public class REFITStewardOrderStage extends REFITStage {
 	@Override
 	public void init() {
 		// send configuration notification with stub protocol to execution
-		configSender.broadcast(new REFITConfigurationNotification(
-				new REFITOrderProtocol() {
-					@Override
-					public REFITOrderProtocolInstance createInstance(REFITOrderStageSlot slot) {
-						throw new UnsupportedOperationException("Nope");
-					}
-
-					@Override
-					public REFITOrderProtocolTransitionInstance createTransitionInstance(REFITOrderStageSlot slot) {
-						throw new UnsupportedOperationException("Nope");
-					}
-
-					@Override
-					public boolean useLightweightCheckpoints() {
-						return false;
-					}
-
-					@Override
-					public boolean hasCheckpointRecipients() {
-						return true;
-					}
-
-					@Override
-					public boolean hasUpdateRecipients() {
-						return false;
-					}
-				}, -1, -1)
-		);
+		configSender.broadcast(new REFITConfigurationNotification(new REFITStubOrderProtocol(), -1, -1));
 	}
 
 	@Override