--- a/lowlevellibsandfws/pluginfw/Framework/FrameTests/MagicUnitTests.cpp	Tue Aug 31 16:54:36 2010 +0300
+++ b/lowlevellibsandfws/pluginfw/Framework/FrameTests/MagicUnitTests.cpp	Wed Sep 01 12:36:54 2010 +0100
@@ -60,8 +60,6 @@
 	iStateAccessor = NULL;
 	delete iCtorValidator;
 	delete iDtorValidator;
-	iCtorValidator = 0;
-	iDtorValidator = 0;
 
 	return error;
 	}
@@ -275,16 +273,10 @@
 	TInt error = CUnitTest::RunError(aError);	// Chain to base
 	delete iUTContext;
 	delete iStateAccessor;
-	
-	iUTContext = 0;
-	iStateAccessor = 0;
 
 	delete iCtorValidator;
 	delete iDtorValidator;
 
-	iCtorValidator = 0;
-	iDtorValidator = 0;
-	
 	return error;
 	}
 
@@ -343,17 +335,11 @@
 	{
 	// The RunL left so chain to the base first and then cleanup
 	TInt error = CUnitTest::RunError(aError);	// Chain to base
-    delete iUTContext;
-    delete iStateAccessor;
-
-    delete iCtorValidator;
-    delete iDtorValidator;
+	delete iUTContext;
+	delete iStateAccessor;
 
-    iUTContext = 0;
-    iStateAccessor = 0;
-
-    iCtorValidator = 0;
-    iDtorValidator = 0;
+	delete iCtorValidator;
+	delete iDtorValidator;
 
 	return error;
 	}
@@ -413,19 +399,12 @@
 	{
 	// The RunL left so chain to the base first and then cleanup
 	TInt error = CUnitTest::RunError(aError);	// Chain to base
-    delete iUTContext;
-    delete iStateAccessor;
-
-    delete iCtorValidator;
-    delete iDefaultValidator;
-    delete iDtorValidator;
+	delete iUTContext;
+	delete iStateAccessor;
 
-    iUTContext = 0;
-    iStateAccessor = 0;
-
-    iCtorValidator = 0;
-    iDefaultValidator = 0;
-    iDtorValidator = 0;
+	delete iCtorValidator;
+	delete iDefaultValidator;
+	delete iDtorValidator;
 
 	return error;
 	}
@@ -488,19 +467,12 @@
 	{
 	// The RunL left so chain to the base first and then cleanup
 	TInt error = CUnitTest::RunError(aError);	// Chain to base
-    delete iUTContext;
-    delete iStateAccessor;
-
-    delete iCtorValidator;
-    delete iDefaultValidator;
-    delete iDtorValidator;
+	delete iUTContext;
+	delete iStateAccessor;
 
-    iUTContext = 0;
-    iStateAccessor = 0;
-
-    iCtorValidator = 0;
-    iDefaultValidator = 0;
-    iDtorValidator = 0;
+	delete iCtorValidator;
+	delete iDefaultValidator;
+	delete iDtorValidator;
 
 	return error;
 	}