Fixes: #2410 Cleaning DNS code