Gateway timeout + Removed DiscoverGateway