diff --git a/.settings/edu.umd.cs.findbugs.core.prefs b/.settings/edu.umd.cs.findbugs.core.prefs
index 9234b725770c6362e2eb6014e003b2857dee71ee..b3cb73a2792752a469e32308d406721e8c34fa7a 100644
--- a/.settings/edu.umd.cs.findbugs.core.prefs
+++ b/.settings/edu.umd.cs.findbugs.core.prefs
@@ -1,5 +1,5 @@
 #FindBugs User Preferences
-#Wed Feb 04 15:13:53 CET 2015
+#Mon Feb 09 10:32:26 CET 2015
 detector_threshold=3
 effort=max
 excludefilter0=.fbExcludeFilterFile|true
diff --git a/src/main/java/teetime/stage/Relay.java b/src/main/java/teetime/stage/Relay.java
index 7849b8b2456e723f65e8a58d330da4e4890f0bdf..7bf8e450ffafd3efd9dacc9799133ac3570c28ca 100644
--- a/src/main/java/teetime/stage/Relay.java
+++ b/src/main/java/teetime/stage/Relay.java
@@ -20,31 +20,16 @@ import teetime.framework.OutputPort;
 
 public final class Relay<T> extends AbstractConsumerStage<T> {
 
-	// private final InputPort<T> inputPort = this.createInputPort();
 	private final OutputPort<T> outputPort = this.createOutputPort();
 
-	// private AbstractInterThreadPipe cachedCastedInputPipe;
-
 	@Override
 	protected void execute(final T element) {
 		if (null == element) {
-			// if (this.cachedCastedInputPipe.getSignal() instanceof TerminatingSignal) {
-			// this.terminate();
-			// }
-			// Thread.yield();
-			// return;
-			logger.trace("relay: returnNoElement");
 			returnNoElement();
 		}
 		outputPort.send(element);
 	}
 
-	// @Override
-	// public void onStarting() throws Exception {
-	// super.onStarting();
-	// this.cachedCastedInputPipe = (AbstractInterThreadPipe) this.inputPort.getPipe();
-	// }
-
 	public OutputPort<T> getOutputPort() {
 		return outputPort;
 	}