removed unneeded dealloc functions

34 files changed, 58 insertions, 420 deletions

diff --git a/source/blender/python/api2_2x/Camera.c b/source/blender/python/api2_2x/Camera.c
index 2ec89de1c7b..04c94ef5dba 100644
--- a/source/blender/python/api2_2x/Camera.c
+++ b/source/blender/python/api2_2x/Camera.c
@@ -203,7 +203,6 @@ static PyMethodDef BPy_Camera_methods[] = {
 /*****************************************************************************/
 /* Python Camera_Type callback function prototypes:                          */
 /*****************************************************************************/
-static void Camera_dealloc( BPy_Camera * self );
 static int Camera_compare( BPy_Camera * a, BPy_Camera * b );
 static PyObject *Camera_repr( BPy_Camera * self );
 
@@ -653,12 +652,6 @@ static PyObject *Camera_copy( BPy_Camera * self )
 	return pycam;
 }
 
-static void Camera_dealloc( BPy_Camera * self )
-{
-	PyObject_DEL( self );
-}
-
-
 static PyObject *Camera_getType( BPy_Camera * self )
 {
 	if (self->camera->type == EXPP_CAM_TYPE_PERSP)
@@ -949,7 +942,7 @@ PyTypeObject Camera_Type = {
 
 	/* Methods to implement standard operations */
 
-	( destructor ) Camera_dealloc,/* destructor tp_dealloc; */
+	NULL,						/* destructor tp_dealloc; */
 	NULL,                       /* printfunc tp_print; */
 	NULL,                       /* getattrfunc tp_getattr; */
 	NULL,                       /* setattrfunc tp_setattr; */
diff --git a/source/blender/python/api2_2x/Constraint.c b/source/blender/python/api2_2x/Constraint.c
index d67557084a1..1fb202be6af 100644
--- a/source/blender/python/api2_2x/Constraint.c
+++ b/source/blender/python/api2_2x/Constraint.c
@@ -206,7 +206,6 @@ static PyMappingMethods Constraint_as_mapping = {
 /*****************************************************************************/
 /* Python Constraint_Type callback function prototypes:                      */
 /*****************************************************************************/
-static void Constraint_dealloc( BPy_Constraint * self );
 static PyObject *Constraint_repr( BPy_Constraint * self );
 static int Constraint_compare( BPy_Constraint * a, BPy_Constraint * b );
 
@@ -223,7 +222,7 @@ PyTypeObject Constraint_Type = {
 
 	/* Methods to implement standard operations */
 
-	( destructor ) Constraint_dealloc,/* destructor tp_dealloc; */
+	NULL,						/* destructor tp_dealloc; */
 	NULL,                       /* printfunc tp_print; */
 	NULL,                       /* getattrfunc tp_getattr; */
 	NULL,                       /* setattrfunc tp_setattr; */
@@ -1419,17 +1418,6 @@ static int Constraint_setData( BPy_Constraint * self, PyObject * key,
 }
 
 /*****************************************************************************/
-/* Function:    Constraint_dealloc                                           */
-/* Description: This is a callback function for the BPy_Constraint type. It  */
-/*              destroys data when the object is deleted.                    */
-/*****************************************************************************/
-static void Constraint_dealloc( BPy_Constraint * self )
-{
-	PyObject_DEL( self );
-}
-
-
-/*****************************************************************************/
 /* Function:    Constraint_compare                                           */
 /* Description: This compares 2 constraint python types, == or != only.      */
 /*****************************************************************************/
diff --git a/source/blender/python/api2_2x/CurNurb.c b/source/blender/python/api2_2x/CurNurb.c
index da551307d83..b244d24e37f 100644
--- a/source/blender/python/api2_2x/CurNurb.c
+++ b/source/blender/python/api2_2x/CurNurb.c
@@ -77,7 +77,6 @@ char M_CurNurb_doc[] = "CurNurb";
   CurNurb_Type callback function prototypes:                          
 */
 
-static void CurNurb_dealloc( BPy_CurNurb * self );
 static int CurNurb_compare( BPy_CurNurb * a, BPy_CurNurb * b );
 static PyObject *CurNurb_repr( BPy_CurNurb * self );
 
@@ -207,8 +206,8 @@ PyTypeObject CurNurb_Type = {
 
 	/* Methods to implement standard operations */
 
-	( destructor ) CurNurb_dealloc,	/*    destructor tp_dealloc; */
-	NULL,			/*    printfunc tp_print; */
+	NULL,					/*    destructor tp_dealloc; */
+	NULL,					/*    printfunc tp_print; */
 	NULL,					/*    getattrfunc tp_getattr; */
 	NULL,					/*    setattrfunc tp_setattr; */
 	( cmpfunc ) CurNurb_compare,	/*    cmpfunc tp_compare; */
@@ -279,11 +278,6 @@ PyTypeObject CurNurb_Type = {
 	0
 };
 
-void CurNurb_dealloc( BPy_CurNurb * self )
-{
-	PyObject_DEL( self );
-}
-
 /*
   compare
   in this case, we consider two CurNurbs equal, if they point to the same
diff --git a/source/blender/python/api2_2x/Curve.c b/source/blender/python/api2_2x/Curve.c
index d32fac3139f..50dc663d439 100644
--- a/source/blender/python/api2_2x/Curve.c
+++ b/source/blender/python/api2_2x/Curve.c
@@ -1208,16 +1208,6 @@ PyObject *Curve_getNurb( BPy_Curve * self, int n )
 }
 
 /*****************************************************************************/
-/* Function:    Curve_dealloc                                                */
-/* Description: This is a callback function for the BPy_Curve type. It is    */
-/*              the destructor function.                                     */
-/*****************************************************************************/
-static void Curve_dealloc( BPy_Curve * self )
-{
-	PyObject_DEL( self );
-}
-
-/*****************************************************************************/
 /* Function:    Curve_compare		                                         */
 /* Description: This compares 2 curve python types, == or != only.			 */
 /*****************************************************************************/
@@ -1528,7 +1518,6 @@ Sets a control point "},
 /*****************************************************************************/
 /*  Python Curve_Type callback function prototypes:                         */
 /*****************************************************************************/
-static void Curve_dealloc( BPy_Curve * msh );
 static int Curve_compare( BPy_Curve * a, BPy_Curve * b );
 static PyObject *Curve_repr( BPy_Curve * msh );
 
@@ -1555,7 +1544,7 @@ PyTypeObject Curve_Type = {
 	sizeof( BPy_Curve ),                /* tp_basicsize */
 	0,                                  /* tp_itemsize */
 	/* methods */
-	( destructor ) Curve_dealloc,       /* tp_dealloc */
+	NULL, 								/* tp_dealloc */
 	0,                                  /* tp_print */
 	( getattrfunc ) NULL,	            /* tp_getattr */
 	( setattrfunc ) NULL,	            /* tp_setattr */
diff --git a/source/blender/python/api2_2x/Effect.c b/source/blender/python/api2_2x/Effect.c
index 7fa1b1aabe1..4f689de4b05 100644
--- a/source/blender/python/api2_2x/Effect.c
+++ b/source/blender/python/api2_2x/Effect.c
@@ -204,7 +204,6 @@ static PyObject *Effect_oldsetDefvec( BPy_Effect * self, PyObject * a );
 /*****************************************************************************/
 /* Python Effect_Type callback function prototypes:                           */
 /*****************************************************************************/
-static void Effect_dealloc( BPy_Effect * msh );
 static PyObject *Effect_repr( void );
 
 /*****************************************************************************/
@@ -476,7 +475,7 @@ PyTypeObject Effect_Type = {
 
 	/* Methods to implement standard operations */
 
-	( destructor ) Effect_dealloc,/* destructor tp_dealloc; */
+	NULL,						/* destructor tp_dealloc; */
 	NULL,                       /* printfunc tp_print; */
 	NULL,                       /* getattrfunc tp_getattr; */
 	NULL,                       /* setattrfunc tp_setattr; */
@@ -1611,16 +1610,6 @@ static PyObject *Effect_getParticlesLoc( BPy_Effect * self )
 }
 
 /*****************************************************************************/
-/* Function:    Effect_dealloc                                               */
-/* Description: This is a callback function for the BPy_Effect type. It is   */
-/*              the destructor function.                                     */
-/*****************************************************************************/
-static void Effect_dealloc( BPy_Effect * self )
-{
-	PyObject_DEL( self );
-}
-
-/*****************************************************************************/
 /* Function:    Effect_repr                                                  */
 /* Description: This is a callback function for the BPy_Effect type. It      */
 /*              builds a meaninful string to represent effcte objects.       */
diff --git a/source/blender/python/api2_2x/Font.c b/source/blender/python/api2_2x/Font.c
index 2603326a68d..6c46e54cfd8 100644
--- a/source/blender/python/api2_2x/Font.c
+++ b/source/blender/python/api2_2x/Font.c
@@ -80,7 +80,6 @@ static PyMethodDef BPy_Font_methods[] = {
 };
 
 /*--------------- Python TypeFont callback function prototypes----------*/
-static void Font_dealloc( BPy_Font * font );
 static int Font_compare( BPy_Font * a1, BPy_Font * a2 );
 static PyObject *Font_repr( BPy_Font * font );
 
@@ -274,7 +273,7 @@ PyTypeObject Font_Type = {
 
 	/* Methods to implement standard operations */
 
-	( destructor ) Font_dealloc,/* destructor tp_dealloc; */
+	NULL,						/* destructor tp_dealloc; */
 	NULL,                       /* printfunc tp_print; */
 	NULL,                       /* getattrfunc tp_getattr; */
 	NULL,                       /* setattrfunc tp_setattr; */
@@ -368,12 +367,6 @@ PyObject *Font_Init( void )
 /*--------------- Font module internal callbacks-----------------*/
 /*---------------BPy_Font internal callbacks/methods-------------*/
 
-//--------------- dealloc------------------------------------------
-static void Font_dealloc( BPy_Font * self )
-{
-	PyObject_DEL( self );
-}
-
 /*--------------- repr---------------------------------------------*/
 static PyObject *Font_repr( BPy_Font * self )
 {
diff --git a/source/blender/python/api2_2x/Group.c b/source/blender/python/api2_2x/Group.c
index b785c58df3a..d9a5fe7e7d9 100755
--- a/source/blender/python/api2_2x/Group.c
+++ b/source/blender/python/api2_2x/Group.c
@@ -208,7 +208,6 @@ static int Group_setObjects( BPy_Group * self, PyObject * args )
 /*****************************************************************************/
 /* PythonTypeObject callback function prototypes			 */
 /*****************************************************************************/
-static void Group_dealloc( BPy_Group * obj );
 static PyObject *Group_repr( BPy_Group * obj );
 static int Group_compare( BPy_Group * a, BPy_Group * b );
 
@@ -271,7 +270,7 @@ PyTypeObject Group_Type = {
 
 	/* Methods to implement standard operations */
 
-	( destructor ) Group_dealloc,/* destructor tp_dealloc; */
+	NULL,						/* destructor tp_dealloc; */
 	NULL,                       /* printfunc tp_print; */
 	NULL,                       /* getattrfunc tp_getattr; */
 	NULL,                       /* setattrfunc tp_setattr; */
@@ -528,16 +527,6 @@ Group *Group_FromPyObject( PyObject * py_grp )
 }
 
 /*****************************************************************************/
-/* Function:	Group_dealloc						 */
-/* Description: This is a callback function for the BlenObject type. It is  */
-/*		the destructor function.				 */
-/*****************************************************************************/
-static void Group_dealloc( BPy_Group * grp )
-{
-	PyObject_DEL( grp );
-}
-
-/*****************************************************************************/
 /* Function:	Group_compare						 */
 /* Description: This is a callback function for the BPy_Group type. It	 */
 /*		compares two Group_Type objects. Only the "==" and "!="  */
diff --git a/source/blender/python/api2_2x/IDProp.c b/source/blender/python/api2_2x/IDProp.c
index 34da92484a9..8b2dc4543f9 100644
--- a/source/blender/python/api2_2x/IDProp.c
+++ b/source/blender/python/api2_2x/IDProp.c
@@ -46,10 +46,6 @@ extern PyTypeObject IDArray_Type;
 extern PyTypeObject IDGroup_Iter_Type;
 
 /*********************** ID Property Main Wrapper Stuff ***************/
-void IDGroup_dealloc( BPy_IDProperty *self )
-{
-	PyObject_DEL( self );
-}
 
 PyObject *IDGroup_repr( BPy_IDProperty *self )
 {
@@ -554,7 +550,7 @@ PyTypeObject IDGroup_Type = {
 
 	/* Methods to implement standard operations */
 
-	( destructor ) IDGroup_dealloc,/* destructor tp_dealloc; */
+	NULL,						/* destructor tp_dealloc; */
 	NULL,                       /* printfunc tp_print; */
 	NULL,     /* getattrfunc tp_getattr; */
 	NULL,     /* setattrfunc tp_setattr; */
@@ -625,11 +621,6 @@ PyObject *BPy_Wrap_IDProperty(ID *id, IDProperty *prop, IDProperty *parent)
 
 /********Array Wrapper********/
 
-void IDArray_dealloc(void *self)
-{
-	PyObject_DEL(self);
-}
-
 PyObject *IDArray_repr(BPy_IDArray *self)
 {
 	return Py_BuildValue("s", "(ID Array)");
@@ -741,7 +732,7 @@ PyTypeObject IDArray_Type = {
 
 	/* Methods to implement standard operations */
 
-	( destructor ) IDArray_dealloc,/* destructor tp_dealloc; */
+	NULL,						/* destructor tp_dealloc; */
 	NULL,                       /* printfunc tp_print; */
 	NULL,     /* getattrfunc tp_getattr; */
 	NULL,     /* setattrfunc tp_setattr; */
@@ -814,10 +805,6 @@ PyTypeObject IDArray_Type = {
 };
 
 /*********** ID Property Group iterator ********/
-void IDGroup_Iter_dealloc(void *self)
-{
-	PyObject_DEL(self);
-}
 
 PyObject *IDGroup_Iter_iterself(PyObject *self)
 {
@@ -858,7 +845,7 @@ PyTypeObject IDGroup_Iter_Type = {
 
 	/* Methods to implement standard operations */
 
-	( destructor ) IDGroup_Iter_dealloc,/* destructor tp_dealloc; */
+	NULL,						/* destructor tp_dealloc; */
 	NULL,                       /* printfunc tp_print; */
 	NULL,     /* getattrfunc tp_getattr; */
 	NULL,     /* setattrfunc tp_setattr; */
diff --git a/source/blender/python/api2_2x/Image.c b/source/blender/python/api2_2x/Image.c
index a030f635010..5aa8def8abb 100644
--- a/source/blender/python/api2_2x/Image.c
+++ b/source/blender/python/api2_2x/Image.c
@@ -749,21 +749,10 @@ PyObject *Image_Init( void )
 /*****************************************************************************/
 /* Python Image_Type callback function prototypes:	 */
 /*****************************************************************************/
-static void Image_dealloc( BPy_Image * self );
 static int Image_compare( BPy_Image * a, BPy_Image * b );
 static PyObject *Image_repr( BPy_Image * self );
 
 /*****************************************************************************/
-/* Function:		Image_dealloc		 */
-/* Description: This is a callback function for the BPy_Image type. It is  */
-/*		the destructor function.	 */
-/*****************************************************************************/
-static void Image_dealloc( BPy_Image * self )
-{
-	PyObject_DEL( self );
-}
-
-/*****************************************************************************/
 /* Function:		Image_CreatePyObject	 */
 /* Description: This function will create a new BPy_Image from an existing  */
 /*		Blender image structure.	 */
@@ -1320,8 +1309,8 @@ PyTypeObject Image_Type = {
 	sizeof( BPy_Image ),	/* tp_basicsize */
 	0,			/* tp_itemsize */
 	/* methods */
-	( destructor ) Image_dealloc,	/* tp_dealloc */
-	0,			/* tp_print */
+	NULL,	/* tp_dealloc */
+	0,		/* tp_print */
 	NULL,	/* tp_getattr */
 	NULL,	/* tp_setattr */
 	( cmpfunc ) Image_compare,	/* tp_compare */
diff --git a/source/blender/python/api2_2x/Ipo.c b/source/blender/python/api2_2x/Ipo.c
index 674b4e6d3f1..4c1865d72b1 100644
--- a/source/blender/python/api2_2x/Ipo.c
+++ b/source/blender/python/api2_2x/Ipo.c
@@ -229,7 +229,6 @@ static PySequenceMethods Ipo_as_sequence = {
 /*****************************************************************************/
 /* Python Ipo_Type callback function prototypes:                             */
 /*****************************************************************************/
-static void Ipo_dealloc( BPy_Ipo * self );
 /*static int IpoPrint (BPy_Ipo *self, FILE *fp, int flags);*/
 static int Ipo_compare( BPy_Ipo * a, BPy_Ipo * b );
 static PyObject *Ipo_repr( BPy_Ipo * self );
@@ -365,7 +364,7 @@ PyTypeObject Ipo_Type = {
 
 	/* Methods to implement standard operations */
 
-	( destructor ) Ipo_dealloc,/* destructor tp_dealloc; */
+	NULL,						/* destructor tp_dealloc; */
 	NULL,                       /* printfunc tp_print; */
 	NULL,                       /* getattrfunc tp_getattr; */
 	NULL,                       /* setattrfunc tp_setattr; */
@@ -1268,16 +1267,6 @@ static int Ipo_setChannel( BPy_Ipo * self, PyObject * value )
 }
 
 /*****************************************************************************/
-/* Function:    Ipo_dealloc                                                  */
-/* Description: This is a callback function for the BPy_Ipo type. It is      */
-/*              the destructor function.                                     */
-/*****************************************************************************/
-static void Ipo_dealloc( BPy_Ipo * self )
-{
-	PyObject_DEL( self );
-}
-
-/*****************************************************************************/
 /* Function:    Ipo_compare			                                         */
 /* Description: This compares 2 ipo python types, == or != only.             */
 /*****************************************************************************/
diff --git a/source/blender/python/api2_2x/Ipocurve.c b/source/blender/python/api2_2x/Ipocurve.c
index 5a45d9f3485..1d9477c9802 100644
--- a/source/blender/python/api2_2x/Ipocurve.c
+++ b/source/blender/python/api2_2x/Ipocurve.c
@@ -192,7 +192,6 @@ static PyMappingMethods IpoCurve_as_mapping = {
 /*****************************************************************************/
 static int IpoCurve_compare( C_IpoCurve * a, C_IpoCurve * b );
 static PyObject *IpoCurve_repr( C_IpoCurve * self );
-static void IpoCurve_dealloc( C_IpoCurve * self );
 
 /*****************************************************************************/
 /* Python IpoCurve_Type structure definition:                                */
@@ -204,7 +203,7 @@ PyTypeObject IpoCurve_Type = {
 	sizeof( C_IpoCurve ),				/* tp_basicsize */
 	0,									/* tp_itemsize */
 	/* methods */
-	( destructor ) IpoCurve_dealloc,    /* tp_dealloc */
+	NULL,							    /* tp_dealloc */
 	0,									/* tp_print */
 	( getattrfunc ) NULL,	            /* tp_getattr */
 	( setattrfunc ) NULL,	            /* tp_setattr */
@@ -652,17 +651,6 @@ static PyObject *IpoCurve_getPoints( C_IpoCurve * self )
 }
 
 /*****************************************************************************/
-/* Function:    Ipo_dealloc                                                  */
-/* Description: This is a callback function for the C_IpoCurve type. It is   */
-/*              the destructor function.                                     */
-/*****************************************************************************/
-
-static void IpoCurve_dealloc( C_IpoCurve * self )
-{
-	PyObject_DEL( self );
-}
-
-/*****************************************************************************/
 /* Function:    IpoCurve_compare                                     		 */
 /* Description: This compares 2 python types, == or != only.			     */
 /*****************************************************************************/
diff --git a/source/blender/python/api2_2x/Key.c b/source/blender/python/api2_2x/Key.c
index f867545ce16..27a92e8c17e 100644
--- a/source/blender/python/api2_2x/Key.c
+++ b/source/blender/python/api2_2x/Key.c
@@ -61,8 +61,6 @@
 /* macro from blenkernel/intern/key.c:98 */
 #define GS(a)	(*((short *)(a)))
 
-static void Key_dealloc( PyObject * self );
-static void KeyBlock_dealloc( PyObject * self );
 static int Key_compare( BPy_Key * a, BPy_Key * b );
 static PyObject *Key_repr( BPy_Key * self );
 
@@ -137,7 +135,7 @@ PyTypeObject Key_Type = {
 	sizeof( BPy_Key ),				/*tp_basicsize */
 	0,								/*tp_itemsize */
 	/* methods */
-	( destructor ) Key_dealloc,		/*tp_dealloc */
+	NULL,							/*tp_dealloc */
 	( printfunc ) 0,				/*tp_print */
 	( getattrfunc ) 0,	/*tp_getattr */
 	( setattrfunc ) 0,			 	/*tp_setattr */
@@ -214,7 +212,7 @@ PyTypeObject KeyBlock_Type = {
 	sizeof( BPy_KeyBlock ),	/*tp_basicsize */
 	0,			/*tp_itemsize */
 	/* methods */
-	( destructor ) KeyBlock_dealloc,	/*tp_dealloc */
+	NULL,				/*tp_dealloc */
 	NULL,				/*tp_print */
 	NULL, 				/*tp_getattr */
 	NULL,				/*tp_setattr */
@@ -285,11 +283,6 @@ PyTypeObject KeyBlock_Type = {
 	NULL
 };
 
-static void Key_dealloc( PyObject * self )
-{
-	PyObject_DEL( self );
-}
-
 static PyObject *new_Key(Key * oldkey)
 {
 	BPy_Key *k = PyObject_NEW( BPy_Key, &Key_Type );
@@ -404,11 +397,6 @@ static PyObject *Key_getValue( BPy_Key * self )
 
 /* ------------ Key Block Functions -------------- */
 
-static void KeyBlock_dealloc( PyObject * self )
-{
-	PyObject_DEL( self );
-}
-
 static PyObject *new_KeyBlock( KeyBlock * oldkeyBlock, Key *parentKey)
 {
 	BPy_KeyBlock *kb = PyObject_NEW( BPy_KeyBlock, &KeyBlock_Type );
diff --git a/source/blender/python/api2_2x/Lattice.c b/source/blender/python/api2_2x/Lattice.c
index fe6bd3f500a..fc32d215895 100644
--- a/source/blender/python/api2_2x/Lattice.c
+++ b/source/blender/python/api2_2x/Lattice.c
@@ -597,18 +597,6 @@ static PyObject *Lattice_copy( BPy_Lattice * self )
 	return py_Lattice;
 }
 
-//***************************************************************************
-// Function:      Lattice_dealloc  
-// Description: This is a callback function for the BPy_Lattice type. It is 
-//          the destructor function.      
-//***************************************************************************
-static void Lattice_dealloc( BPy_Lattice * self )
-{
-	PyObject_DEL( self );
-}
-
-
-
 static int Lattice_compare( BPy_Lattice * a, BPy_Lattice * b )
 {
 	return ( a->lattice == b->lattice ) ? 0 : -1;
@@ -751,8 +739,8 @@ PyTypeObject Lattice_Type = {
 	sizeof( BPy_Lattice ),	/* tp_basicsize */
 	0,			/* tp_itemsize */
 	/* methods */
-	( destructor ) Lattice_dealloc,	/* tp_dealloc */
-	0,			/* tp_print */
+	NULL,	/* tp_dealloc */
+	0,		/* tp_print */
 	NULL,	/* tp_getattr */
 	NULL,	/* tp_setattr */
 	( cmpfunc ) Lattice_compare,			/* tp_compare */
diff --git a/source/blender/python/api2_2x/MTex.c b/source/blender/python/api2_2x/MTex.c
index 13c2ac8e0b7..61ea64a68e9 100644
--- a/source/blender/python/api2_2x/MTex.c
+++ b/source/blender/python/api2_2x/MTex.c
@@ -65,7 +65,6 @@ static PyMethodDef BPy_MTex_methods[] = {
 /*****************************************************************************/
 /* Python MTex_Type callback function prototypes:                            */
 /*****************************************************************************/
-static void MTex_dealloc( BPy_MTex * self );
 static int MTex_compare( BPy_MTex * a, BPy_MTex * b );
 static PyObject *MTex_repr( BPy_MTex * self );
 
@@ -196,7 +195,7 @@ PyTypeObject MTex_Type = {
 	sizeof( BPy_MTex ),	/* tp_basicsize */
 	0,			/* tp_itemsize */
 	/* methods */
-	( destructor ) MTex_dealloc,	/* tp_dealloc */
+	NULL,		/* tp_dealloc */
 	0,			/* tp_print */
 	0,	/* tp_getattr */
 	0,	/* tp_setattr */
@@ -280,11 +279,6 @@ static PyObject *MTex_setTexMethod( BPy_MTex * self, PyObject * args )
 	return EXPP_setterWrapper( (void *)self, args, (setter)MTex_setTex );
 }
 
-static void MTex_dealloc( BPy_MTex * self )
-{
-	PyObject_DEL( self );
-}
-
 static int MTex_compare( BPy_MTex * a, BPy_MTex * b )
 {
 	return ( a->mtex == b->mtex ) ? 0 : -1;
diff --git a/source/blender/python/api2_2x/Main.c b/source/blender/python/api2_2x/Main.c
index 138c6f9fa7e..f25ef8bcf0e 100644
--- a/source/blender/python/api2_2x/Main.c
+++ b/source/blender/python/api2_2x/Main.c
@@ -618,16 +618,6 @@ PyObject *MainSeq_unlink(BPy_MainSeq *self, PyObject * args)
 				      "Only types Scene, Group and Text can unlink" );	
 }
 
-/************************************************************************
- *
- * Python MainSeq_Type standard operations
- *
- ************************************************************************/
-static void MainSeq_dealloc( BPy_MainSeq * self )
-{
-	PyObject_DEL( self );
-}
-
 static int MainSeq_compare( BPy_MainSeq * a, BPy_MainSeq * b )
 {
 	return ( a->type == b->type) ? 0 : -1;	
@@ -673,7 +663,7 @@ PyTypeObject MainSeq_Type = {
 
 	/* Methods to implement standard operations */
 
-	( destructor ) MainSeq_dealloc,/* destructor tp_dealloc; */
+	NULL,						/* destructor tp_dealloc; */
 	NULL,                       /* printfunc tp_print; */
 	NULL,                       /* getattrfunc tp_getattr; */
 	NULL,                       /* setattrfunc tp_setattr; */
diff --git a/source/blender/python/api2_2x/Mesh.c b/source/blender/python/api2_2x/Mesh.c
index aec85597fd9..7e8f51f5002 100644
--- a/source/blender/python/api2_2x/Mesh.c
+++ b/source/blender/python/api2_2x/Mesh.c
@@ -744,11 +744,6 @@ static int MCol_ass_item(BPy_MCol * self, int i, PyObject * value)
  *
  ************************************************************************/
 
-static void MCol_dealloc( BPy_MCol * self )
-{
-	PyObject_DEL( self );
-}
-
 static PyObject *MCol_repr( BPy_MCol * self )
 {
 	return PyString_FromFormat( "[MCol %d %d %d %d]",
@@ -783,7 +778,7 @@ PyTypeObject MCol_Type = {
 
 	/* Methods to implement standard operations */
 
-	( destructor ) MCol_dealloc,/* destructor tp_dealloc; */
+	NULL,						/* destructor tp_dealloc; */
 	NULL,                       /* printfunc tp_print; */
 	NULL,                       /* getattrfunc tp_getattr; */
 	NULL,                       /* setattrfunc tp_setattr; */
@@ -1976,11 +1971,6 @@ static struct PyMethodDef BPy_MVertSeq_methods[] = {
  *
  ************************************************************************/
 
-static void MVertSeq_dealloc( BPy_MVertSeq * self )
-{
-	PyObject_DEL( self );
-}
-
 /*****************************************************************************/
 /* Python MVertSeq_Type structure definition:                               */
 /*****************************************************************************/
@@ -1994,7 +1984,7 @@ PyTypeObject MVertSeq_Type = {
 
 	/* Methods to implement standard operations */
 
-	( destructor ) MVertSeq_dealloc,/* destructor tp_dealloc; */
+	NULL,						/* destructor tp_dealloc; */
 	NULL,                       /* printfunc tp_print; */
 	NULL,                       /* getattrfunc tp_getattr; */
 	NULL,                       /* setattrfunc tp_setattr; */
@@ -2440,11 +2430,6 @@ static PyObject *MEdge_nextIter( BPy_MEdge * self )
  *
  ************************************************************************/
 
-static void MEdge_dealloc( BPy_MEdge * self )
-{
-	PyObject_DEL( self );
-}
-
 static int MEdge_compare( BPy_MEdge * a, BPy_MEdge * b )
 {
 	return( a->mesh == b->mesh && a->index == b->index ) ? 0 : -1;
@@ -2483,7 +2468,7 @@ PyTypeObject MEdge_Type = {
 
 	/* Methods to implement standard operations */
 
-	( destructor ) MEdge_dealloc,/* destructor tp_dealloc; */
+	NULL,						/* destructor tp_dealloc; */
 	NULL,                       /* printfunc tp_print; */
 	NULL,                       /* getattrfunc tp_getattr; */
 	NULL,                       /* setattrfunc tp_setattr; */
@@ -3343,11 +3328,6 @@ static struct PyMethodDef BPy_MEdgeSeq_methods[] = {
  *
  ************************************************************************/
 
-static void MEdgeSeq_dealloc( BPy_MEdgeSeq * self )
-{
-	PyObject_DEL( self );
-}
-
 /*****************************************************************************/
 /* Python MEdgeSeq_Type structure definition:                               */
 /*****************************************************************************/
@@ -3361,7 +3341,7 @@ PyTypeObject MEdgeSeq_Type = {
 
 	/* Methods to implement standard operations */
 
-	( destructor ) MEdgeSeq_dealloc,/* destructor tp_dealloc; */
+	NULL,						/* destructor tp_dealloc; */
 	NULL,                       /* printfunc tp_print; */
 	NULL,                       /* getattrfunc tp_getattr; */
 	NULL,                       /* setattrfunc tp_setattr; */
@@ -4443,12 +4423,6 @@ static PyObject *MFace_nextIter( BPy_MFace * self )
  * Python MFace_Type standard operations
  *
  ************************************************************************/
-
-static void MFace_dealloc( BPy_MFace * self )
-{
-	PyObject_DEL( self );
-}
-
 static int MFace_compare( BPy_MFace * a, BPy_MFace * b )
 {
 	return( a->mesh == b->mesh && a->index == b->index ) ? 0 : -1;
@@ -4510,7 +4484,7 @@ PyTypeObject MFace_Type = {
 
 	/* Methods to implement standard operations */
 
-	( destructor ) MFace_dealloc,/* destructor tp_dealloc; */
+	NULL,						/* destructor tp_dealloc; */
 	NULL,                       /* printfunc tp_print; */
 	NULL,                       /* getattrfunc tp_getattr; */
 	NULL,                       /* setattrfunc tp_setattr; */
@@ -5283,11 +5257,6 @@ static struct PyMethodDef BPy_MFaceSeq_methods[] = {
  *
  ************************************************************************/
 
-static void MFaceSeq_dealloc( BPy_MFaceSeq * self )
-{
-	PyObject_DEL( self );
-}
-
 /*****************************************************************************/
 /* Python MFaceSeq_Type structure definition:                               */
 /*****************************************************************************/
@@ -5301,7 +5270,7 @@ PyTypeObject MFaceSeq_Type = {
 
 	/* Methods to implement standard operations */
 
-	( destructor ) MFaceSeq_dealloc,/* destructor tp_dealloc; */
+	NULL,						/* destructor tp_dealloc; */
 	NULL,                       /* printfunc tp_print; */
 	NULL,                       /* getattrfunc tp_getattr; */
 	NULL,                       /* setattrfunc tp_setattr; */
diff --git a/source/blender/python/api2_2x/Metaball.c b/source/blender/python/api2_2x/Metaball.c
index ba6e0364e59..baf8ae27ec6 100644
--- a/source/blender/python/api2_2x/Metaball.c
+++ b/source/blender/python/api2_2x/Metaball.c
@@ -156,7 +156,6 @@ static PyMethodDef BPy_Metaelem_methods[] = {
 /*****************************************************************************/
 /* Python Metaball_Type callback function prototypes:                       */
 /*****************************************************************************/
-static void Metaball_dealloc( BPy_Metaball * self );
 static PyObject *Metaball_repr( BPy_Metaball * self );
 static int Metaball_compare( BPy_Metaball * a, BPy_Metaball * b );
 
@@ -229,7 +228,7 @@ PyTypeObject Metaball_Type = {
 
 	/* Methods to implement standard operations */
 
-	( destructor ) Metaball_dealloc,/* destructor tp_dealloc; */
+	NULL,						/* destructor tp_dealloc; */
 	NULL,                       /* printfunc tp_print; */
 	NULL,                       /* getattrfunc tp_getattr; */
 	NULL,                       /* setattrfunc tp_setattr; */
@@ -732,14 +731,6 @@ static PyObject *Metaball_getElements( BPy_Metaball * self )
 }
 
 /*
- * Metaball dealloc - free from memory
- */
-static void Metaball_dealloc( BPy_Metaball * self )
-{
-	PyObject_DEL( self );
-}
-
-/*
  * Metaelem dealloc - free from memory
  */
 /* This is a callback function for the BPy_Metaelem type. It is */
diff --git a/source/blender/python/api2_2x/Modifier.c b/source/blender/python/api2_2x/Modifier.c
index 6745ad4aa8d..eefbd1b577d 100644
--- a/source/blender/python/api2_2x/Modifier.c
+++ b/source/blender/python/api2_2x/Modifier.c
@@ -176,7 +176,6 @@ static PyMappingMethods Modifier_as_mapping = {
 /*****************************************************************************/
 /* Python Modifier_Type callback function prototypes:                        */
 /*****************************************************************************/
-static void Modifier_dealloc( BPy_Modifier * self );
 static PyObject *Modifier_repr( BPy_Modifier * self );
 
 /*****************************************************************************/
@@ -192,7 +191,7 @@ PyTypeObject Modifier_Type = {
 
 	/* Methods to implement standard operations */
 
-	( destructor ) Modifier_dealloc,/* destructor tp_dealloc; */
+	NULL,						/* destructor tp_dealloc; */
 	NULL,                       /* printfunc tp_print; */
 	NULL,                       /* getattrfunc tp_getattr; */
 	NULL,                       /* setattrfunc tp_setattr; */
@@ -977,16 +976,6 @@ static int Modifier_setData( BPy_Modifier * self, PyObject * key,
 }
 
 /*****************************************************************************/
-/* Function:    Modifier_dealloc                                             */
-/* Description: This is a callback function for the BPy_Modifier type. It    */
-/*              destroys data when the object is deleted.                    */
-/*****************************************************************************/
-static void Modifier_dealloc( BPy_Modifier * self )
-{
-	PyObject_DEL( self );
-}
-
-/*****************************************************************************/
 /* Function:    Modifier_repr                                                */
 /* Description: This is a callback function for the BPy_Modifier type. It    */
 /*              builds a meaningful string to represent modifier objects.    */
@@ -1213,17 +1202,6 @@ static PyObject *ModSeq_moveDown( BPy_ModSeq * self, PyObject *args )
 	Py_RETURN_NONE;
 }
 
-
-/*****************************************************************************/
-/* Function:    ModSeq_dealloc                                            */
-/* Description: This is a callback function for the BPy_Modifier type. It    */
-/*              destroys data when the object is deleted.                    */
-/*****************************************************************************/
-static void ModSeq_dealloc( BPy_Modifier * self )
-{
-	PyObject_DEL( self );
-}
-
 /*****************************************************************************/
 /* Python BPy_ModSeq methods table:                                       */
 /*****************************************************************************/
@@ -1253,7 +1231,7 @@ PyTypeObject ModSeq_Type = {
 
 	/* Methods to implement standard operations */
 
-	( destructor ) ModSeq_dealloc,/* destructor tp_dealloc; */
+	NULL,						/* destructor tp_dealloc; */
 	NULL,                       /* printfunc tp_print; */
 	NULL,                       /* getattrfunc tp_getattr; */
 	NULL,                       /* setattrfunc tp_setattr; */
diff --git a/source/blender/python/api2_2x/NLA.c b/source/blender/python/api2_2x/NLA.c
index 22df94b4bfb..2c5011f94fc 100644
--- a/source/blender/python/api2_2x/NLA.c
+++ b/source/blender/python/api2_2x/NLA.c
@@ -120,7 +120,6 @@ static PyMethodDef BPy_Action_methods[] = {
 /*****************************************************************************/
 /* Python TypeAction callback function prototypes:			    */
 /*****************************************************************************/
-static void Action_dealloc( BPy_Action * bone );
 static int Action_compare( BPy_Action * a, BPy_Action * b );
 static PyObject *Action_repr( BPy_Action * bone );
 
@@ -366,12 +365,6 @@ static PyObject *Action_getAllChannelIpos( BPy_Action * self )
 }
 
 /*----------------------------------------------------------------------*/
-static void Action_dealloc( BPy_Action * self )
-{
-	PyObject_DEL( self );
-}
-
-/*----------------------------------------------------------------------*/
 static int Action_compare( BPy_Action * a, BPy_Action * b )
 {
 	return ( a->action == b->action ) ? 0 : -1;
@@ -432,8 +425,8 @@ PyTypeObject Action_Type = {
 	sizeof( BPy_Action ),	/* tp_basicsize */
 	0,			/* tp_itemsize */
 	/* methods */
-	( destructor ) Action_dealloc,	/* tp_dealloc */
-	NULL,			/* tp_print */
+	NULL,	/* tp_dealloc */
+	NULL,	/* tp_print */
 	NULL,	/* tp_getattr */
 	NULL,	/* tp_setattr */
 	( cmpfunc ) Action_compare,		/* tp_compare */
@@ -1055,7 +1048,7 @@ PyTypeObject ActionStrip_Type = {
 
 	/* Methods to implement standard operations */
 
-	( destructor ) Action_dealloc,/* destructor tp_dealloc; */
+	NULL,						/* destructor tp_dealloc; */
 	NULL,                       /* printfunc tp_print; */
 	NULL,                       /* getattrfunc tp_getattr; */
 	NULL,                       /* setattrfunc tp_setattr; */
@@ -1439,7 +1432,7 @@ PyTypeObject ActionStrips_Type = {
 
 	/* Methods to implement standard operations */
 
-	( destructor ) Action_dealloc,/* destructor tp_dealloc; */
+	NULL,						/* destructor tp_dealloc; */
 	NULL,                       /* printfunc tp_print; */
 	NULL,                       /* getattrfunc tp_getattr; */
 	NULL,                       /* setattrfunc tp_setattr; */
diff --git a/source/blender/python/api2_2x/NMesh.c b/source/blender/python/api2_2x/NMesh.c
index 0f9a3dd79ca..8e25f0e160e 100644
--- a/source/blender/python/api2_2x/NMesh.c
+++ b/source/blender/python/api2_2x/NMesh.c
@@ -398,11 +398,6 @@ static int check_NMeshLists( BPy_NMesh *nmesh )
 /*			Mesh Color Object		 */
 /*****************************/
 
-static void NMCol_dealloc( PyObject * self )
-{
-	PyObject_DEL( self );
-}
-
 static BPy_NMCol *newcol( char r, char g, char b, char a )
 {
 	BPy_NMCol *mc = ( BPy_NMCol * ) PyObject_NEW( BPy_NMCol, &NMCol_Type );
@@ -481,7 +476,7 @@ PyTypeObject NMCol_Type = {
 	sizeof( BPy_NMCol ),	/* tp_basicsize */
 	0,			/* tp_itemsize */
 	/* methods */
-	( destructor ) NMCol_dealloc,	/* tp_dealloc */
+	NULL,		/* tp_dealloc */
 	( printfunc ) 0,	/* tp_print */
 	( getattrfunc ) NMCol_getattr,	/* tp_getattr */
 	( setattrfunc ) NMCol_setattr,	/* tp_setattr */
@@ -837,11 +832,6 @@ static PyObject *M_NMesh_Vert( PyObject * self, PyObject * args )
 	return ( PyObject * ) newvert( co );
 }
 
-static void NMVert_dealloc( PyObject * self )
-{
-	PyObject_DEL( self );
-}
-
 static PyObject *NMVert_getattr( PyObject * self, char *name )
 {
 	BPy_NMVert *mv = ( BPy_NMVert * ) self;
@@ -993,7 +983,7 @@ PyTypeObject NMVert_Type = {
 	sizeof( BPy_NMVert ),	/*tp_basicsize */
 	0,			/*tp_itemsize */
 	/* methods */
-	( destructor ) NMVert_dealloc,	/*tp_dealloc */
+	NULL,				/*tp_dealloc */
 	( printfunc ) 0,	/*tp_print */
 	( getattrfunc ) NMVert_getattr,	/*tp_getattr */
 	( setattrfunc ) NMVert_setattr,	/*tp_setattr */
diff --git a/source/blender/python/api2_2x/Scene.c b/source/blender/python/api2_2x/Scene.c
index 96ca435cdc9..13258b32f53 100644
--- a/source/blender/python/api2_2x/Scene.c
+++ b/source/blender/python/api2_2x/Scene.c
@@ -94,7 +94,7 @@ PyObject *M_Object_Get( PyObject * self, PyObject * args ); /* from Object.c */
 enum obj_consts {
 	EXPP_OBSEQ_NORMAL = 0,
 	EXPP_OBSEQ_SELECTED,
-	EXPP_OBSEQ_CONTEXT,
+	EXPP_OBSEQ_CONTEXT
 };
 
 
@@ -152,7 +152,6 @@ static PyObject *Scene_getTimeLine( BPy_Scene * self );
 
 
 /*internal*/
-static void Scene_dealloc( BPy_Scene * self );
 static int Scene_compare( BPy_Scene * a, BPy_Scene * b );
 static PyObject *Scene_repr( BPy_Scene * self );
 
@@ -459,7 +458,7 @@ PyTypeObject Scene_Type = {
 	sizeof( BPy_Scene ),	/* tp_basicsize */
 	0,			/* tp_itemsize */
 	/* methods */
-	( destructor ) Scene_dealloc,	/* tp_dealloc */
+	NULL,						/* tp_dealloc */
 	NULL,                       /* printfunc tp_print; */
 	NULL,                       /* getattrfunc tp_getattr; */
 	NULL,                       /* setattrfunc tp_setattr; */
@@ -553,13 +552,6 @@ PyObject *Scene_Init( void )
 	return submodule;
 }
 
-/*-----------------------Scene module internal callbacks------------------
-  -----------------------dealloc------------------------------------------*/
-static void Scene_dealloc( BPy_Scene * self )
-{
-	PyObject_DEL( self );
-}
-
 /*-----------------------compare----------------------------------------*/
 static int Scene_compare( BPy_Scene * a, BPy_Scene * b )
 {
diff --git a/source/blender/python/api2_2x/Sound.c b/source/blender/python/api2_2x/Sound.c
index cb6d6394a28..ed366429ce3 100644
--- a/source/blender/python/api2_2x/Sound.c
+++ b/source/blender/python/api2_2x/Sound.c
@@ -89,7 +89,6 @@ struct PyMethodDef M_Sound_methods[] = {
 /*****************************************************************************/
 /* Python Sound_Type callback function prototypes:			*/
 /*****************************************************************************/
-static void Sound_dealloc( BPy_Sound * self );
 static int Sound_compare( BPy_Sound * a, BPy_Sound * b );
 static PyObject *Sound_repr( BPy_Sound * self );
 
@@ -319,15 +318,6 @@ PyObject *Sound_Init( void )
 /*** The Sound PyType ***/
 /************************/
 
-/*****************************************************************************/
-/* Function:		Sound_dealloc			         */
-/* Description: This is a callback function for the BPy_Sound type. It is  */
-/*	       	the destructor function.				*/
-/*****************************************************************************/
-static void Sound_dealloc( BPy_Sound * self )
-{
-	PyObject_DEL( self );
-}
 
 /*****************************************************************************/
 /* Function:	Sound_CreatePyObject					*/
@@ -558,8 +548,8 @@ PyTypeObject Sound_Type = {
 	sizeof( BPy_Sound ),	/* tp_basicsize */
 	0,			/* tp_itemsize */
 	/* methods */
-	( destructor ) Sound_dealloc,	/* tp_dealloc */
-	0,			/* tp_print */
+	NULL,	/* tp_dealloc */
+	0,		/* tp_print */
 	NULL,	/* tp_getattr */
 	NULL,	/* tp_setattr */
 	( cmpfunc ) Sound_compare,	/* tp_compare */
diff --git a/source/blender/python/api2_2x/SurfNurb.c b/source/blender/python/api2_2x/SurfNurb.c
index 981c1b1dbac..895e3e031ba 100644
--- a/source/blender/python/api2_2x/SurfNurb.c
+++ b/source/blender/python/api2_2x/SurfNurb.c
@@ -716,11 +716,6 @@ static PyGetSetDef BPy_SurfNurb_getseters[] = {
 	{NULL,NULL,NULL,NULL,NULL}  /* Sentinel */
 };
 
-void SurfNurb_dealloc( BPy_SurfNurb * self )
-{
-	PyObject_DEL( self );
-}
-
 /*
  * compare
  * in this case, we consider two SurfNurbs equal, if they point to the same
@@ -752,7 +747,7 @@ PyTypeObject SurfNurb_Type = {
 
 	/* Methods to implement standard operations */
 
-	( destructor ) SurfNurb_dealloc,/* destructor tp_dealloc; */
+	NULL,						/* destructor tp_dealloc; */
 	NULL,                       /* printfunc tp_print; */
 	NULL,                       /* getattrfunc tp_getattr; */
 	NULL,                       /* setattrfunc tp_setattr; */
diff --git a/source/blender/python/api2_2x/Text.c b/source/blender/python/api2_2x/Text.c
index 210cb84f217..23db85f7b36 100644
--- a/source/blender/python/api2_2x/Text.c
+++ b/source/blender/python/api2_2x/Text.c
@@ -124,7 +124,6 @@ static PyMethodDef BPy_Text_methods[] = {
 /*****************************************************************************/
 /* Python Text_Type callback function prototypes:                            */
 /*****************************************************************************/
-static void Text_dealloc( BPy_Text * self );
 static int Text_compare( BPy_Text * a, BPy_Text * b );
 static PyObject *Text_repr( BPy_Text * self );
 
@@ -460,16 +459,6 @@ static PyObject *Text_asLines( BPy_Text * self )
 }
 
 /*****************************************************************************/
-/* Function:    Text_dealloc                                                 */
-/* Description: This is a callback function for the BPy_Text type. It is     */
-/*              the destructor function.                                     */
-/*****************************************************************************/
-static void Text_dealloc( BPy_Text * self )
-{
-	PyObject_DEL( self );
-}
-
-/*****************************************************************************/
 /* Function:    Text_compare                                                 */
 /* Description: This is a callback function for the BPy_Text type. It        */
 /*              compares two Text_Type objects. Only the "==" and "!="       */
@@ -528,7 +517,7 @@ PyTypeObject Text_Type = {
 	sizeof( BPy_Text ),	/* tp_basicsize */
 	0,			/* tp_itemsize */
 	/* methods */
-	( destructor ) Text_dealloc,	/* tp_dealloc */
+	NULL,	/* tp_dealloc */
 	NULL,			/* tp_print */
 	NULL,	/* tp_getattr */
 	NULL,	/* tp_setattr */
diff --git a/source/blender/python/api2_2x/Text3d.c b/source/blender/python/api2_2x/Text3d.c
index 028005e128b..cf825bd242c 100644
--- a/source/blender/python/api2_2x/Text3d.c
+++ b/source/blender/python/api2_2x/Text3d.c
@@ -91,7 +91,6 @@ struct PyMethodDef M_Text3d_methods[] = {
 /* Python Text3d_Type callback function prototypes:                          */
 /*****************************************************************************/
 /* int Text3dPrint (BPy_Text3d *msh, FILE *fp, int flags); */
-static void Text3dDeAlloc( BPy_Text3d * self );
 
 
 static PyObject *Text3d_repr( BPy_Text3d * self );
@@ -359,10 +358,10 @@ PyTypeObject Text3d_Type = {
 	sizeof( BPy_Text3d ),	/* tp_basicsize */
 	0,			/* tp_itemsize */
 	/* methods */
-	( destructor ) Text3dDeAlloc,	/* tp_dealloc */
+	NULL,			/* tp_dealloc */
 	NULL,			/* tp_print */
-	NULL,	/* tp_getattr */
-	NULL,	/* tp_setattr */
+	NULL,			/* tp_getattr */
+	NULL,			/* tp_setattr */
 	( cmpfunc ) Text3d_compare,			/* tp_compare */
 	( reprfunc ) Text3d_repr,	/* tp_repr */
 	/* Method suites for standard classes */
@@ -599,11 +598,6 @@ PyObject *Text3d_Init( void )
 	return ( submodule );
 }
 
-static void Text3dDeAlloc( BPy_Text3d * self )
-{
-	PyObject_DEL( self );
-}
-
 /****************************************************************************
  * Function:    Text3d_repr                                                   
  * Description: Callback function for the BPy_Text3d type to It      
diff --git a/source/blender/python/api2_2x/Texture.c b/source/blender/python/api2_2x/Texture.c
index 9e657dec109..8d980ddf988 100644
--- a/source/blender/python/api2_2x/Texture.c
+++ b/source/blender/python/api2_2x/Texture.c
@@ -780,7 +780,6 @@ static PyGetSetDef BPy_Texture_getseters[] = {
 /*****************************************************************************/
 /* Python Texture_Type callback function prototypes:                         */
 /*****************************************************************************/
-static void Texture_dealloc( BPy_Texture * self );
 static int Texture_compare( BPy_Texture * a, BPy_Texture * b );
 static PyObject *Texture_repr( BPy_Texture * self );
 
@@ -797,7 +796,7 @@ PyTypeObject Texture_Type = {
 
 	/* Methods to implement standard operations */
 
-	( destructor ) Texture_dealloc,/* destructor tp_dealloc; */
+	NULL,						/* destructor tp_dealloc; */
 	NULL,                       /* printfunc tp_print; */
 	NULL,                       /* getattrfunc tp_getattr; */
 	NULL,                       /* setattrfunc tp_setattr; */
@@ -974,11 +973,6 @@ static PyObject *Texture_repr( BPy_Texture * self )
 				    self->texture->id.name + 2 );
 }
 
-static void Texture_dealloc( BPy_Texture * self )
-{
-	PyObject_DEL( self );
-}
-
 static PyObject *M_Texture_TypesDict( void )
 {
 	PyObject *Types = PyConstant_New(  );
diff --git a/source/blender/python/api2_2x/World.c b/source/blender/python/api2_2x/World.c
index 0c45c6d40a6..c16d4c3fc97 100644
--- a/source/blender/python/api2_2x/World.c
+++ b/source/blender/python/api2_2x/World.c
@@ -117,7 +117,6 @@ static PyObject *M_World_GetCurrent( PyObject * self );
 /*****************************************************************************/
 /* Python World_Type callback function prototypes:			*/
 /*****************************************************************************/
-static void World_DeAlloc( BPy_World * self );
 //static int World_Print (BPy_World *self, FILE *fp, int flags);
 static int World_Compare( BPy_World * a, BPy_World * b );
 static PyObject *World_Repr( BPy_World * self );
@@ -267,8 +266,8 @@ PyTypeObject World_Type = {
 	sizeof( BPy_World ),	/* tp_basicsize */
 	0,			/* tp_itemsize */
 	/* methods */
-	( destructor ) World_DeAlloc,	/* tp_dealloc */
-	0,			/* tp_print */
+	NULL,	/* tp_dealloc */
+	0,		/* tp_print */
 	NULL,	/* tp_getattr */
 	NULL,	/* tp_setattr */
 	( cmpfunc ) World_Compare,	/* tp_compare */
@@ -908,18 +907,6 @@ static PyObject *World_copy( BPy_World * self )
 	return World_CreatePyObject(world);
 }
 
-
-/*@{*/
-
-/**
- * \brief The World PyType destructor
- */
-
-static void World_DeAlloc( BPy_World * self )
-{
-	PyObject_DEL( self );
-}
-
 /**
  * \brief The World PyType compare function
  *
diff --git a/source/blender/python/api2_2x/charRGBA.c b/source/blender/python/api2_2x/charRGBA.c
index 76897088166..35ff546d0d5 100644
--- a/source/blender/python/api2_2x/charRGBA.c
+++ b/source/blender/python/api2_2x/charRGBA.c
@@ -39,7 +39,6 @@
 /*****************************************************************************/
 /* Python charRGBA_Type callback function prototypes:			  */
 /*****************************************************************************/
-static void charRGBA_dealloc( BPy_charRGBA * self );
 static PyObject *charRGBA_getAttr( BPy_charRGBA * self, char *name );
 static int charRGBA_setAttr( BPy_charRGBA * self, char *name, PyObject * v );
 static PyObject *charRGBA_repr( BPy_charRGBA * self );
@@ -88,7 +87,7 @@ PyTypeObject charRGBA_Type = {
 	sizeof( BPy_charRGBA ),	/* tp_basicsize */
 	0,			/* tp_itemsize */
 	/* methods */
-	( destructor ) charRGBA_dealloc,	/* tp_dealloc */
+	NULL,		/* tp_dealloc */
 	0,			/* tp_print */
 	( getattrfunc ) charRGBA_getAttr,	/* tp_getattr */
 	( setattrfunc ) charRGBA_setAttr,	/* tp_setattr */
@@ -177,16 +176,6 @@ PyObject *charRGBA_setCol( BPy_charRGBA * self, PyObject * args )
 }
 
 /*****************************************************************************/
-/* Function:	charRGBA_dealloc 					 */
-/* Description: This is a callback function for the BPy_charRGBA type. It is */
-/*		the destructor function.				 */
-/*****************************************************************************/
-static void charRGBA_dealloc( BPy_charRGBA * self )
-{
-	PyObject_DEL( self );
-}
-
-/*****************************************************************************/
 /* Function:	charRGBA_getAttr					 */
 /* Description: This is a callback function for the BPy_charRGBA type. It is */
 /*		the function that accesses BPy_charRGBA member variables and */
diff --git a/source/blender/python/api2_2x/rgbTuple.c b/source/blender/python/api2_2x/rgbTuple.c
index c498601222f..8536d641042 100644
--- a/source/blender/python/api2_2x/rgbTuple.c
+++ b/source/blender/python/api2_2x/rgbTuple.c
@@ -40,7 +40,6 @@
 /*****************************************************************************/
 /* Python rgbTuple_Type callback function prototypes:                        */
 /*****************************************************************************/
-static void rgbTuple_dealloc( BPy_rgbTuple * self );
 static PyObject *rgbTuple_getAttr( BPy_rgbTuple * self, char *name );
 static int rgbTuple_setAttr( BPy_rgbTuple * self, char *name, PyObject * v );
 static PyObject *rgbTuple_repr( BPy_rgbTuple * self );
@@ -90,7 +89,7 @@ PyTypeObject rgbTuple_Type = {
 	sizeof( BPy_rgbTuple ),	/* tp_basicsize */
 	0,			/* tp_itemsize */
 	/* methods */
-	( destructor ) rgbTuple_dealloc,	/* tp_dealloc */
+	NULL,		/* tp_dealloc */
 	0,			/* tp_print */
 	( getattrfunc ) rgbTuple_getAttr,	/* tp_getattr */
 	( setattrfunc ) rgbTuple_setAttr,	/* tp_setattr */
@@ -185,16 +184,6 @@ int rgbTuple_setCol( BPy_rgbTuple * self, PyObject * args )
 }
 
 /*****************************************************************************/
-/* Function:    rgbTuple_dealloc                                             */
-/* Description: This is a callback function for the BPy_rgbTuple type. It is */
-/*              the destructor function.                                     */
-/*****************************************************************************/
-static void rgbTuple_dealloc( BPy_rgbTuple * self )
-{
-	PyObject_DEL( self );
-}
-
-/*****************************************************************************/
 /* Function:    rgbTuple_getAttr                                             */
 /* Description: This is a callback function for the BPy_rgbTuple type. It is */
 /*              the function that accesses BPy_rgbTuple member variables and */
diff --git a/source/blender/python/api2_2x/sceneRadio.c b/source/blender/python/api2_2x/sceneRadio.c
index 080f99cd4f9..ca76869a615 100644
--- a/source/blender/python/api2_2x/sceneRadio.c
+++ b/source/blender/python/api2_2x/sceneRadio.c
@@ -105,7 +105,6 @@ static PyObject *Radio_subdividePatches( BPy_Radio * self );
 static PyObject *Radio_subdivideElems( BPy_Radio * self );
 static PyObject *Radio_removeDoubles( BPy_Radio * self );
 
-static void Radio_dealloc( BPy_Radio * self );
 static PyObject *Radio_repr( BPy_Radio * self );
 
 static PyObject *EXPP_create_ret_PyInt( int value )
@@ -630,7 +629,7 @@ static PyTypeObject Radio_Type = {
 	"Blender Radiosity",	/*tp_name */
 	sizeof( BPy_Radio ),	/*tp_basicsize */
 	0,			/*tp_itemsize */
-	( destructor ) Radio_dealloc,	/*tp_dealloc */
+	NULL,		/*tp_dealloc */
 	0,			/*tp_print */
 	0,			/*tp_getattr */
 	0,			/*tp_setattr */
@@ -667,11 +666,6 @@ static PyTypeObject Radio_Type = {
 	0, 0, 0, 0, 0, 0, 0, 0,	/* up to tp_del, so we don't get a warning */
 };
 
-static void Radio_dealloc( BPy_Radio * self )
-{
-	PyObject_DEL( self );
-}
-
 static PyObject *Radio_repr( BPy_Radio * self )
 {
 	if( self->radio )
diff --git a/source/blender/python/api2_2x/sceneRender.c b/source/blender/python/api2_2x/sceneRender.c
index 2034a00788f..541937304e2 100644
--- a/source/blender/python/api2_2x/sceneRender.c
+++ b/source/blender/python/api2_2x/sceneRender.c
@@ -130,11 +130,6 @@ static PyObject *RenderData_Render( BPy_RenderData * self );
 
 /* BPy_RenderData Internal Protocols */
 
-static void RenderData_dealloc( BPy_RenderData * self )
-{
-	PyObject_DEL( self );
-}
-
 static PyObject *RenderData_repr( BPy_RenderData * self )
 {
 	if( self->renderContext )
@@ -2473,7 +2468,7 @@ PyTypeObject RenderData_Type = {
 
 	/* Methods to implement standard operations */
 
-	( destructor ) RenderData_dealloc,/* destructor tp_dealloc; */
+	NULL,						/* destructor tp_dealloc; */
 	NULL,                       /* printfunc tp_print; */
 	NULL,                       /* getattrfunc tp_getattr; */
 	NULL,                       /* setattrfunc tp_setattr; */
diff --git a/source/blender/python/api2_2x/sceneSequence.c b/source/blender/python/api2_2x/sceneSequence.c
index f6cad95b8ab..645d52370ea 100644
--- a/source/blender/python/api2_2x/sceneSequence.c
+++ b/source/blender/python/api2_2x/sceneSequence.c
@@ -293,8 +293,6 @@ static PyObject *Sequence_copy( BPy_Sequence * self )
 /*****************************************************************************/
 /* PythonTypeObject callback function prototypes			 */
 /*****************************************************************************/
-static void Sequence_dealloc( BPy_Sequence * obj );
-static void SceneSeq_dealloc( BPy_Sequence * obj );
 static PyObject *Sequence_repr( BPy_Sequence * obj );
 static PyObject *SceneSeq_repr( BPy_SceneSeq * obj );
 static int Sequence_compare( BPy_Sequence * a, BPy_Sequence * b );
@@ -791,7 +789,7 @@ PyTypeObject Sequence_Type = {
 
 	/* Methods to implement standard operations */
 
-	( destructor ) Sequence_dealloc,/* destructor tp_dealloc; */
+	NULL,/* destructor tp_dealloc; */
 	NULL,                       /* printfunc tp_print; */
 	NULL,                       /* getattrfunc tp_getattr; */
 	NULL,                       /* setattrfunc tp_setattr; */
@@ -878,7 +876,7 @@ PyTypeObject SceneSeq_Type = {
 
 	/* Methods to implement standard operations */
 
-	( destructor ) SceneSeq_dealloc,/* destructor tp_dealloc; */
+	NULL,/* destructor tp_dealloc; */
 	NULL,                       /* printfunc tp_print; */
 	NULL,                       /* getattrfunc tp_getattr; */
 	NULL,                       /* setattrfunc tp_setattr; */
@@ -1047,21 +1045,6 @@ struct Sequence *Sequence_FromPyObject( PyObject * py_seq )
 }
 
 /*****************************************************************************/
-/* Function:	Sequence_dealloc						 */
-/* Description: This is a callback function for the BlenObject type. It is  */
-/*		the destructor function.				 */
-/*****************************************************************************/
-static void Sequence_dealloc( BPy_Sequence * seq )
-{
-	PyObject_DEL( seq );
-}
-static void SceneSeq_dealloc( BPy_Sequence * seq )
-{
-	PyObject_DEL( seq );
-}
-
-
-/*****************************************************************************/
 /* Function:	Sequence_compare						 */
 /* Description: This is a callback function for the BPy_Sequence type. It	 */
 /*		compares two Sequence_Type objects. Only the "==" and "!="  */
diff --git a/source/blender/python/api2_2x/sceneTimeLine.c b/source/blender/python/api2_2x/sceneTimeLine.c
index 07dca6e7cdb..5c00b9f8925 100644
--- a/source/blender/python/api2_2x/sceneTimeLine.c
+++ b/source/blender/python/api2_2x/sceneTimeLine.c
@@ -58,10 +58,6 @@ static PyObject *TimeLine_setNameMarker (BPy_TimeLine *self, PyObject *args);
 static PyObject *TimeLine_getNameMarker (BPy_TimeLine *self, PyObject *args);
 static PyObject *TimeLine_getFramesMarked (BPy_TimeLine *self, PyObject *args);
 
-static void TimeLine_dealloc (PyObject *self) {
-	PyObject_DEL (self);
-}
-
 static PyObject *TimeLine_repr (BPy_TimeLine *self) {
 
 	return PyString_FromFormat ("[TimeLine]");
@@ -118,7 +114,7 @@ PyTypeObject TimeLine_Type = {
 	sizeof (BPy_TimeLine),	/* tp_basicsize */
 	0,			/* tp_itemsize */
 	/* methods */
-	(destructor) TimeLine_dealloc,	/* tp_dealloc */
+	NULL,	/* tp_dealloc */
 	(printfunc) 0,	/* tp_print */
 	(getattrfunc) TimeLine_getattr,	/* tp_getattr */
 	(setattrfunc) TimeLine_setattr,	/* tp_setattr */
diff --git a/source/blender/python/api2_2x/windowTheme.c b/source/blender/python/api2_2x/windowTheme.c
index 237cf1d0dae..a86f80f7e5f 100644
--- a/source/blender/python/api2_2x/windowTheme.c
+++ b/source/blender/python/api2_2x/windowTheme.c
@@ -94,7 +94,6 @@ struct PyMethodDef M_Theme_methods[] = {
 	{NULL, NULL, 0, NULL}
 };
 
-static void ThemeSpace_dealloc( BPy_ThemeSpace * self );
 static int ThemeSpace_compare( BPy_ThemeSpace * a, BPy_ThemeSpace * b );
 static PyObject *ThemeSpace_repr( BPy_ThemeSpace * self );
 static PyObject *ThemeSpace_getAttr( BPy_ThemeSpace * self, char *name );
@@ -111,7 +110,7 @@ PyTypeObject ThemeSpace_Type = {
 	sizeof( BPy_ThemeSpace ),	/* tp_basicsize */
 	0,			/* tp_itemsize */
 	/* methods */
-	( destructor ) ThemeSpace_dealloc,	/* tp_dealloc */
+	0,			/* tp_dealloc */
 	0,			/* tp_print */
 	( getattrfunc ) ThemeSpace_getAttr,	/* tp_getattr */
 	( setattrfunc ) ThemeSpace_setAttr,	/* tp_setattr */
@@ -129,11 +128,6 @@ PyTypeObject ThemeSpace_Type = {
 	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 };
 
-static void ThemeSpace_dealloc( BPy_ThemeSpace * self )
-{
-	PyObject_DEL( self );
-}
-
 #define ELSEIF_TSP_RGBA(attr)\
 	else if (!strcmp(name, #attr))\
 		attrib = charRGBA_New(&tsp->attr[0]);
@@ -336,7 +330,6 @@ static PyObject *ThemeSpace_repr( BPy_ThemeSpace * self )
 				    self->theme->name );
 }
 
-static void ThemeUI_dealloc( BPy_ThemeUI * self );
 static int ThemeUI_compare( BPy_ThemeUI * a, BPy_ThemeUI * b );
 static PyObject *ThemeUI_repr( BPy_ThemeUI * self );
 static PyObject *ThemeUI_getAttr( BPy_ThemeUI * self, char *name );
@@ -352,7 +345,7 @@ PyTypeObject ThemeUI_Type = {
 	sizeof( BPy_ThemeUI ),	/* tp_basicsize */
 	0,			/* tp_itemsize */
 	/* methods */
-	( destructor ) ThemeUI_dealloc,	/* tp_dealloc */
+	0,			/* tp_dealloc */
 	0,			/* tp_print */
 	( getattrfunc ) ThemeUI_getAttr,	/* tp_getattr */
 	( setattrfunc ) ThemeUI_setAttr,	/* tp_setattr */
@@ -370,11 +363,6 @@ PyTypeObject ThemeUI_Type = {
 	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 };
 
-static void ThemeUI_dealloc( BPy_ThemeUI * self )
-{
-	PyObject_DEL( self );
-}
-
 #define ELSEIF_TUI_RGBA(attr)\
 	else if (!strcmp(name, #attr))\
 		attrib = charRGBA_New(&tui->attr[0]);
@@ -512,7 +500,6 @@ static PyObject *ThemeUI_repr( BPy_ThemeUI * self )
 				    self->theme->name );
 }
 
-static void Theme_dealloc( BPy_Theme * self );
 static int Theme_compare( BPy_Theme * a, BPy_Theme * b );
 static PyObject *Theme_getAttr( BPy_Theme * self, char *name );
 static PyObject *Theme_repr( BPy_Theme * self );
@@ -542,7 +529,7 @@ PyTypeObject Theme_Type = {
 	sizeof( BPy_Theme ),	/* tp_basicsize */
 	0,			/* tp_itemsize */
 	/* methods */
-	( destructor ) Theme_dealloc,	/* tp_dealloc */
+	0,			/* tp_dealloc */
 	0,			/* tp_print */
 	( getattrfunc ) Theme_getAttr,	/* tp_getattr */
 	0,			//(setattrfunc) Theme_setAttr,        /* tp_setattr */
@@ -800,11 +787,6 @@ PyObject *Theme_Init( void )
 	return submodule;
 }
 
-static void Theme_dealloc( BPy_Theme * self )
-{
-	PyObject_DEL( self );
-}
-
 static PyObject *Theme_getAttr( BPy_Theme * self, char *name )
 {
 	PyObject *attr = Py_None;