--- a/phonebookui/Phonebook2/USIMExtension/src/CPsu2CopyToSimFieldInfoArray.cpp	Wed Sep 15 11:56:55 2010 +0300
+++ b/phonebookui/Phonebook2/USIMExtension/src/CPsu2CopyToSimFieldInfoArray.cpp	Wed Oct 13 14:15:33 2010 +0300
@@ -23,8 +23,8 @@
 
 #include <RPbk2LocalizedResourceFile.h>
 #include <Pbk2DataCaging.hrh>
-#include <pbk2usimuires.rsg>
-#include <pbk2commonui.rsg>
+#include <Pbk2USimUIRes.rsg>
+#include <Pbk2CommonUi.rsg>
 
 #include <TVPbkFieldTypeMapping.h>
 #include <CVPbkFieldTypeSelector.h>
@@ -33,8 +33,8 @@
 #include <coemain.h>
 #include <barsread.h>
 #include <gsmerror.h>
-#include <featmgr.h>
-#include <vpbkeng.rsg>
+
+#include <VPbkEng.rsg>
 
 namespace
 {
@@ -86,9 +86,9 @@
         MVPbkFieldTypeSelector& SourceTypeSelector() const;
         
         /**
-         * Returns the resource id (vpbkeng.rsg) of the target field type.
+         * Returns the resource id (VPbkEng.rsg) of the target field type.
          *
-         * @return the resource id (vpbkeng.rsg) of the target field type.
+         * @return the resource id (VPbkEng.rsg) of the target field type.
          */
         TInt TargetFieldtypeResId() const;
     
@@ -112,7 +112,7 @@
     private: // Data
         /// Own: source field type selector
         CVPbkFieldTypeSelector* iSourceTypeSelector;
-        /// Own: target field type resource id (vpbkeng.rsg)
+        /// Own: target field type resource id (VPbkEng.rsg)
         TInt iTargetFieldTypeResId;
         /// Flags from Pbk2UsimUi.hrh
         TUint8 iFlags;
@@ -239,19 +239,10 @@
     RPbk2LocalizedResourceFile resFile( &aFs );
     resFile.OpenLC(KPbk2RomFileDrive,
         KDC_RESOURCE_FILES_DIR, KPsu2USimExtensionResFile);
-    FeatureManager::InitializeLibL();
+    
     TResourceReader reader;
-    if( !FeatureManager::FeatureSupported( 
-                    KFeatureIdFfTdClmcontactreplicationfromphonebooktousimcard ) )
-        {
-        reader.SetBuffer( 
-               resFile.AllocReadLC( R_PSU2_COPY_TO_SIM_FIELDTYPE_MAPPINGS ) );
-        }
-    else
-        {
-        reader.SetBuffer( 
-               resFile.AllocReadLC( R_PSU2_COPY_TO_USIM_FIELDTYPE_MAPPINGS ) );
-        }
+    reader.SetBuffer( 
+        resFile.AllocReadLC( R_PSU2_COPY_TO_SIM_FIELDTYPE_MAPPINGS ) );
     
     // Go through all mappings in resource and create a mapping array
     const TInt count = reader.ReadInt16();
@@ -308,7 +299,6 @@
     iInfoArray.Close();
     iMatchedTypes.Close();
     delete iNumberKeyMap;
-    FeatureManager::UnInitializeLib();
     }
 
 // -----------------------------------------------------------------------------
@@ -330,25 +320,6 @@
         }
     return result;
     }
-
-// -----------------------------------------------------------------------------
-// CPsu2CopyToSimFieldInfoArray::RemoveUnSupportedTargetTypeFieldInfo
-// -----------------------------------------------------------------------------
-//
-void CPsu2CopyToSimFieldInfoArray::RemoveUnSupportedFieldInfo( const MVPbkFieldTypeList& aSupportedTypes )
-    {
-    // Check all the field info in the iInfoArray, if the target of the fieldinfo 
-    // is not contained in the supportedTypes, Remove it from iInfoArray.
-    TInt i = iInfoArray.Count() - 1;
-    while( i >= 0 )
-        {
-        if( !aSupportedTypes.ContainsSame( iInfoArray[i].SimType()))
-            {
-            iInfoArray.Remove( i );
-            }
-        i --;
-        }
-    }
     
 // -----------------------------------------------------------------------------
 // CPsu2CopyToSimFieldInfoArray::SimNameType