Build script cleanups