Remove DiscoveryService arg to NetworkDiscovery