Clean up the forwarding rules some more for gateways