diff --git a/core/java/src/net/i2p/I2PAppContext.java b/core/java/src/net/i2p/I2PAppContext.java
index 8a442f07d..8d44cc035 100644
--- a/core/java/src/net/i2p/I2PAppContext.java
+++ b/core/java/src/net/i2p/I2PAppContext.java
@@ -694,10 +694,7 @@ public class I2PAppContext {
     private void initializeAESEngine() {
         synchronized (_lock7) {
             if (_AESEngine == null) {
-                if ("off".equals(getProperty("i2p.encryption", "on")))
-                    _AESEngine = new AESEngine(this);
-                else
-                    _AESEngine = new CryptixAESEngine(this);
+                _AESEngine = new CryptixAESEngine(this);
             }
             _AESEngineInitialized = true;
         }
diff --git a/core/java/src/net/i2p/crypto/AESEngine.java b/core/java/src/net/i2p/crypto/AESEngine.java
index f598ec77f..a1725c33c 100644
--- a/core/java/src/net/i2p/crypto/AESEngine.java
+++ b/core/java/src/net/i2p/crypto/AESEngine.java
@@ -18,15 +18,14 @@ import net.i2p.util.SimpleByteCache;
 
 /** 
  * Dummy wrapper for AES cipher operation.
- * Warning - 
- * most methods UNUSED unless i2p.encryption = off
+ * Warning - most methods UNUSED.
  * See CryptixAESEngine overrides for the real thing.
  */
 public class AESEngine {
     protected final Log _log;
     protected final I2PAppContext _context;
 
-    public AESEngine(I2PAppContext ctx) {
+    protected AESEngine(I2PAppContext ctx) {
         _context = ctx;
         _log = _context.logManager().getLog(getClass());
         if (getClass().equals(AESEngine.class))
diff --git a/router/java/src/net/i2p/router/MultiRouter.java b/router/java/src/net/i2p/router/MultiRouter.java
index 5ccec8d88..0dc19fa5d 100644
--- a/router/java/src/net/i2p/router/MultiRouter.java
+++ b/router/java/src/net/i2p/router/MultiRouter.java
@@ -32,15 +32,9 @@ import net.i2p.router.Router;
  * (where "rN" is an instance number, such as r0 or r9).
  * Additionally, two other properties might be useful:<ul>
  *  <li>i2p.vmCommSystem=true</li>
- *  <li>i2p.encryption=off</li>
  * </ul>
  * The first line tells the router to use an in-VM comm system for sending 
- * messages back and forth between routers (see net.i2p.transport.VMCommSystem),
- * and the second tells the router to stub out ElGamal, AES, and DSA code, reducing
- * the CPU load (but obviously making the router incapable of talking to things 
- * that need the encryption enabled).  To run a client app through a router that
- * has i2p.encryption=off, you should also add that line to the client's JVM
- * (for example, <code>java -Di2p.encryption=off -jar lib/i2ptunnel.jar</code>).<p>
+ * messages back and forth between routers (see net.i2p.transport.VMCommSystem).
  * 
  * To make the router console work, either run from a directory containing 
  * lib/, webapps/, docs/, etc., or point i2p.dir.base to a directory containing the