Lots of project cleanup.