Fixed DNS balancing issue reported by Shaun
Minor: removed commented code