diff --git a/core/java/src/net/i2p/client/HandlerImpl.java b/core/java/src/net/i2p/client/HandlerImpl.java
index 98d1e76ff..d1b5100e2 100644
--- a/core/java/src/net/i2p/client/HandlerImpl.java
+++ b/core/java/src/net/i2p/client/HandlerImpl.java
@@ -18,9 +18,9 @@ import net.i2p.util.Log;
  * @author jrandom
  */
 abstract class HandlerImpl implements I2CPMessageHandler {
-    protected Log _log;
-    private int _type;
-    protected I2PAppContext _context;
+    protected final Log _log;
+    private final int _type;
+    protected final I2PAppContext _context;
 
     public HandlerImpl(I2PAppContext context, int type) {
         _context = context;
diff --git a/core/java/src/net/i2p/client/MessageState.java b/core/java/src/net/i2p/client/MessageState.java
index 84ec9ad6a..a67b52770 100644
--- a/core/java/src/net/i2p/client/MessageState.java
+++ b/core/java/src/net/i2p/client/MessageState.java
@@ -37,13 +37,7 @@ class MessageState {
         _context = ctx;
         _nonce = nonce;
         _prefix = prefix + "[" + _stateId + "]: ";
-        _id = null;
         _receivedStatus = new HashSet();
-        _cancelled = false;
-        _key = null;
-        _newKey = null;
-        _tags = null;
-        _to = null;
         _created = ctx.clock().now();
         //ctx.statManager().createRateStat("i2cp.checkStatusTime", "how long it takes to go through the states", "i2cp", new long[] { 60*1000 });
     }
diff --git a/core/java/src/net/i2p/client/SessionIdleTimer.java b/core/java/src/net/i2p/client/SessionIdleTimer.java
index dad736d97..91c1c4b0f 100644
--- a/core/java/src/net/i2p/client/SessionIdleTimer.java
+++ b/core/java/src/net/i2p/client/SessionIdleTimer.java
@@ -18,13 +18,13 @@ import net.i2p.util.SimpleTimer;
  *
  * @author zzz
  */
-public class SessionIdleTimer implements SimpleTimer.TimedEvent {
+class SessionIdleTimer implements SimpleTimer.TimedEvent {
     public static final long MINIMUM_TIME = 5*60*1000;
     private static final long DEFAULT_REDUCE_TIME = 20*60*1000;
     private static final long DEFAULT_CLOSE_TIME = 30*60*1000;
     private final static Log _log = new Log(SessionIdleTimer.class);
-    private I2PAppContext _context;
-    private I2PSessionImpl _session;
+    private final I2PAppContext _context;
+    private final I2PSessionImpl _session;
     private boolean _reduceEnabled;
     private int _reduceQuantity;
     private long _reduceTime;
@@ -36,7 +36,6 @@ public class SessionIdleTimer implements SimpleTimer.TimedEvent {
     /**
      *  reduce, shutdown, or both must be true
      */
-    /* FIXME Exporting non-public type through public API FIXME */
     public SessionIdleTimer(I2PAppContext context, I2PSessionImpl session, boolean reduce, boolean shutdown) {
         _context = context;
         _session = session;