removed discovery related changes