--- a/omaprovisioning/provisioning/IMAdapter/Src/CWPPecAdapter.cpp	Fri Apr 16 15:52:47 2010 +0300
+++ b/omaprovisioning/provisioning/IMAdapter/Src/CWPPecAdapter.cpp	Mon May 03 13:19:46 2010 +0300
@@ -24,9 +24,6 @@
 #include <CWPParameter.h>
 #include <wpwvadapterresource.rsg>
 
-#include <ApDataHandler.h>
-#include <ApAccessPointItem.h>
-#include <ApUtils.h>
 #include <commdb.h>
 #include "WPAdapterUtil.h"
 #include "CWPIMSAPItem.h"
@@ -173,22 +170,12 @@
         sapItem->SetSettingsNameL( data->iName );
 
     	// Find a proper GPRS access point
-        CApAccessPointItem* item = WPIMUtil::FindGPRSL( data->iLinks );
-    	CleanupStack::PushL( item );
-
-        // get the WAP id
-    	CCommsDatabase* commDb = CCommsDatabase::NewL();
-    	CleanupStack::PushL(commDb);
-    	TUint32 uid( item->WapUid() );
-
-    	// Convert WAP uid to IAP uid
-        CApUtils* apUtils = CApUtils::NewLC( *commDb );
-    	TUint32 iapId = apUtils->IapIdFromWapIdL( uid );
+        TUint32 iapId = WPIMUtil::FindGPRSL( data->iLinks );
+    	
 
     	// set the IAP id as part of save item.
     	sapItem->SetIAPIdL( iapId );
            
-    	CleanupStack::PopAndDestroy( 3 ); // apUtils, commDb, item    
         // store SAP item
         TUint32 SAPuid = sapItem->StoreL();
     	data->iSAPId = SAPuid;