removed more c++ comments