--- a/omadrm/drmengine/roap/src/RoapEngBase.cpp	Thu Aug 19 10:12:10 2010 +0300
+++ b/omadrm/drmengine/roap/src/RoapEngBase.cpp	Tue Aug 31 15:29:38 2010 +0300
@@ -17,7 +17,6 @@
 
 
 // INCLUDE FILES
-#include <featmgr.h>
 #include <DRMRights.h>
 #include <DRMRightsClient.h>
 // #include <GenericParam.h> // from S60
@@ -51,8 +50,6 @@
     iReturnedROs.ResetAndDestroy();
     delete iDomainRightsResp;
     delete iRiAlias;
-    
-    FeatureManager::UnInitializeLib();
     }
 
 // ---------------------------------------------------------
@@ -81,8 +78,6 @@
     iImplicitJoinDomain = EFalse;
     iReRegistered = EFalse;
     iRiAlias = NULL;
-    
-    FeatureManager::InitializeLibL();
     }
 
 
@@ -99,12 +94,10 @@
     {
     LOGLIT( "CRoapEngBase::SetTriggerL" )
 
-    if ( !( FeatureManager::FeatureSupported( 
-            KFeatureIdFfOmadrm2Support ) ) )    
-        {
-        User::Leave(KErrNotSupported);
-        }
-        
+#ifndef __DRM_OMA2
+    User::Leave(KErrNotSupported);
+#endif
+
     __ASSERT_ALWAYS( iState == EInit || iState == EReady, \
         User::Invariant() );
     TBool registered = EFalse;