build scripts:  clean up unused variables