Cleanup for update and save