Put host removal in the right place