AbstractSelector cleanup