Lots of initial clean up