Cleaning up some builds