more build script cleanups