further cleaned the build scripts