--- a/omadrm/drmengine/legacy/src/DRMCommon.cpp	Thu Aug 19 10:12:10 2010 +0300
+++ b/omadrm/drmengine/legacy/src/DRMCommon.cpp	Tue Aug 31 15:29:38 2010 +0300
@@ -21,7 +21,6 @@
 #include <f32file.h>
 #include <s32file.h>
 #include <apmstd.h>
-#include <featmgr.h>
 #include <wspdecoder.h>
 #include <wspencoder.h>
 
@@ -1822,8 +1821,7 @@
 // -----------------------------------------------------------------------------
 EXPORT_C void DRMCommon::ConstructL()
     {
-    FeatureManager::InitializeLibL();
-    } 
+    }
 
 // -----------------------------------------------------------------------------
 // DRMCommon::NewL
@@ -1842,7 +1840,6 @@
 // Destructor
 EXPORT_C DRMCommon::~DRMCommon()
     {
-    FeatureManager::UnInitializeLib();
     }
 
 // -----------------------------------------------------------------------------
@@ -2264,15 +2261,7 @@
         DRMCommon::ESeparateDelivery |
         DRMCommon::ESuperDistribution;
 #ifdef __DRM_OMA2
-    if ( FeatureManager::FeatureSupported( KFeatureIdFfOmadrm2Support ) )
-        {
-        aOMALevel = EOMA_2_0;
-        }
-    else
-        {
-        aOMALevel = EOMA_1_0;
-        }
-    
+    aOMALevel = EOMA_2_0;
 #else
     aOMALevel = EOMA_1_0;
 #endif