diff -r ead42e28e519 -r 79bd6bd83ec3 pkiutilities/CertSaver/inc/CertSaverModel.h
--- a/pkiutilities/CertSaver/inc/CertSaverModel.h	Wed Sep 15 13:09:05 2010 +0300
+++ b/pkiutilities/CertSaver/inc/CertSaverModel.h	Wed Oct 13 15:30:47 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2003-2007 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -107,12 +107,6 @@
         void GetKeyValidityPeriodL(
             TTime& aStartDate,
             TTime& aEndDate,
-            const TKeyIdentifier& aKeyIdentifier,
-            const CArrayPtr<CX509Certificate>& aCertArray );
-        
-        void GetKeyValidityPeriodL(
-            TTime& aStartDate,
-            TTime& aEndDate,
             const TKeyIdentifier& aKeyIdentifier );
 
         TKeyUsagePKCS15 KeyUsageL(
@@ -340,11 +334,8 @@
         TInt  iSavedCACertsCount;
         TInt  iSavedKeysCount;
         TInt  iSavedUserCertsCount;
+        TInt  iSelectedKeyStore;
         TBool iKeyAlreadyExists;
-        
-        TUid  iSelectedKeyStoreToken;
-        TUid  iSelectedCertStoreToken;
-        TInt  iSelectedKeyStoreIndex;
     };
 
 #endif