remove deprecated matcher and use mix-in