Remove unneeded reference to DiscoveryService which potentially causes circular references