Removed more Bob/C++ ties