Cleanup for filter and sorter interfaces