Cleanup, remove unused imports
Refactor Abstract Storage into abstract base class