Cleanups in build scripts