Deprecated matchers removed (fixes #681)