Remove references to deleted files from setup.py
Persist the storage instance on the model instance