Remove unnecessary OrderComparator