More build script cleanup.