--- a/omadrm/drmengine/dm/src/DRMMessageParser.cpp	Thu Aug 19 10:12:10 2010 +0300
+++ b/omadrm/drmengine/dm/src/DRMMessageParser.cpp	Tue Aug 31 15:29:38 2010 +0300
@@ -24,7 +24,6 @@
 #include <caf/caftypes.h>
 #include <wspdecoder.h>
 #include <wspencoder.h>
-#include <featmgr.h>
 
 #ifdef RD_MULTIPLE_DRIVE
 #include <driveinfo.h>
@@ -224,9 +223,6 @@
     Reset();
 
     User::Free( const_cast< TUint8* >( iInputBuffer.Ptr() ) );
-    
-    FeatureManager::UnInitializeLib();
-    
     }
 
 // -----------------------------------------------------------------------------
@@ -335,9 +331,6 @@
 //
 void CDRMMessageParser::ConstructL()
     {
-    
-    FeatureManager::InitializeLibL();
-    
     // Make some extra room for crazy b64decode().
     iInputBuffer.Set( reinterpret_cast< TUint8* >(
                         User::AllocL( KInputBufferSize + 2 ) ),
@@ -493,12 +486,9 @@
                 SetBit( EReadingHeaderPart );
 
                 res.Set( NULL, 0 );
-                
-                if ( !( FeatureManager::FeatureSupported(
-                        KFeatureIdFfOmadrm1FullSupport ) ) )
-                    {
-                    User::Leave(KErrNotSupported);
-                    }  
+#ifndef __DRM_FULL
+                User::Leave(KErrNotSupported);
+#endif
                 }
             else
                 {