Remove discovery features from this branch