- Remove save and restore methods from DataModel
- Update DestroyTests.testDataModelSaveAndRestoreOnDestroy