Fixes: #2410 Cleaning DNS and goService a bit more
Fixes: #2410 Cleaning code and migrating to simple*