cleanup - remove ugly broken monkeypatch