#TODO remove deprecated HOSTNAME entry