Remove monkeypatching