Merge "C++ cleanup"