more of initial clean up