IPv6 code clean up