Remove  ipv6 and ipv4 stuff
Merge pull request #4125 from UtahDave/develop

Remove  ipv6 and ipv4 stuff