C++ conversion pt2

Removed the python stuff