Removed the old C++ stuff for this branch.