Cleanup for building on new machines
cleanup for build on other machines