diff -r fce0ae2e4223 -r 10852b179f64 supl/locationomasuplprotocolhandler/protocolhandlerver2/inc/epos_comasuplprotocolmanager2.h
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/inc/epos_comasuplprotocolmanager2.h	Tue Sep 14 22:09:33 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver2/inc/epos_comasuplprotocolmanager2.h	Wed Sep 15 12:40:28 2010 +0300
@@ -81,7 +81,6 @@
 								public MOMASuplSessionObserver,
 								public MSuplSettingsObserver,
 								public MOMASuplTimeOutNotifier,
-						    	public MOMASuplUISettingsObserver,
                 				public MOMASuplETelNotifierObserver,
                 				public MSuplSessionObserver
     {
@@ -276,39 +275,14 @@
 	*/
 	virtual void TerminateSession(CSuplSessionBase *aSession, TInt aErrorCode);
 	
-public: // For setting UI observer    
-	TInt LaunchSettingsUI(MOMASuplUICompletionObserver* aObserver,const TDesC& aForHslp);
-	TInt LaunchSuplUsageSettingsUI(MOMASuplUICompletionObserver* aObserver, TBool aRoaming);
-	TInt LaunchSuplDialogTimeoutUI(MOMASuplUICompletionObserver* aObserver );
+public: 
+	
 	void UpdateAllSubSessnsInSameSession(TInt aIpcSessionId);
 
 	void SettingsChanged();
 
-	TInt GetLastUsedAccessPoint(TDes& aLastlyUsedAccessPoint,TUint32& iIAPId);
-	/** 
-	* This callback method is used to notify the client about 
-	* the completion of UI launch
-	* @param aError - Error during Launch
-	* @return None
-	*/
-	void SettingsUICompletedL(TInt aError);
-
-	/** 
-	* This callback method is used to notify the client about 
-	* the completion of UI launch
-	* @param aError - Error during Launch
-	* @return None
-	*/
-	void SettingsUsageUICompletedL(TInt aError);
-
-	/** 
-	* This callback method is used to notify the client about 
-	* the completion of UI completion
-	* @param aError - Error during Launch
-	* @return None
-	*/
-	void SettingsTimeOutUICompletedL(TInt aError);
-
+	
+	
 public: //From base class MSuplSettingsObserver
 
 	/**
@@ -471,13 +445,7 @@
      */
 	void ReadOMASuplSettingsL();
 	
-    /**
-     * ReadSuplUsage, Reads OMA Supl Usage.
-     * @since S60 v3.1u          
-     * @param      None. 
-     * @return     None.
-     */
-    void ReadSuplUsage();
+    
 	
     /**
      * ReadOMASuplConfigurationL, Reads OMA Supl Configuration.
@@ -503,7 +471,7 @@
 
 	
 	TInt GetNetworkModeL();
-    void CheckOutstandingUsageUIRequestsL();
+    
     
 	/**
 	* LoadOMASUPLPluginsL, Loads supl protocolhandler plugins