Cleaning up build scripts