--- a/vpnengine/vpnmanager/inc/policyimporter.h	Wed Sep 15 13:20:54 2010 +0300
+++ b/vpnengine/vpnmanager/inc/policyimporter.h	Wed Oct 13 15:42:16 2010 +0300
@@ -34,11 +34,9 @@
 class CPolicyPatchInfoList;
 class CIkeDataArray;
 class CIkeData;
-class CAgileProvisionWs;
 
 const TInt KMaxExtPolicyIdLength = 256;
 const TInt KDoNotGetKeySize      = -1;
-const TInt KMaxIapLength = 10;
 
 typedef TBuf<KMaxExtPolicyIdLength> TExtVpnPolicyId;
 
@@ -61,9 +59,7 @@
 
     void ImportPolicyL(const TDesC& aDir);
     void ImportSinglePolicyL(const TDesC& aDir, TVpnPolicyId& aNewPolicyId);
-    void SynchronizeVpnPolicyServerL();
-    
-   
+
 private:
     CPolicyImporter(const RMessage2& aMessage, CVpnApiServant& aVpnApiServant,
                     CPolicyStore& iPolicyStore, RFs& aFs);
@@ -100,8 +96,6 @@
     void StateImportPinAndPolL();
     void StateCreateVpnDestinationL();
     void StateEndPolicyImportL();
-    void StateGetPolicyProvisionServiceL();
-    void StateAfterGetPolicyProvisionServiceL();
     void BuildPolicyIdListL();
     TPkiServiceStoreType GetStoreTypeL(CIkeData* aData);
 
@@ -157,25 +151,9 @@
     /**
      * Returns Issuer name of certificate
      */
-    HBufC8* CertIssuerL(const TFileName& aCertFile);
-    TFileName GetCAFromFileListL(const TDesC8& aCertSubjectName, CArrayFixFlat<TFileName>* aCertFileArray);
-    
-    /**
-     * Checks whether mVPN policy provision is requested 
-     */
-    TBool GetPolicyService();
-    
-    void GetPolicyWsL();
- 
-    HBufC8* GetPolicyNameL(HBufC* aPolicyFileName);
-    
-    void PatchPolicyProvisionL();
+    HBufC8* CPolicyImporter::CertIssuerL(const TFileName& aCertFile);
+    TFileName CPolicyImporter::GetCAFromFileListL(const TDesC8& aCertSubjectName, CArrayFixFlat<TFileName>* aCertFileArray);
 
-    
-public:
-    //Policy provision service
-    CAgileProvisionWs* iAgileProvisionWs;
-    
 private:
     RMessage2 iMessage;
     TRequestStatus* iExtStatus;
@@ -220,16 +198,9 @@
     TAny* iPkiOpContext;
 
     TBool iImportSinglePolicy;
-    TBool iAgileProvision;
     TVpnPolicyId* iNewPolicyId;
-    TVpnPolicyId iNewPolicyIdBuf;
+
     TVpnPolicyId iPolicyId;
-    
-    TBuf<KMaxIdLength> iPolicyIdBuf;
-    
-    HBufC8* iAgileProvisionWSAddr;
-
-    TUint32 iAgileProvisionAPId;
     };
 
 #endif // __POLICYIMPORTER_H__