More build script cleanup