remove a few instances of CLogicEntity