remove CXX11_OVERRIDE and other junk that does not compile