Tidy up build scripts