Get rid of AgentClass