diff --git a/lib/wallet.py b/lib/wallet.py
index 076b2486..23ea9c01 100644
--- a/lib/wallet.py
+++ b/lib/wallet.py
@@ -1916,10 +1916,7 @@ class Wallet(object):
         if wallet_type:
             for cat, t, name, loader in wallet_types:
                 if t == wallet_type:
-                    if cat in ['hardware', 'twofactor']:
-                        WalletClass = lambda storage: apply(loader().constructor, (storage,))
-                    else:
-                        WalletClass = loader
+                    WalletClass = loader
                     break
             else:
                 if re.match('(\d+)of(\d+)', wallet_type):
diff --git a/plugins/ledger/ledger.py b/plugins/ledger/ledger.py
index 502db4b1..57f248fe 100644
--- a/plugins/ledger/ledger.py
+++ b/plugins/ledger/ledger.py
@@ -424,9 +424,6 @@ class LedgerPlugin(BasePlugin):
         self.wallet = None
         self.handler = None
 
-    def constructor(self, s):
-        return BTChipWallet(s)
-
     def is_enabled(self):
         if not BTCHIP:
             return False
diff --git a/plugins/trezor/plugin.py b/plugins/trezor/plugin.py
index ba09a899..25bc83af 100644
--- a/plugins/trezor/plugin.py
+++ b/plugins/trezor/plugin.py
@@ -158,9 +158,6 @@ class TrezorCompatiblePlugin(BasePlugin):
         self.handler = None
         self.client = None
 
-    def constructor(self, s):
-        return self.wallet_class(s)
-
     def give_error(self, message):
         self.print_error(message)
         raise Exception(message)
diff --git a/plugins/trustedcoin/trustedcoin.py b/plugins/trustedcoin/trustedcoin.py
index 00668f61..8a4aac32 100644
--- a/plugins/trustedcoin/trustedcoin.py
+++ b/plugins/trustedcoin/trustedcoin.py
@@ -276,9 +276,6 @@ class TrustedCoinPlugin(BasePlugin):
         BasePlugin.__init__(self, parent, config, name)
         self.seed_func = lambda x: bitcoin.is_new_seed(x, SEED_PREFIX)
 
-    def constructor(self, s):
-        return Wallet_2fa(s)
-
     def is_available(self):
         return True