Got rid of C++