[kelvin, james] X removing istanbul