Removed duplication.

  Most of this stuff is in agent.policy already.