Removing all the dead C++ code :(