remove the dependence on fqdn, domain