Remove old state.
Change how we determine the host