Clean up SortHeaders