Removing old C++