Removed the DHCPv6 stuff and some cleanup