Additional cleaning of CGame class