Remove a little more C++