cleaning up how objects are persisted