Remove now obsolete C++ code