de-mm ourselves: remove C++ wrappers