diff -r 40a3f856b14d -r 41a7f70b3818 phoneapp/phoneuicontrol/inc/mphonestatemachine.h
--- a/phoneapp/phoneuicontrol/inc/mphonestatemachine.h	Thu Aug 19 09:54:27 2010 +0300
+++ b/phoneapp/phoneuicontrol/inc/mphonestatemachine.h	Tue Aug 31 15:14:29 2010 +0300
@@ -30,8 +30,7 @@
 class MPEPhoneModel;
 class MPEEngineInfo;
 class CSpdiaControl;
-class MPhoneSecurityMessageHandler;
-class MPhoneSecurityModeObserver;
+class MPhoneStorage;
 
 /**
 *  Describes the interface for setting and getting active state
@@ -87,46 +86,11 @@
         * @param aCallId
         */    
         virtual void SetCallId( TInt aCallId ) = 0;
-    
-        /**
-         * Getter for security mode observer interface.
-         * 
-         * @return Pointer to security mode interface.
-         */
-        virtual MPhoneSecurityModeObserver* SecurityMode() = 0;
-        
-		/**
-		 * Sets security mode observer. Doesn't transfer ownership.
-		 *
-		 * @param aObserver Pointer to observer instance.
-		 */
-		virtual void SetSecurityModeObserver( MPhoneSecurityModeObserver* aObserver ) = 0;
-		
-		/**
-		 * Set security message handler for security message observations.
-		 * 
-		 * @param aHandler Pointer to handler instance. 
-		 */
-		virtual void SetSecurityMessageHandler( MPhoneSecurityMessageHandler* aHandler ) = 0;
-		
-        /**
-         * Handle phone engine message.
-         * 
-         * @param aMessage Message
-         * @param aCallId Call id
-         */
-        virtual void HandlePhoneEngineMessageL(const TInt aMessage, 
-        	TInt aCallId ) = 0;
         
         /**
-         * This function is called when there is property value change.
-         * @param aCategory Category of the property
-         * @param aKey Property key that is changed
-         * @param aValue New property value
-         */
-        virtual void HandlePropertyChangedL(const TUid& aCategory,
-        	const TUint aKey,
-        	const TInt aValue ) = 0;
+        * Phone's Storage
+        */
+        virtual MPhoneStorage* PhoneStorage() = 0;        
 
     };