Remove code path for C* 1.0