Refactor filters that aren't used