diff --git a/src/main/java/teetime/framework/Analysis.java b/src/main/java/teetime/framework/Analysis.java
index 20b9a4feb8f930c97893d4bb9be3efd28c9ad4dd..ab2a1d2c6d2835e0bdba69fe245a04c7b9ca9f73 100644
--- a/src/main/java/teetime/framework/Analysis.java
+++ b/src/main/java/teetime/framework/Analysis.java
@@ -70,8 +70,6 @@ public final class Analysis<T extends AnalysisConfiguration> implements Uncaught
 		this(configuration, false, new IgnoringExceptionListenerFactory());
 	}
 
-	@SuppressWarnings("PMD.ConstructorCallsOverridableMethod")
-	// TODO remove @SuppressWarnings if init is no longer deprecated
 	public Analysis(final T configuration, final boolean validationEnabled) {
 		this(configuration, validationEnabled, new IgnoringExceptionListenerFactory());
 	}
diff --git a/src/main/java/teetime/framework/AnalysisConfiguration.java b/src/main/java/teetime/framework/AnalysisConfiguration.java
index b3e03a72715b92a7d7f6e93d669956ed84d9a94e..7ffc7235585ecbcdb24cedd78ad507553896d1d8 100644
--- a/src/main/java/teetime/framework/AnalysisConfiguration.java
+++ b/src/main/java/teetime/framework/AnalysisConfiguration.java
@@ -32,15 +32,19 @@ public abstract class AnalysisConfiguration {
 
 	private final List<Stage> threadableStageJobs = new LinkedList<Stage>();
 
+	private static final PipeFactoryRegistry PIPE_FACTORY_REGISTRY = PipeFactoryRegistry.INSTANCE;
+
 	/**
-	 * Can be used by subclasses, to obtain pipe factories
+	 * Can be used by subclasses, to connect stages
 	 */
-	@Deprecated
-	// TODO: set private
-	protected static final PipeFactoryRegistry PIPE_FACTORY_REGISTRY = PipeFactoryRegistry.INSTANCE;
-
 	private final static IPipeFactory intraThreadFactory = PIPE_FACTORY_REGISTRY.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false);
+	/**
+	 * Can be used by subclasses, to connect stages
+	 */
 	private final static IPipeFactory interBoundedThreadFactory = PIPE_FACTORY_REGISTRY.getPipeFactory(ThreadCommunication.INTER, PipeOrdering.QUEUE_BASED, false);
+	/**
+	 * Can be used by subclasses, to connect stages
+	 */
 	private final static IPipeFactory interUnboundedThreadFactory = PIPE_FACTORY_REGISTRY.getPipeFactory(ThreadCommunication.INTER, PipeOrdering.QUEUE_BASED, true);
 
 	List<Stage> getThreadableStageJobs() {
diff --git a/src/main/java/teetime/framework/pipe/DummyPipe.java b/src/main/java/teetime/framework/pipe/DummyPipe.java
index d02ab75b63e31e62d93cc7de3f058ca50c1b9012..23031fe477fcca371ecca1ba43dbfc73a9527c62 100644
--- a/src/main/java/teetime/framework/pipe/DummyPipe.java
+++ b/src/main/java/teetime/framework/pipe/DummyPipe.java
@@ -73,25 +73,21 @@ public final class DummyPipe implements IPipe {
 
 	@Override
 	public boolean isClosed() {
-		// TODO Auto-generated method stub
 		return false;
 	}
 
 	@Override
 	public boolean hasMore() {
-		// TODO Auto-generated method stub
 		return false;
 	}
 
 	@Override
 	public void waitForStartSignal() throws InterruptedException {
-		// TODO Auto-generated method stub
 
 	}
 
 	@Override
 	public void close() {
-		// TODO Auto-generated method stub
 
 	}
 
diff --git a/src/main/java/teetime/stage/basic/AbstractTrigger.java b/src/main/java/teetime/stage/basic/AbstractTrigger.java
index af2bf37880b84b34194e6c45c697af3beadc539e..1e25aa25da2992d63a9078238d05c6a7a264fee0 100644
--- a/src/main/java/teetime/stage/basic/AbstractTrigger.java
+++ b/src/main/java/teetime/stage/basic/AbstractTrigger.java
@@ -33,14 +33,7 @@ abstract class AbstractTrigger<I, T, O> extends AbstractStage {
 	// disabled while in development
 	@Override
 	protected void executeStage() {
-		// TODO Auto-generated method stub
 
 	}
 
-	@Override
-	public void onTerminating() throws Exception {
-		// TODO Auto-generated method stub
-		super.onTerminating();
-	}
-
 }
diff --git a/src/site/markdown/wiki b/src/site/markdown/wiki
index 0e4474577e1f49bc96e734c286b2d9e0363895e8..bb53dfd7de974a433a7b96b0b65f4aacb8da3df3 160000
--- a/src/site/markdown/wiki
+++ b/src/site/markdown/wiki
@@ -1 +1 @@
-Subproject commit 0e4474577e1f49bc96e734c286b2d9e0363895e8
+Subproject commit bb53dfd7de974a433a7b96b0b65f4aacb8da3df3
diff --git a/src/test/java/teetime/stage/basic/merger/MergerTestingPipe.java b/src/test/java/teetime/stage/basic/merger/MergerTestingPipe.java
index 1499b91c2f3450547b9ef7df15f60bdbefaed94d..afbc6561b5acb64babb446f5cba1893ca5f1f53a 100644
--- a/src/test/java/teetime/stage/basic/merger/MergerTestingPipe.java
+++ b/src/test/java/teetime/stage/basic/merger/MergerTestingPipe.java
@@ -63,60 +63,48 @@ public class MergerTestingPipe implements IPipe {
 
 	@Override
 	public boolean isEmpty() {
-		// TODO Auto-generated method stub
 		return false;
 	}
 
 	@Override
 	public int size() {
-		// TODO Auto-generated method stub
 		return 0;
 	}
 
 	@Override
 	public Object removeLast() {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
 	@Override
 	public InputPort<?> getTargetPort() {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
 	@Override
 	public <T> void connectPorts(final OutputPort<? extends T> sourcePort, final InputPort<T> targetPort) {
-		// TODO Auto-generated method stub
 
 	}
 
 	@Override
 	public void reportNewElement() {
-		// TODO Auto-generated method stub
 
 	}
 
 	@Override
 	public boolean isClosed() {
-		// TODO Auto-generated method stub
 		return false;
 	}
 
 	@Override
 	public boolean hasMore() {
-		// TODO Auto-generated method stub
 		return false;
 	}
 
 	@Override
-	public void waitForStartSignal() throws InterruptedException {
-		// TODO Auto-generated method stub
-	}
+	public void waitForStartSignal() throws InterruptedException {}
 
 	@Override
-	public void close() {
-		// TODO Auto-generated method stub
-	}
+	public void close() {}
 
 }