prep for change in edit form, and cleanup