Cleanup
Bug fix in agent.clone()