PIM-3320: clean sorter and filter definitions