Removed all the C++ mess.