pair-with-matching-prefs -> pair-matching-prefs
Remove unused java.util.Date import