CStateContainer removed, AntCommon class added