diff --git a/.settings/edu.umd.cs.findbugs.core.prefs b/.settings/edu.umd.cs.findbugs.core.prefs
index d8e404f24575b4df84b5ea513ee2919ea6f743f5..f9c5ef79c6b0648d79582b8e009c8a9119e3114b 100644
--- a/.settings/edu.umd.cs.findbugs.core.prefs
+++ b/.settings/edu.umd.cs.findbugs.core.prefs
@@ -1,5 +1,5 @@
 #FindBugs User Preferences
-#Fri Dec 05 08:18:05 CET 2014
+#Fri Dec 05 15:14:55 CET 2014
 detector_threshold=3
 effort=max
 excludefilter0=.fbExcludeFilterFile|true
diff --git a/src/main/java/teetime/stage/className/ClassNameRegistryCreationFilter.java b/src/main/java/teetime/stage/className/ClassNameRegistryCreationFilter.java
index e8c3a29b251eacb7d64da5f63f882342abfe0b5e..ddd9c5364f93565f8b1e6bf14106dfe3544483d9 100644
--- a/src/main/java/teetime/stage/className/ClassNameRegistryCreationFilter.java
+++ b/src/main/java/teetime/stage/className/ClassNameRegistryCreationFilter.java
@@ -61,7 +61,7 @@ public class ClassNameRegistryCreationFilter extends AbstractConsumerStage<File>
 		try {
 			final ClassNameRegistry classNameRegistry = this.mappingFileParser.parseFromStream(new FileInputStream(mappingFile));
 			this.classNameRegistryRepository.put(inputDir, classNameRegistry);
-			this.send(this.outputPort, inputDir);
+			outputPort.send(inputDir);
 
 			// final String filePrefix = this.mappingFileParser.getFilePrefixFromMappingFile(mappingFile);
 			// context.put(this.filePrefixOutputPort, filePrefix); // TODO pass prefix
diff --git a/src/main/java/teetime/stage/explorviz/KiekerRecordTcpReader.java b/src/main/java/teetime/stage/explorviz/KiekerRecordTcpReader.java
index 8fc450e755952b733cdfb663226189815f184393..beb743eb4dabba1ea40441251ac6502a367ce36d 100644
--- a/src/main/java/teetime/stage/explorviz/KiekerRecordTcpReader.java
+++ b/src/main/java/teetime/stage/explorviz/KiekerRecordTcpReader.java
@@ -181,7 +181,7 @@ public class KiekerRecordTcpReader extends AbstractProducerStage<IMonitoringReco
 		}
 
 		final IMonitoringRecord record = new BeforeOperationEvent(timestamp, traceId, orderIndex, operation, clazz);
-		this.send(this.outputPort, record);
+		outputPort.send(record);
 	}
 
 	private final void readInAfterOperationEvent(final ByteBuffer buffer) {
@@ -190,7 +190,7 @@ public class KiekerRecordTcpReader extends AbstractProducerStage<IMonitoringReco
 		final int orderIndex = buffer.getInt();
 
 		final IMonitoringRecord record = new AfterOperationEvent(timestamp, traceId, orderIndex, null, null);
-		this.send(this.outputPort, record);
+		outputPort.send(record);
 	}
 
 	private final void putInWaitingMessages(final ByteBuffer buffer, final int length) {
diff --git a/src/main/java/teetime/stage/io/database/DbReader.java b/src/main/java/teetime/stage/io/database/DbReader.java
index 3c3d6648c0615bf0c6945cb99b414b71e56539eb..c9f1972b6cb70724077c97535f8b631dbb049cdd 100644
--- a/src/main/java/teetime/stage/io/database/DbReader.java
+++ b/src/main/java/teetime/stage/io/database/DbReader.java
@@ -173,7 +173,7 @@ public class DbReader extends AbstractProducerStage<IMonitoringRecord> {
 					}
 					final IMonitoringRecord record = AbstractMonitoringRecord.createFromArray(clazz, recordValues);
 					record.setLoggingTimestamp(records.getLong(2));
-					this.send(this.outputPort, record);
+					outputPort.send(record);
 				}
 			} finally {
 				if (records != null) {
diff --git a/src/main/java/teetime/stage/io/filesystem/format/binary/file/BinaryFile2RecordFilter.java b/src/main/java/teetime/stage/io/filesystem/format/binary/file/BinaryFile2RecordFilter.java
index 7967005050b7dc0a58172a5c90e90f51e0aa93e3..7e3b3738aaed3280b28f7056285b3a8c64785301 100644
--- a/src/main/java/teetime/stage/io/filesystem/format/binary/file/BinaryFile2RecordFilter.java
+++ b/src/main/java/teetime/stage/io/filesystem/format/binary/file/BinaryFile2RecordFilter.java
@@ -79,7 +79,7 @@ public class BinaryFile2RecordFilter extends AbstractConsumerStage<File> {
 			try {
 				IMonitoringRecord record = this.recordFromBinaryFileCreator.createRecordFromBinaryFile(binaryFile, in);
 				while (record != null) {
-					this.send(this.outputPort, record);
+					outputPort.send(record);
 					record = this.recordFromBinaryFileCreator.createRecordFromBinaryFile(binaryFile, in);
 				}
 			} catch (final MonitoringRecordException e) {
diff --git a/src/main/java/teetime/stage/io/filesystem/format/text/file/TextLine2RecordFilter.java b/src/main/java/teetime/stage/io/filesystem/format/text/file/TextLine2RecordFilter.java
index a165b77a1fae7f4f29f8258375f6eb1ede21d36a..b7cec8742ae76524a9dcfc4bdef4f17e84774851 100644
--- a/src/main/java/teetime/stage/io/filesystem/format/text/file/TextLine2RecordFilter.java
+++ b/src/main/java/teetime/stage/io/filesystem/format/text/file/TextLine2RecordFilter.java
@@ -81,7 +81,7 @@ public class TextLine2RecordFilter extends AbstractConsumerStage<TextLine> {
 	protected void execute(final TextLine textLine) {
 		try {
 			final IMonitoringRecord record = this.recordFromTextLineCreator.createRecordFromLine(textLine.getTextFile(), textLine.getTextLine());
-			this.send(this.outputPort, record);
+			outputPort.send(record);
 		} catch (final MonitoringRecordException e) {
 			this.logger.error("Could not create record from text line: '" + textLine + "'", e);
 		} catch (final IllegalRecordFormatException e) {
diff --git a/src/main/java/teetime/stage/io/network/TcpReader.java b/src/main/java/teetime/stage/io/network/TcpReader.java
index ac6575edb7fec5f22642580d34870a65a7fd7aae..668234f541a4062ab88f30a2e74bd0f71745aa93 100644
--- a/src/main/java/teetime/stage/io/network/TcpReader.java
+++ b/src/main/java/teetime/stage/io/network/TcpReader.java
@@ -85,7 +85,7 @@ public class TcpReader extends AbstractTcpReader<IMonitoringRecord> {
 			IMonitoringRecord record = recordFactory.create(buffer, this.stringRegistry);
 			record.setLoggingTimestamp(loggingTimestamp);
 
-			this.send(this.outputPort, record);
+			outputPort.send(record);
 		} catch (final BufferUnderflowException ex) {
 			super.logger.error("Failed to create record.", ex);
 		} catch (final RecordInstantiationException ex) {
diff --git a/src/main/java/teetime/stage/stringBuffer/StringBufferFilter.java b/src/main/java/teetime/stage/stringBuffer/StringBufferFilter.java
index 73a8e99c03d1e978a1a76df9851b379304872d70..24d030f52644fabe78d4bcfb9a3b29b27da1797c 100644
--- a/src/main/java/teetime/stage/stringBuffer/StringBufferFilter.java
+++ b/src/main/java/teetime/stage/stringBuffer/StringBufferFilter.java
@@ -40,7 +40,7 @@ public class StringBufferFilter<T> extends AbstractConsumerStage<T> {
 	@Override
 	protected void execute(final T element) {
 		final T returnedElement = this.handle(element);
-		this.send(this.outputPort, returnedElement);
+		outputPort.send(returnedElement);
 	}
 
 	@Override
diff --git a/src/main/java/teetime/stage/trace/traceReconstruction/TraceReconstructionFilter.java b/src/main/java/teetime/stage/trace/traceReconstruction/TraceReconstructionFilter.java
index 3652abe7b2c6f9c0ca82bf0a426c0c02d9e852ea..081bbd5fdf3e38aa0974398e921370b4b26e2770 100644
--- a/src/main/java/teetime/stage/trace/traceReconstruction/TraceReconstructionFilter.java
+++ b/src/main/java/teetime/stage/trace/traceReconstruction/TraceReconstructionFilter.java
@@ -105,7 +105,7 @@ public class TraceReconstructionFilter extends AbstractConsumerStage<IFlowRecord
 	private void sendTraceBuffer(final TraceBuffer traceBuffer) {
 		OutputPort<TraceEventRecords> outputPort = (traceBuffer.isInvalid()) ? this.traceInvalidOutputPort
 				: this.traceValidOutputPort;
-		this.send(outputPort, traceBuffer.toTraceEvents());
+		outputPort.send(traceBuffer.toTraceEvents());
 	}
 
 	public TimeUnit getTimeunit() {
diff --git a/src/main/java/teetime/stage/trace/traceReduction/TraceReductionFilter.java b/src/main/java/teetime/stage/trace/traceReduction/TraceReductionFilter.java
index 3f5dda019ed7819069ec525dbeb14774227f998b..4da8edc8cbe9c933487105b1c92f1a97b76694e2 100644
--- a/src/main/java/teetime/stage/trace/traceReduction/TraceReductionFilter.java
+++ b/src/main/java/teetime/stage/trace/traceReduction/TraceReductionFilter.java
@@ -79,7 +79,7 @@ public class TraceReductionFilter extends AbstractConsumerStage<TraceEventRecord
 				final TraceAggregationBuffer buffer = entry.getValue();
 				final TraceEventRecords record = buffer.getTraceEventRecords();
 				record.setCount(buffer.getCount());
-				this.send(this.outputPort, record);
+				outputPort.send(record);
 			}
 			this.trace2buffer.clear();
 		}
@@ -97,7 +97,7 @@ public class TraceReductionFilter extends AbstractConsumerStage<TraceEventRecord
 				if (traceBuffer.getBufferCreatedTimestamp() <= bufferTimeoutInNs) {
 					final TraceEventRecords record = traceBuffer.getTraceEventRecords();
 					record.setCount(traceBuffer.getCount());
-					this.send(this.outputPort, record);
+					outputPort.send(record);
 				}
 				iterator.remove();
 			}