Remove unnecessary sorting