getting rid of the c++ stuff