remove a lot of conditions that suppose non-persistent storage