diff --git a/lib_enc/lib_enc.c b/lib_enc/lib_enc.c
index 18cfb9247d3df5f5e6c988b0e462bc0477692a7b..f0957726e82c058ec57fac4b941b5877ecde3806 100644
--- a/lib_enc/lib_enc.c
+++ b/lib_enc/lib_enc.c
@@ -110,13 +110,7 @@ ivas_error IVAS_ENC_Open(
      * Allocate and initialize IVAS application encoder handle
      *-----------------------------------------------------------------*/
 
-#ifdef BITSTREAM_INDICES_MEMORY
-#define WMC_TOOL_SKIP
     if ( ( *phIvasEnc = (IVAS_ENC_HANDLE) malloc( sizeof( struct IVAS_ENC ) ) ) == NULL )
-#undef WMC_TOOL_SKIP
-#else
-    if ( ( *phIvasEnc = (IVAS_ENC_HANDLE) malloc( sizeof( struct IVAS_ENC ) ) ) == NULL )
-#endif
     {
         return IVAS_ERR_FAILED_ALLOC;
     }
@@ -205,13 +199,7 @@ void IVAS_ENC_Close(
 
     ( *phIvasEnc )->st_ivas = NULL;
 
-#ifdef BITSTREAM_INDICES_MEMORY
-#define WMC_TOOL_SKIP
     free( *phIvasEnc );
-#undef WMC_TOOL_SKIP
-#else
-    free( *phIvasEnc );
-#endif
 
     *phIvasEnc = NULL;
     phIvasEnc = NULL;