--- a/calendarui/controller/src/calendeletingstate.cpp	Tue Feb 02 10:12:19 2010 +0200
+++ b/calendarui/controller/src/calendeletingstate.cpp	Fri Apr 16 14:57:40 2010 +0300
@@ -11,12 +11,11 @@
 *
 * Contributors:
 *
-* Description:   Calendar state machine
+* Description:  Calendar state machine
 *
 */
 
 
-
 // includes
 #include "calendeletingstate.h"
 #include "calendarui_debug.h"           // Debug macros
@@ -80,7 +79,7 @@
 
 // ----------------------------------------------------------------------------
 // CCalenDeletingState::HandleCommandL
-// From CCalenState
+// From CCCalenState
 // ----------------------------------------------------------------------------    
 TBool CCalenDeletingState::HandleCommandL( const TCalenCommand& aCommand,
                                          CCalenStateMachine& aStateMachine )
@@ -94,34 +93,18 @@
     
     TBool cmdUsed = EFalse;
     
-    if(ECalenDeleteEntryWithoutQuery == cmd)
+    if( cmd == ECalenDeleteEntryWithoutQuery )
         {
         RequestCallbackL( handler, aCommand );
         cmdUsed = ETrue;
         }
-    else if(ECalenFasterAppExit == cmd)
+    else if( ECalenFasterAppExit == cmd )
     	{
         SetCurrentState( aStateMachine, CCalenStateMachine::ECalenIdleState );
         ActivateCurrentStateL(aStateMachine);
         RequestCallbackL( handler, aCommand );
         cmdUsed = ETrue;
     	}
-    else if(ECalenStartActiveStep == cmd)
-        {
-        RequestCallbackL( handler, aCommand );
-        cmdUsed = ETrue;
-        }
-    
-    else if(ECalenMissedEventViewFromIdle == cmd)
-        {
-        RequestCallbackL( handler, aCommand );
-        cmdUsed = ETrue;
-        }
-    else if(ECalenMissedAlarmsViewFromIdle == cmd)
-        {
-        RequestCallbackL( handler, aCommand );
-        cmdUsed = ETrue;
-        }
 
     TRACE_EXIT_POINT;
     return cmdUsed;
@@ -129,7 +112,7 @@
 
 // ----------------------------------------------------------------------------
 // CCalenDeletingState::HandleNotificationL
-// From CCalenState
+// From CCCalenState
 // ----------------------------------------------------------------------------        
 void CCalenDeletingState::HandleNotificationL(const TCalenNotification& aNotification,
                                               CCalenStateMachine& aStateMachine )