Move discovery out of initialization
Remove useless class
Move callback installation and discovery doc fetch to setup