another attempt to cleanup the build scripts