diff -r 10852b179f64 -r ea98413ce11f supl/locationomasuplprotocolhandler/protocolhandler/src/epos_comasuplprotocolmanager.cpp
--- a/supl/locationomasuplprotocolhandler/protocolhandler/src/epos_comasuplprotocolmanager.cpp	Wed Sep 15 12:40:28 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandler/src/epos_comasuplprotocolmanager.cpp	Wed Oct 13 15:01:35 2010 +0300
@@ -577,7 +577,7 @@
 	else
 		{
 		iTrace->Trace(_L("COMASUPLProtocolManager::DeInitialize ph1 not present"), KTraceFileName, __LINE__);
-		TRAP_IGNORE(DeInitilizationCompletedL( KErrNotFound )); //ph1 is not present.
+		DeInitilizationCompletedL( KErrNotFound ); //ph1 is not present.
 		}
 	
     }            
@@ -804,39 +804,6 @@
 	return GetSuplVersion(aMajorVersion,aReceivedMessage);
 	}
 
-// -----------------------------------------------------------------------------
-// COMASUPLProtocolManager::MakeLocationConversionRequestL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-
-EXPORT_C void COMASUPLProtocolManager::MakeLocationConversionRequestL( CSuplSessionBase* aSuplSessn,TGeoCellInfo& aCellInfo,TRequestStatus& aStatus )
-    {
-     iTrace->Trace(_L("COMASUPLProtocolManager::MakeLocationConversionRequestL"), KTraceFileName, __LINE__);
-     if(iOMASuplProtocolHandler1)
-        {
-         iTrace->Trace(_L("COMASUPLProtocolManager::MakeLocationConversionRequestL if condition true"), KTraceFileName, __LINE__);
-        COMASUPLProtocolManager* ph1= (COMASUPLProtocolManager*) (iOMASuplProtocolHandler1);
-        ph1->MakeLocationConversionRequestL(aSuplSessn,aCellInfo,aStatus);
-        };
-    }
-
-// -----------------------------------------------------------------------------
-// COMASUPLProtocolManager::CancelLocationConversionRequest
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-
-EXPORT_C void COMASUPLProtocolManager::CancelLocationConversionRequest(CSuplSessionBase* aSuplSession)
-    {
-     if(iOMASuplProtocolHandler1)
-        {
-        COMASUPLProtocolManager* ph1= (COMASUPLProtocolManager*) (iOMASuplProtocolHandler1);
-        ph1->CancelLocationConversionRequest(aSuplSession);
-        };
-    }
 
 // -----------------------------------------------------------------------------
 // COMASUPLProtocolManager::DeInitilizationCompletedL