cleanup sorting to (almost) get rid of the old SORT_METHOD_FOO