Remove matching system
Merge pull request #630 from neighborly/im-remove-matching

Remove matching system