Removed monkey patching