removing and refactoring the storage stuff