Fixed issue with the HostGateway class where it would not properly remove the host from the map.