clean up in prep for final review