Remove unneeded uses of hostname