diff -rupN Modules-original/objc/objc-runtime-compat.m Modules/objc/objc-runtime-compat.m
--- Modules-original/objc/objc-runtime-compat.m	2009-05-25 03:56:04.000000000 +0900
+++ Modules/objc/objc-runtime-compat.m	2012-05-12 01:43:46.000000000 +0900
@@ -981,27 +981,4 @@ size_t PyObjC_methodlist_magic(Class cls
 
 #endif
 
-#if defined(__x86_64__)
 
-@implementation Protocol (NSOBjectCompat)
-- self
-{
-	return self;
-}
-@end
-
-@implementation Object (NSOBjectCompat)
-- self
-{
-	return self;
-}
-
--doesNotRecognizeSelector:(SEL)sel
-{
-	printf("--> %s\n", sel_getName(sel));
-	abort();
-}
-@end
-	
-
-#endif
diff -rupN Modules-original/objc/objc_support.m Modules/objc/objc_support.m
--- Modules-original/objc/objc_support.m	2010-06-30 05:28:09.000000000 +0900
+++ Modules/objc/objc_support.m	2012-05-12 01:46:11.000000000 +0900
@@ -150,68 +150,7 @@
 -(PyObject*)__pyobjc_PythonTransient__:(int*)cookie;
 @end /* PyObjCSupport */
 
-@implementation Protocol (PyObjCSupport)
 
--(PyObject*)__pyobjc_PythonObject__
-{
-	PyObject *rval;
-
-	rval = PyObjC_FindPythonProxy(self);
-	if (rval == NULL) {
-		rval = PyObjCFormalProtocol_ForProtocol(self);
-	}
-	return rval;
-}
-
--(PyObject*)__pyobjc_PythonTransient__:(int*)cookie
-{
-	PyObject *rval;
-
-	*cookie = 0;
-	rval = PyObjC_FindPythonProxy(self);
-	if (rval == NULL) {
-		rval = PyObjCFormalProtocol_ForProtocol(self);
-	}
-	return rval;
-}
-
-@end /* PyObjCSupport */
-
-@interface Object (PyObjCSupport)
--(PyObject*)__pyobjc_PythonObject__;
--(PyObject*)__pyobjc_PythonTransient__:(int*)cookie;
-@end /* PyObjCSupport */
-
-@implementation Object (PyObjCSupport)
-
--(PyObject*)__pyobjc_PythonObject__
-{
-	PyObject *rval;
-
-	rval = PyObjC_FindPythonProxy(self);
-	if (rval == NULL) {
-		rval = (PyObject *)PyObjCObject_New(self,
-				PyObjCObject_kCLASSIC, NO);
-		PyObjC_RegisterPythonProxy(self, rval);
-	}
-	return rval;
-}
-
--(PyObject*)__pyobjc_PythonTransient__:(int*)cookie
-{
-	PyObject *rval;
-
-	*cookie = 0;
-	rval = PyObjC_FindPythonProxy(self);
-	if (rval == NULL) {
-		rval = (PyObject *)PyObjCObject_New(self,
-				PyObjCObject_kCLASSIC, NO);
-		PyObjC_RegisterPythonProxy(self, rval);
-	}
-	return rval;
-}
-
-@end /* PyObjCSupport */
 
 @interface NSString (PyObjCSupport)
 -(PyObject*)__pyobjc_PythonObject__;
diff -rupN Modules-original/objc/selector.m Modules/objc/selector.m
--- Modules-original/objc/selector.m	2010-06-24 17:53:29.000000000 +0900
+++ Modules/objc/selector.m	2012-05-12 01:49:44.000000000 +0900
@@ -798,9 +798,6 @@ PyObjCSelector_FindNative(PyObject* self
 		}
 	}
 
-	if (Object_class == nil) {
-		Object_class = [Object class];
-	}
 
 	if (name[0] == '_' && name[1] == '_') {
 		/* No known Objective-C class has methods whose name