Clean up for the finished icmp lib ref #2