Improvements to Sorts.removeSort()