Cleanup Visual Studio Build issues