Remove deprecated matchers

* See issue #252 

@gabebw