Removing silly C++ fixes, actually did find/replace like a good donkeh