Remove references to diameter, so it will at least build