Remove unused code.
Add match value function to the filter.