cleanup in prep for push