diff --git a/interface/resources/qml/hifi/commerce/wallet/Help.qml b/interface/resources/qml/hifi/commerce/wallet/Help.qml
index 409833df98..f0f123f6c0 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Help.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Help.qml
@@ -25,7 +25,6 @@ Item {
 
     id: root;
     property string keyFilePath;
-    property bool showDebugButtons: true;
 
     Connections {
         target: Commerce;
@@ -55,37 +54,6 @@ Item {
         // Style
         color: hifi.colors.blueHighlight;
     }
-    HifiControlsUit.Button {
-        id: clearCachedPassphraseButton;
-        visible: root.showDebugButtons;
-        color: hifi.buttons.black;
-        colorScheme: hifi.colorSchemes.dark;
-        anchors.top: parent.top;
-        anchors.left: helpTitleText.right;
-        anchors.leftMargin: 20;
-        height: 40;
-        width: 150;
-        text: "DBG: Clear Pass";
-        onClicked: {
-            Commerce.setPassphrase("");
-            sendSignalToWallet({method: 'passphraseReset'});
-        }
-    }
-    HifiControlsUit.Button {
-        id: resetButton;
-        visible: root.showDebugButtons;
-        color: hifi.buttons.red;
-        colorScheme: hifi.colorSchemes.dark;
-        anchors.top: clearCachedPassphraseButton.top;
-        anchors.left: clearCachedPassphraseButton.right;
-        height: 40;
-        width: 150;
-        text: "DBG: RST Wallet";
-        onClicked: {
-            Commerce.reset();
-            sendSignalToWallet({method: 'walletReset'});
-        }
-    }
 
     ListModel {
         id: helpModel;
diff --git a/interface/src/commerce/Ledger.cpp b/interface/src/commerce/Ledger.cpp
index 51658ddef8..15830636f0 100644
--- a/interface/src/commerce/Ledger.cpp
+++ b/interface/src/commerce/Ledger.cpp
@@ -189,13 +189,6 @@ void Ledger::history(const QStringList& keys, const int& pageNumber) {
     keysQuery("history", "historySuccess", "historyFailure", params);
 }
 
-// The api/failResponse is called just for the side effect of logging.
-void Ledger::resetSuccess(QNetworkReply& reply) { apiResponse("reset", reply); }
-void Ledger::resetFailure(QNetworkReply& reply) { failResponse("reset", reply); }
-void Ledger::reset() {
-    send("reset_user_hfc_account", "resetSuccess", "resetFailure", QNetworkAccessManager::PutOperation, AccountManagerAuth::Required, QJsonObject());
-}
-
 void Ledger::accountSuccess(QNetworkReply& reply) {
     // lets set the appropriate stuff in the wallet now
     auto wallet = DependencyManager::get<Wallet>();
diff --git a/interface/src/commerce/Ledger.h b/interface/src/commerce/Ledger.h
index 5d90aa0808..318006b645 100644
--- a/interface/src/commerce/Ledger.h
+++ b/interface/src/commerce/Ledger.h
@@ -31,7 +31,6 @@ public:
     void inventory(const QStringList& keys);
     void history(const QStringList& keys, const int& pageNumber);
     void account();
-    void reset();
     void updateLocation(const QString& asset_id, const QString location, const bool controlledFailure = false);
     void certificateInfo(const QString& certificateId);
 
@@ -66,8 +65,6 @@ public slots:
     void inventoryFailure(QNetworkReply& reply);
     void historySuccess(QNetworkReply& reply);
     void historyFailure(QNetworkReply& reply);
-    void resetSuccess(QNetworkReply& reply);
-    void resetFailure(QNetworkReply& reply);
     void accountSuccess(QNetworkReply& reply);
     void accountFailure(QNetworkReply& reply);
     void updateLocationSuccess(QNetworkReply& reply);
diff --git a/interface/src/commerce/QmlCommerce.cpp b/interface/src/commerce/QmlCommerce.cpp
index 320c7e041c..58548eb3ef 100644
--- a/interface/src/commerce/QmlCommerce.cpp
+++ b/interface/src/commerce/QmlCommerce.cpp
@@ -128,18 +128,6 @@ void QmlCommerce::generateKeyPair() {
     getWalletAuthenticatedStatus();
 }
 
-void QmlCommerce::reset() {
-    auto ledger = DependencyManager::get<Ledger>();
-    auto wallet = DependencyManager::get<Wallet>();
-    ledger->reset();
-    wallet->reset();
-}
-
-void QmlCommerce::resetLocalWalletOnly() {
-    auto wallet = DependencyManager::get<Wallet>();
-    wallet->reset();
-}
-
 void QmlCommerce::account() {
     auto ledger = DependencyManager::get<Ledger>();
     ledger->account();
diff --git a/interface/src/commerce/QmlCommerce.h b/interface/src/commerce/QmlCommerce.h
index f2e6c82021..c04ede86c4 100644
--- a/interface/src/commerce/QmlCommerce.h
+++ b/interface/src/commerce/QmlCommerce.h
@@ -62,8 +62,6 @@ protected:
     Q_INVOKABLE void inventory();
     Q_INVOKABLE void history(const int& pageNumber);
     Q_INVOKABLE void generateKeyPair();
-    Q_INVOKABLE void reset();
-    Q_INVOKABLE void resetLocalWalletOnly();
     Q_INVOKABLE void account();
 
     Q_INVOKABLE void certificateInfo(const QString& certificateId);
diff --git a/interface/src/commerce/Wallet.cpp b/interface/src/commerce/Wallet.cpp
index c3c91e82a8..8b73042ada 100644
--- a/interface/src/commerce/Wallet.cpp
+++ b/interface/src/commerce/Wallet.cpp
@@ -144,15 +144,13 @@ bool writeKeys(const char* filename, EC_KEY* keys) {
     if ((fp = fopen(filename, "wt"))) {
         if (!PEM_write_EC_PUBKEY(fp, keys)) {
             fclose(fp);
-            qCDebug(commerce) << "failed to write public key";
-            QFile(QString(filename)).remove();
+            qCCritical(commerce) << "failed to write public key";
             return retval;
         }
 
         if (!PEM_write_ECPrivateKey(fp, keys, EVP_des_ede3_cbc(), NULL, 0, passwordCallback, NULL)) {
             fclose(fp);
-            qCDebug(commerce) << "failed to write private key";
-            QFile(QString(filename)).remove();
+            qCCritical(commerce) << "failed to write private key";
             return retval;
         }
 
@@ -168,7 +166,8 @@ bool writeKeys(const char* filename, EC_KEY* keys) {
 QPair<QByteArray*, QByteArray*> generateECKeypair() {
 
     EC_KEY* keyPair = EC_KEY_new_by_curve_name(NID_secp256k1);
-    QPair<QByteArray*, QByteArray*> retval;
+    QPair<QByteArray*, QByteArray*> retval{};
+
     EC_KEY_set_asn1_flag(keyPair, OPENSSL_EC_NAMED_CURVE);
     if (!EC_KEY_generate_key(keyPair)) {
         qCDebug(commerce) << "Error generating EC Keypair -" << ERR_get_error();
@@ -517,6 +516,9 @@ bool Wallet::generateKeyPair() {
 
     qCInfo(commerce) << "Generating keypair.";
     auto keyPair = generateECKeypair();
+    if (!keyPair.first) {
+        return false;
+    }
 
     writeBackupInstructions();
 
@@ -653,20 +655,6 @@ QString Wallet::getKeyFilePath() {
     }
 }
 
-void Wallet::reset() {
-    _publicKeys.clear();
-
-    delete _securityImage;
-    _securityImage = nullptr;
-
-    // tell the provider we got nothing
-    updateImageProvider();
-    _passphrase->clear();
-
-
-    QFile keyFile(keyFilePath());
-    keyFile.remove();
-}
 bool Wallet::writeWallet(const QString& newPassphrase) {
     EC_KEY* keys = readKeys(keyFilePath().toStdString().c_str());
     if (keys) {
diff --git a/interface/src/commerce/Wallet.h b/interface/src/commerce/Wallet.h
index ed145df451..fe3a9f1d5f 100644
--- a/interface/src/commerce/Wallet.h
+++ b/interface/src/commerce/Wallet.h
@@ -49,8 +49,6 @@ public:
     bool walletIsAuthenticatedWithPassphrase();
     bool changePassphrase(const QString& newPassphrase);
 
-    void reset();
-
     void getWalletStatus();
     enum WalletStatus {
         WALLET_STATUS_NOT_LOGGED_IN = 0,