Removed c++.hpp - not needed