Remove deprecated matchers