diff --git a/src/main/java/teetime/framework/Pipeline.java b/src/main/java/teetime/framework/Pipeline.java
index 2c54f98de4704c8fa73a6c39c568237509184a20..f818703d477586c8feda385281aa0c24b1e4953b 100644
--- a/src/main/java/teetime/framework/Pipeline.java
+++ b/src/main/java/teetime/framework/Pipeline.java
@@ -31,8 +31,7 @@ public final class Pipeline<L extends Stage> extends AbstractCompositeStage {
 	private final Stage firstStage;
 	private final List<L> lastStages = new LinkedList<L>();
 
-	public Pipeline(final Stage firstStage, final L lastStage, final ConfigurationContext context) {
-		super(context);
+	public Pipeline(final Stage firstStage, final L lastStage) {
 		this.firstStage = firstStage;
 		this.lastStages.add(lastStage);
 	}
diff --git a/src/main/java/teetime/stage/io/filesystem/format/binary/DirWithBin2RecordFilter.java b/src/main/java/teetime/stage/io/filesystem/format/binary/DirWithBin2RecordFilter.java
index 85fb5f2c04f516f318977198afd684f800edd126..bed16b27225276be0c940dafd871d4a22cf79641 100644
--- a/src/main/java/teetime/stage/io/filesystem/format/binary/DirWithBin2RecordFilter.java
+++ b/src/main/java/teetime/stage/io/filesystem/format/binary/DirWithBin2RecordFilter.java
@@ -18,7 +18,6 @@ package teetime.stage.io.filesystem.format.binary;
 import java.io.File;
 
 import teetime.framework.AbstractCompositeStage;
-import teetime.framework.ConfigurationContext;
 import teetime.framework.InputPort;
 import teetime.framework.OutputPort;
 import teetime.framework.Stage;
@@ -35,12 +34,11 @@ public class DirWithBin2RecordFilter extends AbstractCompositeStage {
 
 	private ClassNameRegistryRepository classNameRegistryRepository;
 
-	public DirWithBin2RecordFilter(final ConfigurationContext context) {
-		this(null, context);
+	public DirWithBin2RecordFilter() {
+		this(null);
 	}
 
-	public DirWithBin2RecordFilter(final ClassNameRegistryRepository classNameRegistryRepository, final ConfigurationContext context) {
-		super(context);
+	public DirWithBin2RecordFilter(final ClassNameRegistryRepository classNameRegistryRepository) {
 		this.classNameRegistryRepository = classNameRegistryRepository;
 
 		classNameRegistryCreationFilter = new ClassNameRegistryCreationFilter(classNameRegistryRepository);
diff --git a/src/performancetest/java/teetime/examples/traceReading/TcpTraceLoggingExtAnalysisConfiguration.java b/src/performancetest/java/teetime/examples/traceReading/TcpTraceLoggingExtAnalysisConfiguration.java
index 65bacfb63b04ac65228dacd905b93c4239d0877d..5b8c52a0f239212cf69e7806d473115e78ff9af9 100644
--- a/src/performancetest/java/teetime/examples/traceReading/TcpTraceLoggingExtAnalysisConfiguration.java
+++ b/src/performancetest/java/teetime/examples/traceReading/TcpTraceLoggingExtAnalysisConfiguration.java
@@ -53,7 +53,7 @@ public class TcpTraceLoggingExtAnalysisConfiguration extends Configuration {
 
 		connectPorts(clockStage.getOutputPort(), distributor.getInputPort());
 
-		return new Pipeline<Distributor<Long>>(clockStage, distributor, getContext());
+		return new Pipeline<Distributor<Long>>(clockStage, distributor);
 	}
 
 	private Stage buildTcpPipeline(final Distributor<Long> previousClockStage) {
diff --git a/src/performancetest/java/teetime/examples/traceReconstruction/TcpTraceReconstructionConf.java b/src/performancetest/java/teetime/examples/traceReconstruction/TcpTraceReconstructionConf.java
index 68f8434a10f39ad3b211660e67a8190e7130ed3e..b5e54e10ae5c2c5496b0143b2ca3b3a686905c91 100644
--- a/src/performancetest/java/teetime/examples/traceReconstruction/TcpTraceReconstructionConf.java
+++ b/src/performancetest/java/teetime/examples/traceReconstruction/TcpTraceReconstructionConf.java
@@ -70,7 +70,7 @@ public class TcpTraceReconstructionConf extends Configuration {
 
 		connectPorts(clock.getOutputPort(), distributor.getInputPort());
 
-		return new Pipeline<Distributor<Long>>(clock, distributor, getContext());
+		return new Pipeline<Distributor<Long>>(clock, distributor);
 	}
 
 	private Stage buildPipeline(final Distributor<Long> clockStage, final Distributor<Long> clock2Stage) {
diff --git a/src/performancetest/java/teetime/examples/traceReconstructionWithThreads/TcpTraceReconstructionAnalysisWithThreadsConfiguration.java b/src/performancetest/java/teetime/examples/traceReconstructionWithThreads/TcpTraceReconstructionAnalysisWithThreadsConfiguration.java
index 9d523f38036fdb10eb03581fcc99be865618cca4..b7ca516ce5358d383dc223a81617117afc700591 100644
--- a/src/performancetest/java/teetime/examples/traceReconstructionWithThreads/TcpTraceReconstructionAnalysisWithThreadsConfiguration.java
+++ b/src/performancetest/java/teetime/examples/traceReconstructionWithThreads/TcpTraceReconstructionAnalysisWithThreadsConfiguration.java
@@ -112,7 +112,7 @@ public class TcpTraceReconstructionAnalysisWithThreadsConfiguration extends Conf
 
 		connectPorts(tcpReader.getOutputPort(), distributor.getInputPort());
 
-		return new Pipeline<Distributor<IMonitoringRecord>>(tcpReader, distributor, getContext());
+		return new Pipeline<Distributor<IMonitoringRecord>>(tcpReader, distributor);
 	}
 
 	private Pipeline<Distributor<Long>> buildClockPipeline(final long intervalDelayInMs) {
@@ -123,7 +123,7 @@ public class TcpTraceReconstructionAnalysisWithThreadsConfiguration extends Conf
 
 		connectPorts(clock.getOutputPort(), distributor.getInputPort());
 
-		return new Pipeline<Distributor<Long>>(clock, distributor, getContext());
+		return new Pipeline<Distributor<Long>>(clock, distributor);
 	}
 
 	private static class StageFactory<T extends AbstractStage> {
diff --git a/src/performancetest/java/teetime/examples/traceReductionWithThreads/TcpTraceReductionAnalysisWithThreadsConfiguration.java b/src/performancetest/java/teetime/examples/traceReductionWithThreads/TcpTraceReductionAnalysisWithThreadsConfiguration.java
index dd7f1885b6ce39f85062eaa21104a16d19de0d7b..1f4a36bbd80280b948d2ad48da46e765ea34dbb7 100644
--- a/src/performancetest/java/teetime/examples/traceReductionWithThreads/TcpTraceReductionAnalysisWithThreadsConfiguration.java
+++ b/src/performancetest/java/teetime/examples/traceReductionWithThreads/TcpTraceReductionAnalysisWithThreadsConfiguration.java
@@ -108,7 +108,7 @@ public class TcpTraceReductionAnalysisWithThreadsConfiguration extends Configura
 
 		connectPorts(tcpReader.getOutputPort(), distributor.getInputPort());
 
-		return new Pipeline<Distributor<IMonitoringRecord>>(tcpReader, distributor, getContext());
+		return new Pipeline<Distributor<IMonitoringRecord>>(tcpReader, distributor);
 	}
 
 	private Pipeline<Distributor<Long>> buildClockPipeline(final long intervalDelayInMs) {
@@ -119,7 +119,7 @@ public class TcpTraceReductionAnalysisWithThreadsConfiguration extends Configura
 
 		connectPorts(clock.getOutputPort(), distributor.getInputPort());
 
-		return new Pipeline<Distributor<Long>>(clock, distributor, getContext());
+		return new Pipeline<Distributor<Long>>(clock, distributor);
 	}
 
 	private static class StageFactory<T extends AbstractStage> {