more hard coded host names removed