Rename TeamSortByOPRComparator since we're not just comparing OPRs anymore.
Also did a mass 'Optimize Imports' on the entire project to remove unused imports.