Let's remove the C++ stuff with the single PR.  I'll review later today.