Remove a little bit of unused C++