C++ cleanup.