[DataQueryOption][EventsQueryOption] Remove codes for old sort machanism