diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/SwapService.java b/F-Droid/src/org/fdroid/fdroid/localrepo/SwapService.java
index 3487e7794..48296f5c7 100644
--- a/F-Droid/src/org/fdroid/fdroid/localrepo/SwapService.java
+++ b/F-Droid/src/org/fdroid/fdroid/localrepo/SwapService.java
@@ -490,7 +490,7 @@ public class SwapService extends Service {
     private SwapType bluetoothSwap;
     private WifiSwap wifiSwap;
 
-    private static final int TIMEOUT = 900000; // 15 mins
+    private static final int TIMEOUT = 15 * 60 * 1000; // 15 mins
 
     /**
      * Used to automatically turn of swapping after a defined amount of time (15 mins).
diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
index bcfc69c7d..720387286 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
@@ -762,7 +762,6 @@ public class SwapWorkflowActivity extends AppCompatActivity {
                     bluetooth = "\"" + adapter.getName() + "\" - " + scanModes.get(adapter.getScanMode());
                 }
 
-                // wifi = service.getBonjourFinder().isScanning() ? "Y" : " N";
                 message += "Find { BT: " + bluetooth + ", WiFi: " + wifi + "}";
             }