Storage: Removed unnecessary code