Ben: cleaning up build scripts