Remove agent forwarding