diff --git a/core/java/src/net/i2p/data/i2cp/I2CPMessageReader.java b/core/java/src/net/i2p/data/i2cp/I2CPMessageReader.java
index 99990e0b5c08b592cd56ca2e6f658bed242c068b..39633881e861456d1a22e232e1380d28b4400a4c 100644
--- a/core/java/src/net/i2p/data/i2cp/I2CPMessageReader.java
+++ b/core/java/src/net/i2p/data/i2cp/I2CPMessageReader.java
@@ -197,9 +197,6 @@ public class I2CPMessageReader {
                 }
             }
             _stream = null;
-            _listener = null;
-            _reader = null;
-            _readerThread = null;
         }
     }
 }
diff --git a/core/java/src/net/i2p/internal/QueuedI2CPMessageReader.java b/core/java/src/net/i2p/internal/QueuedI2CPMessageReader.java
index 13c82cc6b566cb98ca2735632ad95c6fccc57fe1..86f82241be3b87609766d00cad4ac119ca443911 100644
--- a/core/java/src/net/i2p/internal/QueuedI2CPMessageReader.java
+++ b/core/java/src/net/i2p/internal/QueuedI2CPMessageReader.java
@@ -11,13 +11,11 @@ import net.i2p.util.I2PThread;
  * @since 0.8.3
  */
 public class QueuedI2CPMessageReader extends I2CPMessageReader {
-    private /* final */ I2CPMessageQueue in;
+    private final I2CPMessageQueue in;
 
     public QueuedI2CPMessageReader(I2CPMessageQueue in, I2CPMessageEventListener lsnr) {
         super(lsnr);
         this.in = in;
-        _reader = null;
-        _readerThread = null;
         _reader = new QueuedI2CPMessageReaderRunner();
         _readerThread = new I2PThread(_reader, "I2CP Internal Reader " + (++__readerId), true);
     }
@@ -61,10 +59,6 @@ public class QueuedI2CPMessageReader extends I2CPMessageReader {
                     }
                 }
             }
-            super.run(); // Since we are dead, this will do some clean up, nothing else :-)
-            in = null;
-            _readerThread = null;
-            _reader = null;
         }
     }
 }