Removed the C++ version