--- a/phoneapp/phoneuistates/inc/cphoneemergency.h	Thu Aug 19 09:54:27 2010 +0300
+++ b/phoneapp/phoneuistates/inc/cphoneemergency.h	Tue Aug 31 15:14:29 2010 +0300
@@ -95,11 +95,6 @@
         * Handle state-specific behaviour handleErrorL
         */ 
         void HandleErrorL( const TPEErrorInfo& aErrorInfo );
-
-        /**
-        * Open menu bar
-        */
-        void OpenMenuBarL();
         
         virtual void UpdateInCallCbaL();
         
@@ -146,13 +141,6 @@
         * Handle initializing cba's
         */
         void UpdateSetupCbaL();
-        
-        /**
-        * Passes create number entry command forward if not call setup
-        */
-        void HandleCreateNumberEntryL( 
-                const TKeyEvent& aKeyEvent,
-                TEventCode aEventCode );
        
         /**
         * Handles commands from the Remote Control framework.
@@ -165,37 +153,36 @@
                     TRemConCoreApiButtonAction aButtonAct );
         
     private:
-    	
-    	/**
-		* Check whether UseEmergencyNoIhfCBA set should be used or not. 
-		* @param aAudioOutput current audio output type.
+        
+        /**
+        * Check whether UseEmergencyNoIhfCBA set should be used or not. 
+        * @param aAudioOutput current audio output type.
         * @return ETrue if UseEmergencyNoIhfCBA should be used,
         * EFalse otherwise.
-		*/
-    	TBool UseEmergencyNoIhfCBA( const TPEAudioOutput& aAudioOutput ) const;
-    	
-    	/**
-		* Check whether UseHandsetEmergencyCBA set should be used or not.
-		* @param aAudioOutput current audio output type.
+        */
+        TBool UseEmergencyNoIhfCBA( const TPEAudioOutput& aAudioOutput ) const;
+        
+        /**
+        * Check whether UseHandsetEmergencyCBA set should be used or not.
+        * @param aAudioOutput current audio output type.
         * @return ETrue if UseHandsetEmergencyCBA should be used,
         * EFalse otherwise.
-		*/
-    	TBool UseHandsetEmergencyCBA( const TPEAudioOutput& aAudioOutput ) const;
-    	
-    	/**
-		* Check whether the touch call handling is supported or not.
-		* @return ETrue if KFeatureIdTouchCallHandling is supported,
-		* EFalse otherwise.
-		*/
-    	TBool TouchCallHandlingSupported () const;
-    	
-       /**
-       * Update status of startup if startup finish during emergency call
-       */
-       void HandlePhoneStartupL();
+        */
+        TBool UseHandsetEmergencyCBA( const TPEAudioOutput& aAudioOutput ) const;
+        
+        /**
+        * Check whether the touch call handling is supported or not.
+        * @return ETrue if KFeatureIdTouchCallHandling is supported,
+        * EFalse otherwise.
+        */
+        TBool TouchCallHandlingSupported () const;
          
     private:
- 
+        /**
+        * Is device lock on/off
+        */
+        TBool iDeviceLockOn;
+        
         /**
         * If true update emergency call wait note
         */