More ICMP cleanup