Remove unnecessary fields from SortSupport struct