Cleanup; use agent_id to derive agent URL