Some cleanup on the new build process