Remove hardwired values for host