Remove discoveryManager

(do not merge immediately)

I removed the DiscoveryManager, as it is not really used.

The determination of t