removed support for deprecated methods + removed monkey patching