Remove leftovers from C++ version