Add specification for filter matcher
Remove dead code