saveAndNew cleanup