removed some c++