clean up the discovery interface, pass enablement to extensions