clean up some mess caused by monkey patching of some monkey patching