Removed some unwanted C++ related stuff