Update barber dependency and remove monkeypatch