cleanup icmp (wnj - from shannon)