Use the newly refactored discovery module

The initial implementation of the discovery algorithm was incorrectly done in this package, it has now been refactored in the appropriate places, so we can just use those.