clean up of agent operations
Still cleaning up