removed most hard coded host names