diff --git a/router/java/src/net/i2p/router/OutNetMessagePool.java b/router/java/src/net/i2p/router/OutNetMessagePool.java
index 6b5ddfaab..6558a9b3e 100644
--- a/router/java/src/net/i2p/router/OutNetMessagePool.java
+++ b/router/java/src/net/i2p/router/OutNetMessagePool.java
@@ -8,8 +8,6 @@ package net.i2p.router;
  *
  */
 
-import java.util.Comparator;
-
 import net.i2p.util.Log;
 
 /**
diff --git a/router/java/src/net/i2p/router/transport/udp/OutboundMessageState.java b/router/java/src/net/i2p/router/transport/udp/OutboundMessageState.java
index 0e5ed7ef3..d0e03ec83 100644
--- a/router/java/src/net/i2p/router/transport/udp/OutboundMessageState.java
+++ b/router/java/src/net/i2p/router/transport/udp/OutboundMessageState.java
@@ -16,8 +16,8 @@ import net.i2p.util.Log;
  *
  */
 class OutboundMessageState {
-    private I2PAppContext _context;
-    private Log _log;
+    private final I2PAppContext _context;
+    private final Log _log;
     /** may be null if we are part of the establishment */
     private OutNetMessage _message;
     private long _messageId;
@@ -49,6 +49,7 @@ class OutboundMessageState {
         _log = _context.logManager().getLog(OutboundMessageState.class);
     }
     
+/****
     public boolean initialize(OutNetMessage msg) {
         if (msg == null) return false;
         try {
@@ -60,7 +61,11 @@ class OutboundMessageState {
             return false;
         }
     }
+****/
     
+    /**
+     *  Called from UDPTransport
+     */
     public boolean initialize(I2NPMessage msg, PeerState peer) {
         if (msg == null) 
             return false;
@@ -75,6 +80,9 @@ class OutboundMessageState {
         }
     }
     
+    /**
+     *  Called from OutboundMessageFragments
+     */
     public boolean initialize(OutNetMessage m, I2NPMessage msg) {
         if ( (m == null) || (msg == null) ) 
             return false;
diff --git a/router/java/src/net/i2p/router/transport/udp/PeerState.java b/router/java/src/net/i2p/router/transport/udp/PeerState.java
index 1006f52a3..155003293 100644
--- a/router/java/src/net/i2p/router/transport/udp/PeerState.java
+++ b/router/java/src/net/i2p/router/transport/udp/PeerState.java
@@ -1581,6 +1581,8 @@ class PeerState {
         }
     }
 
+    // why removed? Some risk of dups in OutboundMessageFragments._activePeers ???
+
     /*
     public int hashCode() {
         if (_remotePeer != null) 
diff --git a/router/java/src/net/i2p/router/transport/udp/TimedWeightedPriorityMessageQueue.java b/router/java/src/net/i2p/router/transport/udp/TimedWeightedPriorityMessageQueue.java
index 86fe2c811..2973f8993 100644
--- a/router/java/src/net/i2p/router/transport/udp/TimedWeightedPriorityMessageQueue.java
+++ b/router/java/src/net/i2p/router/transport/udp/TimedWeightedPriorityMessageQueue.java
@@ -17,7 +17,7 @@ import net.i2p.util.Log;
  * with code to fail messages that expire.  
  *
  * WARNING - UNUSED since 0.6.1.11
- * See comments in DQAT.java and mtn history ca. 2006-02-19
+ * See comments in DummyThrottle.java and mtn history ca. 2006-02-19
  *
  */
 class TimedWeightedPriorityMessageQueue implements MessageQueue, OutboundMessageFragments.ActiveThrottle {
diff --git a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
index b8f1d35ee..63ece1edb 100644
--- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
+++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
@@ -184,7 +184,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
         _peersByRemoteHost = new ConcurrentHashMap(128);
         _dropList = new ConcurrentHashSet(2);
         
-        // See comments in DQAT.java
+        // See comments in DummyThrottle.java
         if (USE_PRIORITY) {
             TimedWeightedPriorityMessageQueue mq = new TimedWeightedPriorityMessageQueue(ctx, PRIORITY_LIMITS, PRIORITY_WEIGHT, this);
             _outboundMessages = mq;
@@ -296,7 +296,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
         if (_handler == null)
             _handler = new PacketHandler(_context, this, _endpoint, _establisher, _inboundFragments, _testManager, _introManager);
         
-        // See comments in DQAT.java
+        // See comments in DummyThrottle.java
         if (USE_PRIORITY && _refiller == null)
             _refiller = new OutboundRefiller(_context, _fragments, _outboundMessages);
         
@@ -1112,6 +1112,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
     private static final int MIN_EXPIRE_TIMEOUT = 10*60*1000;
     
     public String getStyle() { return STYLE; }
+
     @Override
     public void send(OutNetMessage msg) { 
         if (msg == null) return;
@@ -1151,7 +1152,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
             if (_log.shouldLog(Log.DEBUG))
                 _log.debug("Add to fragments for " + to.toBase64());
 
-            // See comments in DQAT.java
+            // See comments in DummyThrottle.java
             if (USE_PRIORITY)
                 _outboundMessages.add(msg);
             else  // skip the priority queue and go straight to the active pool
@@ -1163,6 +1164,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
             _establisher.establish(msg);
         }
     }
+
     void send(I2NPMessage msg, PeerState peer) {
         if (_log.shouldLog(Log.DEBUG))
             _log.debug("Injecting a data message to a new peer: " + peer);