removing more c++ keywords