cleanup in prep for advise, rotate