Some cleanup in build script.