--- a/contextengine/plugins/calendarplugin/src/CalendarContextPlugin.cpp	Wed Sep 15 12:40:59 2010 +0300
+++ b/contextengine/plugins/calendarplugin/src/CalendarContextPlugin.cpp	Wed Oct 13 15:02:02 2010 +0300
@@ -89,15 +89,12 @@
 	{
 	WRITELOG( "CCalendarContextPlugin::~CCalendarContextPlugin -- ENTER" );
 	delete iCalInstanceView;
-	iCalInstanceView = NULL;
 	delete iCalSession;
-	iCalSession = NULL;
 	
 	if( iInitTimer )
 	    {
 	    iInitTimer->Cancel();
 	    delete iInitTimer;
-	    iInitTimer = NULL;
 	    }
 		
 	WRITELOG( "CCalendarContextPlugin::~CCalendarContextPlugin -- RETURN" );
@@ -369,15 +366,11 @@
 			}
 
 		WRITELOG( "CCalendarContextPlugin::AddMetaDataL - Add calendar relation to MDE" );
-#ifdef _DEBUG
 		TRAP( addError, iMdeSession->AddRelationL( *relationObject ) );
 		if ( addError != KErrNone)
 			{
 			WRITELOG1( "CCalendarContextPlugin::AddMetaDataL - Add calendar relation to MDE error: %d", addError );
 			}
-#else
-		TRAP_IGNORE( iMdeSession->AddRelationL( *relationObject ) );	
-#endif
 
 		CleanupStack::PopAndDestroy( relationObject );
 		CleanupStack::PopAndDestroy( calendarObject );
@@ -523,6 +516,7 @@
 void CCalendarContextPlugin::StartRetryL()
     {
     WRITELOG( "CCalendarContextPlugin::StartRetryL() ENTER" );
+    TInt err(KErrNone);
     
     if(iRetryCount++ > KMaxRetryCount)
         {
@@ -541,11 +535,10 @@
 		return; 
         }
     
-#ifdef _DEBUG
-    TInt err( KErrNone );
+    
     if(!iInitTimer)
         {
-        TRAP(err, iInitTimer = CPeriodic::NewL( CActive::EPriorityStandard ) );
+        TRAP(err, iInitTimer = CPeriodic::NewL(CActive::EPriorityStandard) );
         }
                 
     if( err != KErrNone )
@@ -553,13 +546,7 @@
         WRITELOG1( "CCalendarContextPlugin::OpenViewL() iInitTimer->Start failed %d", err );
         User::Leave( err );
         }
-#else
-    if(!iInitTimer)
-        {
-        iInitTimer = CPeriodic::NewL( CActive::EPriorityStandard );
-        }    
-#endif
-    
+        
     WRITELOG( "CCalendarContextPlugin::OpenViewL() iInitTimer->Start" );
     iInitTimer->Start( KInitRetryTimeout, KInitRetryTimeout, TCallBack(InitRetryCallback, this));
     WRITELOG( "CCalendarContextPlugin::StartRetryL() RETURN" );