removed changes unrelated to c++