Remove an unused class, and clarify SortedPackageConsumerInterface