Merge pull request #1606 from rubenk/utils-dns-remove-unused-code