Removing more references which break the build for everyone else