src: Cleanup of all commented out C++ code left over from port.