--- a/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmCustomTsy.cpp	Fri Mar 12 15:49:38 2010 +0200
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmCustomTsy.cpp	Mon Mar 15 12:45:06 2010 +0200
@@ -141,7 +141,7 @@
 CMmCustomTsy::~CMmCustomTsy()
     {
 TFLOGSTRING("TSY: CMmCustomTsy::~CMmCustomTsy");
-    iMmPhoneTsy->SetHomeZoneParamsChecked( EFalse );
+
 	iFeatureControl.Close();
 	
     // Delete subsystems
@@ -150,34 +150,19 @@
         delete iMmSubTsy[i];
         }
 
-    if ( iMmSecurityTsy )
-        {
-        // Delete SecurityTsy
-        delete iMmSecurityTsy;
-        }
-
-    if ( iMmCustomExtInterface )
-        {
-        // Delete GSM extensions
-        delete iMmCustomExtInterface;
-        }
-
-    if ( iTsyReqHandleStore )
-        {
-        // delete req handle store
-        delete iTsyReqHandleStore;
-        }
-
-    iMmSecurityTsy = NULL;
-    iMmCustomExtInterface = NULL;
-    iTsyReqHandleStore = NULL;
-    iISVDialNumberCheckObject = NULL;
-    iCFISCentRep = NULL;
+    // Delete SecurityTsy
+    delete iMmSecurityTsy;
+
+    // Delete GSM extensions
+    delete iMmCustomExtInterface;
+    
+    // delete req handle store
+    delete iTsyReqHandleStore;
 
     if ( iMmPhoneTsy )
         {
+        iMmPhoneTsy->SetHomeZoneParamsChecked( EFalse );
         iMmPhoneTsy->SetCustomTsy( NULL );
-
         // unregister custom tsy in the message manager
         iMmPhoneTsy->MessageManager()->DeregisterTsyObject(this);
         }