cleanup after wnj changes to icmp