Removing need for storages