diff --git a/src/explorviz/live_trace_processing/filter/reconstruction/TraceReconstructionBuffer.java b/src/explorviz/live_trace_processing/filter/reconstruction/TraceReconstructionBuffer.java
index 95d1bab1ae57a1a6d2fd4c45938af47d1b9f53fc..e3682ef9ac167d68c2a5801f4294f68059c1aa98 100644
--- a/src/explorviz/live_trace_processing/filter/reconstruction/TraceReconstructionBuffer.java
+++ b/src/explorviz/live_trace_processing/filter/reconstruction/TraceReconstructionBuffer.java
@@ -34,7 +34,6 @@ class TraceReconstructionBuffer {
 			openEvents++;
 			final AbstractBeforeEventRecord beforeEvent = (AbstractBeforeEventRecord) event;
 			beforeEvent.setRuntimeStatisticInformation(new RuntimeStatisticInformation(1, -1, -1));
-			// TODO if invalid, trace would be null...
 		} else if ((event instanceof AbstractAfterFailedEventRecord)
 				|| (event instanceof AbstractAfterEventRecord)) {
 			openEvents--;
diff --git a/src/explorviz/live_trace_processing/reader/TCPReaderOneClient.java b/src/explorviz/live_trace_processing/reader/TCPReaderOneClient.java
index 504b2e6396a2bbcd6f55ef637a0b2cb5ce1b8bce..dd54917629c00756f84db3d14271a8e17d94af2e 100644
--- a/src/explorviz/live_trace_processing/reader/TCPReaderOneClient.java
+++ b/src/explorviz/live_trace_processing/reader/TCPReaderOneClient.java
@@ -701,7 +701,7 @@ class TCPReaderOneClient extends Thread {
 	}
 
 	private final void putInRingBuffer(final IRecord message) {
-		synchronized (this) { // TODO better solution
+		synchronized (this) {
 			outputBuffer[outputBufferIndex++] = message;
 			if (outputBufferIndex == Constants.TCP_READER_OUTPUT_BUFFER_SIZE) {
 				flushOutputBuffer();