diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bfdca11..4754930 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -60,9 +60,6 @@
                 <category android:name="android.intent.category.BROWSABLE" />
             </intent-filter>
 
-            <meta-data
-                android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
-                android:resource="@xml/usb_device_filter" />
         </activity>
         <activity
             android:name=".onboarding.OnBoardingActivity"
diff --git a/app/src/main/java/com/m2049r/xmrwallet/ledger/Ledger.java b/app/src/main/java/com/m2049r/xmrwallet/ledger/Ledger.java
index 47edbf6..a1a8146 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/ledger/Ledger.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/ledger/Ledger.java
@@ -36,7 +36,7 @@ import java.nio.charset.StandardCharsets;
 import timber.log.Timber;
 
 public class Ledger {
-    static final public boolean ENABLED = true;
+    static final public boolean ENABLED = false;
     // 5:20 is same as wallet2.cpp::restore()
     static public final int LOOKAHEAD_ACCOUNTS = 5;
     static public final int LOOKAHEAD_SUBADDRESSES = 20;
diff --git a/app/src/main/java/com/m2049r/xmrwallet/util/LegacyStorageHelper.java b/app/src/main/java/com/m2049r/xmrwallet/util/LegacyStorageHelper.java
index 9ccdf5c..68a1f6b 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/util/LegacyStorageHelper.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/util/LegacyStorageHelper.java
@@ -53,6 +53,7 @@ public class LegacyStorageHelper {
     public void migrate() {
         String addressPrefix = WalletManager.getInstance().addressPrefix();
         File[] wallets = srcDir.listFiles((dir, filename) -> filename.endsWith(".keys"));
+        if (wallets == null) return;
         for (File wallet : wallets) {
             final String walletName = wallet.getName().substring(0, wallet.getName().length() - ".keys".length());
             if (addressPrefix.indexOf(getAddress(walletName).charAt(0)) < 0) {
diff --git a/app/src/main/java/com/m2049r/xmrwallet/util/Notice.java b/app/src/main/java/com/m2049r/xmrwallet/util/Notice.java
index 8e5c4df..673e37a 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/util/Notice.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/util/Notice.java
@@ -30,6 +30,7 @@ import androidx.fragment.app.FragmentManager;
 
 import com.m2049r.xmrwallet.R;
 import com.m2049r.xmrwallet.dialog.HelpFragment;
+import com.m2049r.xmrwallet.ledger.Ledger;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -52,12 +53,13 @@ public class Notice {
                                 R.string.help_xmrto,
                                 1)
                 );
-            notices.add(
-                    new Notice(NOTICE_SHOW_LEDGER,
-                            R.string.info_ledger_enabled,
-                            R.string.help_create_ledger,
-                            1)
-            );
+            if (Ledger.ENABLED)
+                notices.add(
+                        new Notice(NOTICE_SHOW_LEDGER,
+                                R.string.info_ledger_enabled,
+                                R.string.help_create_ledger,
+                                1)
+                );
         }
     }