diff --git a/apps/remix-ide-e2e/src/tests/ballot.test.ts b/apps/remix-ide-e2e/src/tests/ballot.test.ts
index bc498d64f2..84e768f420 100644
--- a/apps/remix-ide-e2e/src/tests/ballot.test.ts
+++ b/apps/remix-ide-e2e/src/tests/ballot.test.ts
@@ -56,7 +56,6 @@ module.exports = {
       .waitForElementVisible('#stepdetail')
       .goToVMTraceStep(144)
       .pause(2000)
-      // Should be uncommented while fixing https://github.com/ethereum/remix-project/issues/1644
       .checkVariableDebug('soliditystate', stateCheck)
       .checkVariableDebug('soliditylocals', localsCheck)
   },
diff --git a/apps/remix-ide-e2e/src/tests/solidityUnittests.spec.ts b/apps/remix-ide-e2e/src/tests/solidityUnittests.spec.ts
index b87e08c34c..f834a91a1f 100644
--- a/apps/remix-ide-e2e/src/tests/solidityUnittests.spec.ts
+++ b/apps/remix-ide-e2e/src/tests/solidityUnittests.spec.ts
@@ -252,7 +252,6 @@ module.exports = {
       .waitForElementContainsText('*[data-id="functionPanel"]', 'checkWinningProposal()', 60000)
       .waitForElementContainsText('*[data-id="functionPanel"]', 'vote(proposal)', 60000)
       .pause(2000)
-      // Should be uncommented while fixing https://github.com/ethereum/remix-project/issues/1644
       .checkVariableDebug('soliditylocals', locals)
       .clickLaunchIcon('filePanel')
       .pause(2000)
diff --git a/libs/remix-lib/src/web3Provider/web3VmProvider.ts b/libs/remix-lib/src/web3Provider/web3VmProvider.ts
index 76d9eb9f01..f29e225e5a 100644
--- a/libs/remix-lib/src/web3Provider/web3VmProvider.ts
+++ b/libs/remix-lib/src/web3Provider/web3VmProvider.ts
@@ -129,11 +129,7 @@ export class Web3VmProvider {
     this.storageCache[this.processingHash] = {}
     if (data.to) {
       try {
-        // dumpStorage throws error as 'Missing Node in DB'
-        // This can be uncommented once that error is handled
-        // https://github.com/ethereum/remix-project/issues/1644
         const storage = await this.vm.stateManager.dumpStorage(data.to)
-        // const storage = {}
         this.storageCache[this.processingHash][tx['to']] = storage
         this.lastProcessedStorageTxHash[tx['to']] = this.processingHash
       } catch (e) {
@@ -249,11 +245,7 @@ export class Web3VmProvider {
         if (!this.storageCache[this.processingHash][this.processingAddress]) {
           const account = Address.fromString(this.processingAddress)
           try {
-            // dumpStorage throws error as 'Missing Node in DB'
-            // This can be uncommented once that error is handled
-            // https://github.com/ethereum/remix-project/issues/1644
             const storage = await this.vm.stateManager.dumpStorage(account)
-            // const storage = {}
             this.storageCache[this.processingHash][this.processingAddress] = storage
             this.lastProcessedStorageTxHash[this.processingAddress] = this.processingHash
           } catch (e) {