Removed discovery features for now