Removed all the storage stuff for now