Remove unused RowFilter
Remove unused RowFilter ... again