Remove more C++