More Project Cleanup
Build Updates