clean up pass 2