diff --git a/org.getmonero.i2p.zero.gui/src/org/getmonero/i2p/zero/gui/Gui.java b/org.getmonero.i2p.zero.gui/src/org/getmonero/i2p/zero/gui/Gui.java
index 0e502c4..bd8035c 100644
--- a/org.getmonero.i2p.zero.gui/src/org/getmonero/i2p/zero/gui/Gui.java
+++ b/org.getmonero.i2p.zero.gui/src/org/getmonero/i2p/zero/gui/Gui.java
@@ -49,6 +49,7 @@ public class Gui extends Application {
   @Override
   public void stop() throws Exception {
     isStopping = true;
+    if(controller.getRouterWrapper().isStarted()) controller.getRouterWrapper().stop();
   }
 
   public boolean isStopping() {
diff --git a/org.getmonero.i2p.zero/src/org/getmonero/i2p/zero/RouterWrapper.java b/org.getmonero.i2p.zero/src/org/getmonero/i2p/zero/RouterWrapper.java
index ec63430..7fe64ff 100644
--- a/org.getmonero.i2p.zero/src/org/getmonero/i2p/zero/RouterWrapper.java
+++ b/org.getmonero.i2p.zero/src/org/getmonero/i2p/zero/RouterWrapper.java
@@ -211,8 +211,6 @@ public class RouterWrapper {
 
   final static String PROP_I2NP_NTCP_HOSTNAME = "i2np.ntcp.hostname";
   final static String PROP_I2NP_NTCP_PORT = "i2np.ntcp.port";
-  final static String PROP_I2NP_NTCP_AUTO_PORT = "i2np.ntcp.autoport";
-  final static String PROP_I2NP_NTCP_AUTO_IP = "i2np.ntcp.autoip";
 
   public NetworkStateMessage getReachability() {
     RouterContext _context = router.getContext();