Get rid of ActivitySorter