Revert "Revert "Revert "Remove reset storage"""

This reverts commit 050e8ef2259361120984048ba90c7ab10fca24f9.