cleanup - remove DNS twisting from code base