Revert "Improve SmellOfMatcher"

This reverts commit cac18292d624adf7817c3b8c411d13c4d4c4ae4c.