Added removeThenSave to models