diff --git a/router/java/src/net/i2p/router/ClientMessage.java b/router/java/src/net/i2p/router/ClientMessage.java
index 5b5a228a199c2e0117afcca2937e68265ed405dc..8a247f5f1844033ef933d492bd5dbbb4ca1c083f 100644
--- a/router/java/src/net/i2p/router/ClientMessage.java
+++ b/router/java/src/net/i2p/router/ClientMessage.java
@@ -23,7 +23,7 @@ public class ClientMessage {
     private Payload _payload;
     private Destination _destination;
     private Destination _fromDestination;
-    private MessageReceptionInfo _receptionInfo;
+    //private MessageReceptionInfo _receptionInfo;
     private SessionConfig _senderConfig;
     private Hash _destinationHash;
     private MessageId _messageId;
@@ -77,8 +77,8 @@ public class ClientMessage {
      * originated ones.
      *
      */
-    public MessageReceptionInfo getReceptionInfo() { return _receptionInfo; }
-    public void setReceptionInfo(MessageReceptionInfo info) { _receptionInfo = info; }
+    //public MessageReceptionInfo getReceptionInfo() { return _receptionInfo; }
+    //public void setReceptionInfo(MessageReceptionInfo info) { _receptionInfo = info; }
 
     /**
      * Retrieve the session config of the client that sent the message.  This will only be available
diff --git a/router/java/src/net/i2p/router/MessageReceptionInfo.java b/router/java/src/net/i2p/router/MessageReceptionInfo.java
index 9b5fb509edb12fc1cbf66106e923c4cb5f2e4c58..114b6ce65e9533c08aa4e42a411916bc48af74f3 100644
--- a/router/java/src/net/i2p/router/MessageReceptionInfo.java
+++ b/router/java/src/net/i2p/router/MessageReceptionInfo.java
@@ -14,6 +14,7 @@ import net.i2p.data.TunnelId;
 /**
  * Wrap up the details of how a ClientMessage was received from the network
  *
+ * @deprecated unused
  */
 public class MessageReceptionInfo {
     private Hash _fromPeer;
diff --git a/router/java/src/net/i2p/router/MessageStateMonitor.java b/router/java/src/net/i2p/router/MessageStateMonitor.java
index 8dfbfe4cd5541b47295e6f1fa0f8206134dddcab..80ff6f8afd0fc10245ebbcee4ed6b34e56fa27f2 100644
--- a/router/java/src/net/i2p/router/MessageStateMonitor.java
+++ b/router/java/src/net/i2p/router/MessageStateMonitor.java
@@ -5,6 +5,7 @@ import net.i2p.util.Log;
 /**
  * Keep track of the inbound and outbound messages in memory.
  *
+ * @deprecated unused
  */
 public class MessageStateMonitor {
     private Log _log;
@@ -69,4 +70,4 @@ public class MessageStateMonitor {
     public int getInboundReadCount() { return _inboundReadCount; }
     public int getOutboundLiveCount() { return _outboundLiveCount; }
     public int getOutboundDiscardedCount() { return _outboundDiscardedCount; }
-}
\ No newline at end of file
+}
diff --git a/router/java/src/net/i2p/router/RouterContext.java b/router/java/src/net/i2p/router/RouterContext.java
index 5de72c66e5012f54f54de066bcb526f855d8aab6..10ea970916c355359fe8cbf8517e8760a8bd1a3e 100644
--- a/router/java/src/net/i2p/router/RouterContext.java
+++ b/router/java/src/net/i2p/router/RouterContext.java
@@ -56,7 +56,7 @@ public class RouterContext extends I2PAppContext {
     private Shitlist _shitlist;
     private Blocklist _blocklist;
     private MessageValidator _messageValidator;
-    private MessageStateMonitor _messageStateMonitor;
+    //private MessageStateMonitor _messageStateMonitor;
     private RouterThrottle _throttle;
     private final Set<Runnable> _finalShutdownTasks;
     // split up big lock on this to avoid deadlocks
@@ -141,7 +141,7 @@ public class RouterContext extends I2PAppContext {
         _outNetMessagePool = new OutNetMessagePool(this);
         _messageHistory = new MessageHistory(this);
         _messageRegistry = new OutboundMessageRegistry(this);
-        _messageStateMonitor = new MessageStateMonitor(this);
+        //_messageStateMonitor = new MessageStateMonitor(this);
         if ("false".equals(getProperty("i2p.dummyNetDb", "false")))
             _netDb = new FloodfillNetworkDatabaseFacade(this); // new KademliaNetworkDatabaseFacade(this);
         else
@@ -253,13 +253,15 @@ public class RouterContext extends I2PAppContext {
      * The registry is used by outbound messages to wait for replies.
      */
     public OutboundMessageRegistry messageRegistry() { return _messageRegistry; }
+
     /**
      * The monitor keeps track of inbound and outbound messages currently held in
      * memory / queued for processing.  We'll use this to throttle the router so
      * we don't overflow.
      *
      */
-    public MessageStateMonitor messageStateMonitor() { return _messageStateMonitor; }
+    //public MessageStateMonitor messageStateMonitor() { return _messageStateMonitor; }
+
     /**
      * Our db cache
      */