Cleaning up the build scripts