remove DNS stuff from master to target 2.0.2-final