remove hostname usage where it is not necessary