diff --git a/lib_com/cldfb.c b/lib_com/cldfb.c
index 38195b65d8f360e408176ea694171d21f52fad0d..246a8a8e810a4184d2966de799e0407e14d82956 100644
--- a/lib_com/cldfb.c
+++ b/lib_com/cldfb.c
@@ -1364,8 +1364,8 @@ ivas_error openCldfb_ivas_fx(
     HANDLE_CLDFB_FILTER_BANK *h_cldfb, /* i/o: filter bank handle                */
     CLDFB_TYPE type,                   /* i  : analysis or synthesis             */
     const Word32 sampling_rate,        /* i  : sampling rate                     */
-    CLDFB_PROTOTYPE prototype          /* i  : CLDFB version (1.25ms/5ms delay)  */
-)
+    CLDFB_PROTOTYPE prototype,         /* i  : CLDFB version (1.25ms/5ms delay)  */
+    const Word16 enc_dec )             /* i  : encoder/decoder flag            */
 {
     HANDLE_CLDFB_FILTER_BANK hs;
     Word16 buf_len;
@@ -1379,95 +1379,45 @@ ivas_error openCldfb_ivas_fx(
     move32();
     hs->prototype = prototype;
     move32();
-    configureCldfb_ivas_fx( hs, sampling_rate );
-    hs->memory32 = NULL;
-    hs->FilterStates = NULL;
-    hs->memory_length = 0;
-    move16();
-
-    IF( EQ_32( type, CLDFB_ANALYSIS ) )
+    IF( enc_dec == ENC )
     {
-        buf_len = sub( hs->p_filter_length, hs->no_channels );
+        configureCldfb_ivas_enc_fx( hs, sampling_rate );
+        hs->Q_cldfb_state = 0;
     }
     ELSE
     {
-        buf_len = hs->p_filter_length;
-        move16();
+        configureCldfb_ivas_fx( hs, sampling_rate );
+        hs->Q_cldfb_state = Q11;
     }
-
-    IF( ( hs->cldfb_state_fx = (Word32 *) malloc( buf_len * sizeof( Word32 ) ) ) == NULL )
-    {
-        return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for CLDFB" );
-    }
-
-    hs->cldfb_state_length = buf_len; // Temporarily added to store the length of buffer
     move16();
-    hs->cldfb_size = buf_len; /*for having original size at intermediatery conversion, will be removed on removing conversion*/
-    move16();
-    set32_fx( hs->cldfb_state_fx, 0, buf_len );
-    hs->Q_cldfb_state = Q11;
-    move16();
-    *h_cldfb = hs;
-    move16();
-
-    return IVAS_ERR_OK;
-}
-
-ivas_error openCldfb_ivas_enc(
-    HANDLE_CLDFB_FILTER_BANK *h_cldfb, /* i/o: filter bank handle                */
-    CLDFB_TYPE type,                   /* i  : analysis or synthesis             */
-    const Word32 sampling_rate,        /* i  : sampling rate                     */
-    CLDFB_PROTOTYPE prototype          /* i  : CLDFB version (1.25ms/5ms delay)  */
-)
-{
-    HANDLE_CLDFB_FILTER_BANK hs;
-    Word16 buf_len;
-
-    IF( ( hs = (HANDLE_CLDFB_FILTER_BANK) malloc( sizeof( CLDFB_FILTER_BANK ) ) ) == NULL )
-    {
-        return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for CLDFB" );
-    }
-
-    hs->type = type;
-    move32();
-    hs->prototype = prototype;
-    move32();
-
-    configureCldfb_ivas_enc_fx( hs, sampling_rate );
+    hs->memory32 = NULL;
+    hs->FilterStates = NULL;
     hs->memory_length = 0;
-    move32();
+    move16();
 
-    IF( type == CLDFB_ANALYSIS )
+    IF( EQ_32( type, CLDFB_ANALYSIS ) )
     {
         buf_len = sub( hs->p_filter_length, hs->no_channels );
-        hs->FilterStates = (Word16 *) malloc( ( 9 + 16 ) * CLDFB_getNumChannels( sampling_rate ) * sizeof( Word16 ) );
-        hs->FilterStates_eg = 0;
-        move16();
     }
     ELSE
     {
         buf_len = hs->p_filter_length;
         move16();
-        hs->FilterStates = (Word16 *) malloc( 2 * ( 9 + 16 ) * CLDFB_getNumChannels( sampling_rate ) * sizeof( Word16 ) );
-        hs->FilterStates_eg = 0;
-        move16();
     }
 
-    if ( ( hs->cldfb_state_fx = (Word32 *) malloc( buf_len * sizeof( Word32 ) ) ) == NULL )
+    IF( ( hs->cldfb_state_fx = (Word32 *) malloc( buf_len * sizeof( Word32 ) ) ) == NULL )
     {
         return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for CLDFB" );
     }
+
     hs->cldfb_state_length = buf_len; // Temporarily added to store the length of buffer
     move16();
     hs->cldfb_size = buf_len; /*for having original size at intermediatery conversion, will be removed on removing conversion*/
     move16();
     set32_fx( hs->cldfb_state_fx, 0, buf_len );
-    hs->Q_cldfb_state = 0;
-    move16();
-    set16_fx( hs->FilterStates, 0, i_mult( 9 + 16, hs->no_channels ) );
-    set16_fx( hs->FilterStates_e, 0, sizeof( hs->FilterStates_e ) / sizeof( hs->FilterStates_e[0] ) );
 
     *h_cldfb = hs;
+    move16();
 
     return IVAS_ERR_OK;
 }
@@ -1563,41 +1513,6 @@ void analysisCldfbEncoder_ivas_fx(
     return;
 }
 
-
-/*-------------------------------------------------------------------*
- * GetEnergyCldfb_ivas()
- *
- * Remove handle
- *--------------------------------------------------------------------*/
-
-void deleteCldfb_ivas(
-    HANDLE_CLDFB_FILTER_BANK *h_cldfb /* i/o: filter bank handle  */
-)
-{
-    HANDLE_CLDFB_FILTER_BANK hs = *h_cldfb;
-
-    test();
-    IF( h_cldfb == NULL || *h_cldfb == NULL )
-    {
-        return;
-    }
-
-    IF( hs->cldfb_state_fx )
-    {
-        free( hs->cldfb_state_fx );
-    }
-
-    IF( hs->FilterStates )
-    {
-        free( hs->FilterStates );
-    }
-
-    free( hs );
-    *h_cldfb = NULL;
-
-    return;
-}
-
 void deleteCldfb_ivas_fx(
     HANDLE_CLDFB_FILTER_BANK *h_cldfb /* i/o: filter bank handle  */
 )
diff --git a/lib_com/prot_fx.h b/lib_com/prot_fx.h
index db0953cd95443f504662e19092ca1f18979f8707..9fe14b5bdf2bd06c018ddcee0caee93b4913d238 100644
--- a/lib_com/prot_fx.h
+++ b/lib_com/prot_fx.h
@@ -9803,8 +9803,8 @@ ivas_error openCldfb_ivas_fx(
     HANDLE_CLDFB_FILTER_BANK *h_cldfb, /* i/o: filter bank handle                */
     CLDFB_TYPE type,                   /* i  : analysis or synthesis             */
     const Word32 sampling_rate,        /* i  : sampling rate                     */
-    CLDFB_PROTOTYPE prototype          /* i  : CLDFB version (1.25ms/5ms delay)  */
-);
+    CLDFB_PROTOTYPE prototype,         /* i  : CLDFB version (1.25ms/5ms delay)  */
+    const Word16 enc_dec );            /* i  : encoder/decoder flag            */
 
 Word32 rand_gauss_fx(
     Word32 *x,
@@ -11944,13 +11944,6 @@ ivas_error openCldfb_ivas(
     CLDFB_PROTOTYPE prototype          /* i  : CLDFB version (1.25ms/5ms delay) */
 );
 
-ivas_error openCldfb_ivas_enc(
-    HANDLE_CLDFB_FILTER_BANK *h_cldfb, /* i/o: filter bank handle               */
-    CLDFB_TYPE type,                   /* i  : analysis or synthesis            */
-    const Word32 sampling_rate,        /* i  : sampling rate                    */
-    CLDFB_PROTOTYPE prototype          /* i  : CLDFB version (1.25ms/5ms delay) */
-);
-
 void resampleCldfb_ivas(
     HANDLE_CLDFB_FILTER_BANK hs, /* i/o: filter bank handle          */
     const Word32 newSamplerate   /* i  : new samplerate to operate   */
@@ -11960,10 +11953,6 @@ ivas_error cldfb_save_memory_ivas(
     HANDLE_CLDFB_FILTER_BANK hs /* i/o: filter bank handle          */
 );
 
-void deleteCldfb_ivas(
-    HANDLE_CLDFB_FILTER_BANK *h_cldfb /* i/o: filter bank handle          */
-);
-
 /*! r: flag indicating a valid bitrate */
 Word16 is_EVS_bitrate(
     const Word32 ivas_total_brate, /* i  : EVS total bitrate  */
diff --git a/lib_dec/init_dec_fx.c b/lib_dec/init_dec_fx.c
index 3865cd61c5cd79904d82f4f4cac7708ad6c6e0a3..bd8a2cbd3095c210f6ffa49344a60f66b826c58c 100644
--- a/lib_dec/init_dec_fx.c
+++ b/lib_dec/init_dec_fx.c
@@ -1447,13 +1447,13 @@ ivas_error init_decoder_ivas_fx(
     IF( ( idchan == 0 && NE_16( st_fx->element_mode, IVAS_CPE_MDCT ) ) || EQ_16( st_fx->element_mode, IVAS_CPE_TD ) )
     {
         /* open analysis for max. SR 48kHz */
-        IF( NE_32( ( error = openCldfb_ivas_fx( &st_fx->cldfbAna, CLDFB_ANALYSIS, 48000, CLDFB_PROTOTYPE_1_25MS ) ), IVAS_ERR_OK ) )
+        IF( NE_32( ( error = openCldfb_ivas_fx( &st_fx->cldfbAna, CLDFB_ANALYSIS, 48000, CLDFB_PROTOTYPE_1_25MS, DEC ) ), IVAS_ERR_OK ) )
         {
             return error;
         }
 
         /* open analysis BPF for max. SR 16kHz */
-        IF( NE_32( ( error = openCldfb_ivas_fx( &st_fx->cldfbBPF, CLDFB_ANALYSIS, 16000, CLDFB_PROTOTYPE_1_25MS ) ), IVAS_ERR_OK ) )
+        IF( NE_32( ( error = openCldfb_ivas_fx( &st_fx->cldfbBPF, CLDFB_ANALYSIS, 16000, CLDFB_PROTOTYPE_1_25MS, DEC ) ), IVAS_ERR_OK ) )
         {
             return error;
         }
@@ -1465,7 +1465,7 @@ ivas_error init_decoder_ivas_fx(
     }
 
     /* open synthesis for output SR */
-    IF( NE_32( ( error = openCldfb_ivas_fx( &st_fx->cldfbSyn, CLDFB_SYNTHESIS, st_fx->output_Fs, CLDFB_PROTOTYPE_1_25MS ) ), IVAS_ERR_OK ) )
+    IF( NE_32( ( error = openCldfb_ivas_fx( &st_fx->cldfbSyn, CLDFB_SYNTHESIS, st_fx->output_Fs, CLDFB_PROTOTYPE_1_25MS, DEC ) ), IVAS_ERR_OK ) )
     {
         return error;
     }
diff --git a/lib_dec/ivas_corecoder_dec_reconfig_fx.c b/lib_dec/ivas_corecoder_dec_reconfig_fx.c
index 25c0bea424a55e49353f85b08d15506179aa4bf6..8333f146f594a61de657bee9e9b066119b14e694 100644
--- a/lib_dec/ivas_corecoder_dec_reconfig_fx.c
+++ b/lib_dec/ivas_corecoder_dec_reconfig_fx.c
@@ -602,7 +602,7 @@ ivas_error ivas_cldfb_dec_reconfig_fx(
         /* create additional CLDFB synthesis instances */
         FOR( i = numCldfbAnalyses_old; i < numCldfbAnalyses; i++ )
         {
-            IF( NE_32( ( error = openCldfb_ivas_fx( &( st_ivas->cldfbAnaDec[i] ), CLDFB_ANALYSIS, hDecoderConfig->output_Fs, CLDFB_PROTOTYPE_5_00MS ) ), IVAS_ERR_OK ) )
+            IF( NE_32( ( error = openCldfb_ivas_fx( &( st_ivas->cldfbAnaDec[i] ), CLDFB_ANALYSIS, hDecoderConfig->output_Fs, CLDFB_PROTOTYPE_5_00MS, DEC ) ), IVAS_ERR_OK ) )
             {
                 return error;
             }
@@ -622,7 +622,7 @@ ivas_error ivas_cldfb_dec_reconfig_fx(
         /* create additional CLDFB synthesis instances */
         FOR( i = numCldfbSyntheses_old; i < numCldfbSyntheses; i++ )
         {
-            IF( NE_32( ( error = openCldfb_ivas_fx( &( st_ivas->cldfbSynDec[i] ), CLDFB_SYNTHESIS, hDecoderConfig->output_Fs, CLDFB_PROTOTYPE_5_00MS ) ), IVAS_ERR_OK ) )
+            IF( NE_32( ( error = openCldfb_ivas_fx( &( st_ivas->cldfbSynDec[i] ), CLDFB_SYNTHESIS, hDecoderConfig->output_Fs, CLDFB_PROTOTYPE_5_00MS, DEC ) ), IVAS_ERR_OK ) )
             {
                 return error;
             }
diff --git a/lib_dec/ivas_init_dec.c b/lib_dec/ivas_init_dec.c
index b116694607be4ded8f5be140a5a4f82cce4aaa53..1ab797ded3c3ae3a72f074a94a1591f82a795a30 100644
--- a/lib_dec/ivas_init_dec.c
+++ b/lib_dec/ivas_init_dec.c
@@ -2264,7 +2264,7 @@ ivas_error ivas_init_decoder_fx(
 
     FOR( i = 0; i < numCldfbAnalyses; i++ )
     {
-        IF( NE_32( ( error = openCldfb_ivas_fx( &( st_ivas->cldfbAnaDec[i] ), CLDFB_ANALYSIS, output_Fs, CLDFB_PROTOTYPE_5_00MS ) ), IVAS_ERR_OK ) )
+        IF( NE_32( ( error = openCldfb_ivas_fx( &( st_ivas->cldfbAnaDec[i] ), CLDFB_ANALYSIS, output_Fs, CLDFB_PROTOTYPE_5_00MS, DEC ) ), IVAS_ERR_OK ) )
         {
             return error;
         }
@@ -2276,7 +2276,7 @@ ivas_error ivas_init_decoder_fx(
 
     FOR( i = 0; i < numCldfbSyntheses; i++ )
     {
-        IF( NE_32( ( error = openCldfb_ivas_fx( &( st_ivas->cldfbSynDec[i] ), CLDFB_SYNTHESIS, output_Fs, CLDFB_PROTOTYPE_5_00MS ) ), IVAS_ERR_OK ) )
+        IF( NE_32( ( error = openCldfb_ivas_fx( &( st_ivas->cldfbSynDec[i] ), CLDFB_SYNTHESIS, output_Fs, CLDFB_PROTOTYPE_5_00MS, DEC ) ), IVAS_ERR_OK ) )
         {
             return error;
         }
diff --git a/lib_dec/ivas_sce_dec_fx.c b/lib_dec/ivas_sce_dec_fx.c
index a6be10c08f0c1fe26cfa4adf1d933d8571809e12..12549f49df29761496430c1f1416ec92f1023225 100644
--- a/lib_dec/ivas_sce_dec_fx.c
+++ b/lib_dec/ivas_sce_dec_fx.c
@@ -438,7 +438,7 @@ ivas_error create_sce_dec(
 
     IF( EQ_16( (Word16) st_ivas->ivas_format, SBA_FORMAT ) && ( EQ_16( (Word16) st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_STEREO ) || ( EQ_16( (Word16) st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_MONO ) && EQ_16( st_ivas->nchan_transport, 1 ) ) ) )
     {
-        IF( NE_32( ( error = openCldfb_ivas_fx( &st->cldfbSynHB, CLDFB_SYNTHESIS, st->output_Fs, CLDFB_PROTOTYPE_1_25MS ) ), IVAS_ERR_OK ) )
+        IF( NE_32( ( error = openCldfb_ivas_fx( &st->cldfbSynHB, CLDFB_SYNTHESIS, st->output_Fs, CLDFB_PROTOTYPE_1_25MS, DEC ) ), IVAS_ERR_OK ) )
         {
             return error;
         }
diff --git a/lib_dec/ivas_stereo_mdct_stereo_dec_fx.c b/lib_dec/ivas_stereo_mdct_stereo_dec_fx.c
index 3f39bd9acf0e8054a4f7d5501516559ea2acdc33..5b1378a894fead3f6efabcef3e7746132dccad56 100644
--- a/lib_dec/ivas_stereo_mdct_stereo_dec_fx.c
+++ b/lib_dec/ivas_stereo_mdct_stereo_dec_fx.c
@@ -601,7 +601,7 @@ ivas_error initMdctStereoDtxData_fx(
         IF( st->cldfbAna == NULL )
         {
             /* open analysis for max. sampling rate 48kHz */
-            IF( NE_32( ( error = openCldfb_ivas_fx( &st->cldfbAna, CLDFB_ANALYSIS, 48000, CLDFB_PROTOTYPE_1_25MS ) ), IVAS_ERR_OK ) )
+            IF( NE_32( ( error = openCldfb_ivas_fx( &st->cldfbAna, CLDFB_ANALYSIS, 48000, CLDFB_PROTOTYPE_1_25MS, DEC ) ), IVAS_ERR_OK ) )
             {
                 return error;
             }
@@ -610,7 +610,7 @@ ivas_error initMdctStereoDtxData_fx(
         IF( st->cldfbBPF == NULL )
         {
             /* open analysis BPF for max. internal sampling rate 16kHz */
-            IF( NE_32( ( error = openCldfb_ivas_fx( &st->cldfbBPF, CLDFB_ANALYSIS, 16000, CLDFB_PROTOTYPE_1_25MS ) ), IVAS_ERR_OK ) )
+            IF( NE_32( ( error = openCldfb_ivas_fx( &st->cldfbBPF, CLDFB_ANALYSIS, 16000, CLDFB_PROTOTYPE_1_25MS, DEC ) ), IVAS_ERR_OK ) )
             {
                 return error;
             }
diff --git a/lib_dec/ivas_stereo_switching_dec_fx.c b/lib_dec/ivas_stereo_switching_dec_fx.c
index 09b683a16659a9f0ec4f34abb6c18bf785ba7a5b..c70e606ac7c54298dc672c03b3e7b91dedadc02b 100644
--- a/lib_dec/ivas_stereo_switching_dec_fx.c
+++ b/lib_dec/ivas_stereo_switching_dec_fx.c
@@ -205,7 +205,7 @@ static ivas_error allocate_CoreCoder_fx(
     IF( st->cldfbAna == NULL )
     {
         /* open analysis for max. sampling rate 48kHz */
-        IF( NE_32( ( error = openCldfb_ivas_fx( &st->cldfbAna, CLDFB_ANALYSIS, 48000, CLDFB_PROTOTYPE_1_25MS ) ), IVAS_ERR_OK ) )
+        IF( NE_32( ( error = openCldfb_ivas_fx( &st->cldfbAna, CLDFB_ANALYSIS, 48000, CLDFB_PROTOTYPE_1_25MS, DEC ) ), IVAS_ERR_OK ) )
         {
             return error;
         }
@@ -214,7 +214,7 @@ static ivas_error allocate_CoreCoder_fx(
     IF( st->cldfbBPF == NULL )
     {
         /* open analysis BPF for max. internal sampling rate 16kHz */
-        IF( NE_32( ( error = openCldfb_ivas_fx( &st->cldfbBPF, CLDFB_ANALYSIS, 16000, CLDFB_PROTOTYPE_1_25MS ) ), IVAS_ERR_OK ) )
+        IF( NE_32( ( error = openCldfb_ivas_fx( &st->cldfbBPF, CLDFB_ANALYSIS, 16000, CLDFB_PROTOTYPE_1_25MS, DEC ) ), IVAS_ERR_OK ) )
         {
             return error;
         }
@@ -752,7 +752,7 @@ ivas_error stereo_memory_dec_fx(
 
             IF( st->cldfbAna == NULL )
             {
-                IF( NE_32( ( error = openCldfb_ivas_fx( &st->cldfbAna, CLDFB_ANALYSIS, 48000, CLDFB_PROTOTYPE_1_25MS ) ), IVAS_ERR_OK ) )
+                IF( NE_32( ( error = openCldfb_ivas_fx( &st->cldfbAna, CLDFB_ANALYSIS, 48000, CLDFB_PROTOTYPE_1_25MS, DEC ) ), IVAS_ERR_OK ) )
                 {
                     return error;
                 }
@@ -761,7 +761,7 @@ ivas_error stereo_memory_dec_fx(
             IF( st->cldfbBPF == NULL )
             {
                 /* open analysis BPF for max. internal sampling rate 16kHz */
-                IF( NE_32( ( error = openCldfb_ivas_fx( &st->cldfbBPF, CLDFB_ANALYSIS, 16000, CLDFB_PROTOTYPE_1_25MS ) ), IVAS_ERR_OK ) )
+                IF( NE_32( ( error = openCldfb_ivas_fx( &st->cldfbBPF, CLDFB_ANALYSIS, 16000, CLDFB_PROTOTYPE_1_25MS, DEC ) ), IVAS_ERR_OK ) )
                 {
                     return error;
                 }
@@ -1100,7 +1100,7 @@ ivas_error stereo_memory_dec_fx(
             {
                 IF( hCPE->hCoreCoder[i]->cldfbSyn == NULL ) /* could be NULL when we had the MCT LFE channel */
                 {
-                    IF( NE_32( ( error = openCldfb_ivas_fx( &hCPE->hCoreCoder[i]->cldfbSyn, CLDFB_SYNTHESIS, hCPE->hCoreCoder[i]->output_Fs, CLDFB_PROTOTYPE_1_25MS ) ), IVAS_ERR_OK ) )
+                    IF( NE_32( ( error = openCldfb_ivas_fx( &hCPE->hCoreCoder[i]->cldfbSyn, CLDFB_SYNTHESIS, hCPE->hCoreCoder[i]->output_Fs, CLDFB_PROTOTYPE_1_25MS, DEC ) ), IVAS_ERR_OK ) )
                     {
                         return error;
                     }
diff --git a/lib_enc/init_enc_fx.c b/lib_enc/init_enc_fx.c
index 615ca1b337b58a664b25fbcc2d8ff0da120e7bb8..cd5db537725e8fc2e8564059166fb74323053e7f 100644
--- a/lib_enc/init_enc_fx.c
+++ b/lib_enc/init_enc_fx.c
@@ -1695,7 +1695,7 @@ ivas_error init_encoder_ivas_fx(
     test();
     IF( ( NE_16( st->element_mode, IVAS_CPE_MDCT ) && idchan == 0 ) || ( EQ_16( st->element_mode, IVAS_CPE_MDCT ) && st->Opt_DTX_ON ) )
     {
-        IF( ( error = openCldfb_ivas_enc( &st->cldfbAnaEnc, CLDFB_ANALYSIS, st->input_Fs, CLDFB_PROTOTYPE_1_25MS ) ) != IVAS_ERR_OK )
+        IF( ( error = openCldfb_ivas_fx( &st->cldfbAnaEnc, CLDFB_ANALYSIS, st->input_Fs, CLDFB_PROTOTYPE_1_25MS, ENC ) ) != IVAS_ERR_OK )
         {
             return error;
         }
@@ -1809,7 +1809,7 @@ ivas_error init_encoder_ivas_fx(
             return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD BWE\n" ) );
         }
 
-        IF( ( error = openCldfb_ivas_enc( &st->cldfbSynTd, CLDFB_SYNTHESIS, 16000, CLDFB_PROTOTYPE_1_25MS ) ) != IVAS_ERR_OK )
+        IF( ( error = openCldfb_ivas_fx( &st->cldfbSynTd, CLDFB_SYNTHESIS, 16000, CLDFB_PROTOTYPE_1_25MS, ENC ) ) != IVAS_ERR_OK )
         {
             return error;
         }
diff --git a/lib_enc/ivas_masa_enc_fx.c b/lib_enc/ivas_masa_enc_fx.c
index 6960629c863f43a2b91a7e54d43b424e4934f136..da1f836df340575c1183fad83627f59919608aae 100644
--- a/lib_enc/ivas_masa_enc_fx.c
+++ b/lib_enc/ivas_masa_enc_fx.c
@@ -152,7 +152,7 @@ ivas_error ivas_masa_enc_open_fx(
 
     FOR( i = 0; i < hMasa->data.num_Cldfb_instances; i++ )
     {
-        IF( NE_32( ( error = openCldfb_ivas_enc( &( hMasa->data.cldfbAnaEnc[i] ), CLDFB_ANALYSIS, hEncoderConfig->input_Fs, CLDFB_PROTOTYPE_5_00MS ) ), IVAS_ERR_OK ) )
+        IF( NE_32( ( error = openCldfb_ivas_fx( &( hMasa->data.cldfbAnaEnc[i] ), CLDFB_ANALYSIS, hEncoderConfig->input_Fs, CLDFB_PROTOTYPE_5_00MS, ENC ) ), IVAS_ERR_OK ) )
         {
             return error;
         }
@@ -260,7 +260,7 @@ void ivas_masa_enc_close_fx(
 
     FOR( i = 0; i < ( *hMasa )->data.num_Cldfb_instances; i++ )
     {
-        deleteCldfb_ivas( &( ( *hMasa )->data.cldfbAnaEnc[i] ) );
+        deleteCldfb_ivas_fx( &( ( *hMasa )->data.cldfbAnaEnc[i] ) );
     }
 
     IF( ( *hMasa )->data.hOmasaData != NULL )
diff --git a/lib_enc/ivas_omasa_enc_fx.c b/lib_enc/ivas_omasa_enc_fx.c
index 5d79265f4c7467ae7de0d903020de7fa712f492d..b5258712bd29c802f5e370e0617a992d8630852f 100644
--- a/lib_enc/ivas_omasa_enc_fx.c
+++ b/lib_enc/ivas_omasa_enc_fx.c
@@ -124,7 +124,7 @@ ivas_error ivas_omasa_enc_open_fx(
     move16();
     FOR( i = 0; i < hOMasa->num_Cldfb_instances; i++ )
     {
-        IF( ( error = openCldfb_ivas_enc( &( hOMasa->cldfbAnaEnc[i] ), CLDFB_ANALYSIS, st_ivas->hEncoderConfig->input_Fs, CLDFB_PROTOTYPE_5_00MS ) ) != IVAS_ERR_OK )
+        IF( ( error = openCldfb_ivas_fx( &( hOMasa->cldfbAnaEnc[i] ), CLDFB_ANALYSIS, st_ivas->hEncoderConfig->input_Fs, CLDFB_PROTOTYPE_5_00MS, ENC ) ) != IVAS_ERR_OK )
         {
             return error;
         }
@@ -227,7 +227,7 @@ void ivas_omasa_enc_close_fx(
 
     FOR( i = 0; i < ( *hOMasa )->num_Cldfb_instances; i++ )
     {
-        deleteCldfb_ivas( &( ( *hOMasa )->cldfbAnaEnc[i] ) );
+        deleteCldfb_ivas_fx( &( ( *hOMasa )->cldfbAnaEnc[i] ) );
     }
 
     FOR( i = 0; i < DIRAC_NUM_DIMS; i++ )
diff --git a/lib_enc/ivas_stereo_switching_enc_fx.c b/lib_enc/ivas_stereo_switching_enc_fx.c
index 2fe8b6c847d5d7b3ea04c2680ddfa9be799a527e..0a526561ae7317a3a06d15ea472636f2f3ad12fd 100644
--- a/lib_enc/ivas_stereo_switching_enc_fx.c
+++ b/lib_enc/ivas_stereo_switching_enc_fx.c
@@ -366,8 +366,8 @@ ivas_error stereo_memory_enc_fx(
         IF( EQ_16( hCPE->last_element_mode, IVAS_CPE_MDCT ) && ( EQ_16( hCPE->element_mode, IVAS_CPE_DFT ) || EQ_16( hCPE->element_mode, IVAS_CPE_TD ) ) )
         {
             /* Deallocate MDCT CNG structures */
-            deleteCldfb_ivas( &hCPE->hCoreCoder[0]->cldfbAnaEnc );
-            deleteCldfb_ivas( &hCPE->hCoreCoder[1]->cldfbAnaEnc );
+            deleteCldfb_ivas_fx( &hCPE->hCoreCoder[0]->cldfbAnaEnc );
+            deleteCldfb_ivas_fx( &hCPE->hCoreCoder[1]->cldfbAnaEnc );
 
             IF( EQ_16( hCPE->element_mode, IVAS_CPE_DFT ) )
             {
@@ -417,7 +417,7 @@ ivas_error stereo_memory_enc_fx(
             /* allocate CLDFB for primary channel */
             IF( st->cldfbAnaEnc == NULL )
             {
-                IF( NE_32( ( error = openCldfb_ivas_enc( &st->cldfbAnaEnc, CLDFB_ANALYSIS, input_Fs, CLDFB_PROTOTYPE_1_25MS ) ), IVAS_ERR_OK ) )
+                IF( NE_32( ( error = openCldfb_ivas_fx( &st->cldfbAnaEnc, CLDFB_ANALYSIS, input_Fs, CLDFB_PROTOTYPE_1_25MS, ENC ) ), IVAS_ERR_OK ) )
                 {
                     return error;
                 }
@@ -433,7 +433,7 @@ ivas_error stereo_memory_enc_fx(
 
                 IF( st->cldfbSynTd == NULL )
                 {
-                    IF( NE_32( ( error = openCldfb_ivas_enc( &st->cldfbSynTd, CLDFB_SYNTHESIS, 16000, CLDFB_PROTOTYPE_1_25MS ) ), IVAS_ERR_OK ) )
+                    IF( NE_32( ( error = openCldfb_ivas_fx( &st->cldfbSynTd, CLDFB_SYNTHESIS, 16000, CLDFB_PROTOTYPE_1_25MS, ENC ) ), IVAS_ERR_OK ) )
                     {
                         return error;
                     }
@@ -587,7 +587,7 @@ ivas_error stereo_memory_enc_fx(
                 FOR( i = 0; i < CPE_CHANNELS; i++ )
                 {
                     st = hCPE->hCoreCoder[i];
-                    IF( NE_32( ( error = openCldfb_ivas_enc( &st->cldfbAnaEnc, CLDFB_ANALYSIS, st->input_Fs, CLDFB_PROTOTYPE_1_25MS ) ), IVAS_ERR_OK ) )
+                    IF( NE_32( ( error = openCldfb_ivas_fx( &st->cldfbAnaEnc, CLDFB_ANALYSIS, st->input_Fs, CLDFB_PROTOTYPE_1_25MS, ENC ) ), IVAS_ERR_OK ) )
                     {
                         return error;
                     }
diff --git a/lib_enc/ivas_stereo_td_enc_fx.c b/lib_enc/ivas_stereo_td_enc_fx.c
index d2ff2c0c2c299a567b26faa9f56a7fdc894dd14c..1544aab76372a4d06efef1c5e30e6358cbbd2031 100644
--- a/lib_enc/ivas_stereo_td_enc_fx.c
+++ b/lib_enc/ivas_stereo_td_enc_fx.c
@@ -263,7 +263,7 @@ ivas_error stereo_set_tdm_fx(
             /* deallocate CLDFB ana for secondary channel */
             IF( st->cldfbAnaEnc != NULL )
             {
-                deleteCldfb_ivas( &st->cldfbAnaEnc );
+                deleteCldfb_ivas_fx( &st->cldfbAnaEnc );
             }
 
             /* deallocate BWEs for secondary channel */
@@ -275,7 +275,7 @@ ivas_error stereo_set_tdm_fx(
                     st->hBWE_TD = NULL;
                 }
 
-                deleteCldfb_ivas( &st->cldfbSynTd );
+                deleteCldfb_ivas_fx( &st->cldfbSynTd );
 
                 IF( st->hBWE_FD != NULL )
                 {
@@ -309,7 +309,7 @@ ivas_error stereo_set_tdm_fx(
             /* allocate CLDFB ana for secondary channel */
             IF( st->cldfbAnaEnc == NULL )
             {
-                IF( NE_32( ( error = openCldfb_ivas_enc( &st->cldfbAnaEnc, CLDFB_ANALYSIS, st->input_Fs, CLDFB_PROTOTYPE_1_25MS ) ), IVAS_ERR_OK ) )
+                IF( NE_32( ( error = openCldfb_ivas_fx( &st->cldfbAnaEnc, CLDFB_ANALYSIS, st->input_Fs, CLDFB_PROTOTYPE_1_25MS, ENC ) ), IVAS_ERR_OK ) )
                 {
                     return error;
                 }
@@ -322,7 +322,7 @@ ivas_error stereo_set_tdm_fx(
                 {
                     return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD BWE\n" ) );
                 }
-                IF( NE_32( ( error = openCldfb_ivas_enc( &st->cldfbSynTd, CLDFB_SYNTHESIS, 16000, CLDFB_PROTOTYPE_1_25MS ) ), IVAS_ERR_OK ) )
+                IF( NE_32( ( error = openCldfb_ivas_fx( &st->cldfbSynTd, CLDFB_SYNTHESIS, 16000, CLDFB_PROTOTYPE_1_25MS, ENC ) ), IVAS_ERR_OK ) )
                 {
                     return error;
                 }
diff --git a/lib_rend/ivas_dirac_ana_fx.c b/lib_rend/ivas_dirac_ana_fx.c
index 93a100e17cb5c87059827c0056e10437862b1275..1a50130599b07d2d691d3bbd5370ce78b5b01f1e 100644
--- a/lib_rend/ivas_dirac_ana_fx.c
+++ b/lib_rend/ivas_dirac_ana_fx.c
@@ -107,7 +107,7 @@ ivas_error ivas_dirac_ana_open_fx(
     move16();
     FOR( i = 0; i < hDirAC->num_Cldfb_instances; i++ )
     {
-        IF( NE_32( ( error = openCldfb_ivas_fx( &( hDirAC->cldfbAnaEnc[i] ), CLDFB_ANALYSIS, input_Fs, CLDFB_PROTOTYPE_5_00MS ) ), IVAS_ERR_OK ) )
+        IF( NE_32( ( error = openCldfb_ivas_fx( &( hDirAC->cldfbAnaEnc[i] ), CLDFB_ANALYSIS, input_Fs, CLDFB_PROTOTYPE_5_00MS, DEC ) ), IVAS_ERR_OK ) )
         {
             return error;
         }
diff --git a/lib_rend/ivas_masa_merge_fx.c b/lib_rend/ivas_masa_merge_fx.c
index 430fab2c721cf40f2f666860afb59657a69d612b..c74477365728d70a807fe86c7be8a6a5ea17c083 100644
--- a/lib_rend/ivas_masa_merge_fx.c
+++ b/lib_rend/ivas_masa_merge_fx.c
@@ -499,7 +499,7 @@ ivas_error masaPrerendOpen_fx(
     move16();
     FOR( i = 0; i < hMasaPrerend->num_Cldfb_instances; i++ )
     {
-        IF( ( error = openCldfb_ivas_fx( &( hMasaPrerend->cldfbAnaEnc[i] ), CLDFB_ANALYSIS, input_Fs, CLDFB_PROTOTYPE_5_00MS ) ) != IVAS_ERR_OK )
+        IF( ( error = openCldfb_ivas_fx( &( hMasaPrerend->cldfbAnaEnc[i] ), CLDFB_ANALYSIS, input_Fs, CLDFB_PROTOTYPE_5_00MS, DEC ) ) != IVAS_ERR_OK )
         {
             return error;
         }
diff --git a/lib_rend/ivas_mcmasa_ana_fx.c b/lib_rend/ivas_mcmasa_ana_fx.c
index 8b56b685594a2ac5a122fad14882e5824d7e658d..e17b2f9f65d023919271f5407ce843024a04bde5 100644
--- a/lib_rend/ivas_mcmasa_ana_fx.c
+++ b/lib_rend/ivas_mcmasa_ana_fx.c
@@ -224,7 +224,7 @@ ivas_error ivas_mcmasa_ana_open(
     move16();
     FOR( i = 0; i < hMcMasa->num_Cldfb_instances; i++ )
     {
-        IF( NE_32( ( error = openCldfb_ivas_fx( &( hMcMasa->cldfbAnaEnc[i] ), CLDFB_ANALYSIS, input_Fs, CLDFB_PROTOTYPE_5_00MS ) ), IVAS_ERR_OK ) )
+        IF( NE_32( ( error = openCldfb_ivas_fx( &( hMcMasa->cldfbAnaEnc[i] ), CLDFB_ANALYSIS, input_Fs, CLDFB_PROTOTYPE_5_00MS, DEC ) ), IVAS_ERR_OK ) )
         {
             return error;
         }
diff --git a/lib_rend/ivas_omasa_ana_fx.c b/lib_rend/ivas_omasa_ana_fx.c
index 2c28b32bdddc68ec990c32d381a0a68ccad8941e..5e175fae5421100a4d9e17f63b946e8ffed5c0f6 100644
--- a/lib_rend/ivas_omasa_ana_fx.c
+++ b/lib_rend/ivas_omasa_ana_fx.c
@@ -133,7 +133,7 @@ ivas_error ivas_omasa_ana_open(
     hOMasa->num_Cldfb_instances = numAnalysisChannels;
     FOR( i = 0; i < hOMasa->num_Cldfb_instances; i++ )
     {
-        IF( NE_32( ( error = openCldfb_ivas_fx( &( hOMasa->cldfbAnaEnc[i] ), CLDFB_ANALYSIS, input_Fs, CLDFB_PROTOTYPE_5_00MS ) ), IVAS_ERR_OK ) )
+        IF( NE_32( ( error = openCldfb_ivas_fx( &( hOMasa->cldfbAnaEnc[i] ), CLDFB_ANALYSIS, input_Fs, CLDFB_PROTOTYPE_5_00MS, DEC ) ), IVAS_ERR_OK ) )
         {
             return error;
         }
diff --git a/lib_rend/lib_rend.c b/lib_rend/lib_rend.c
index 2c81911a1b49dc037b5b7b9083b62695ca192091..129f72388bc978e11c5f73e145e984e3575530af 100644
--- a/lib_rend/lib_rend.c
+++ b/lib_rend/lib_rend.c
@@ -8187,7 +8187,7 @@ static ivas_error initMasaExtRenderer(
     {
         FOR( i = 0; i < hMasaExtRend->nchan_input; i++ )
         {
-            IF( NE_32( ( error = openCldfb_ivas_fx( &( hMasaExtRend->cldfbAnaRend[i] ), CLDFB_ANALYSIS, *inputMasa->base.ctx.pOutSampleRate, CLDFB_PROTOTYPE_5_00MS ) ), IVAS_ERR_OK ) )
+            IF( NE_32( ( error = openCldfb_ivas_fx( &( hMasaExtRend->cldfbAnaRend[i] ), CLDFB_ANALYSIS, *inputMasa->base.ctx.pOutSampleRate, CLDFB_PROTOTYPE_5_00MS, DEC ) ), IVAS_ERR_OK ) )
             {
                 return error;
             }
@@ -8195,7 +8195,7 @@ static ivas_error initMasaExtRenderer(
 
         FOR( i = 0; i < hMasaExtRend->nchan_output; i++ )
         {
-            IF( NE_32( ( error = openCldfb_ivas_fx( &( hMasaExtRend->cldfbSynRend[i] ), CLDFB_SYNTHESIS, *inputMasa->base.ctx.pOutSampleRate, CLDFB_PROTOTYPE_5_00MS ) ), IVAS_ERR_OK ) )
+            IF( NE_32( ( error = openCldfb_ivas_fx( &( hMasaExtRend->cldfbSynRend[i] ), CLDFB_SYNTHESIS, *inputMasa->base.ctx.pOutSampleRate, CLDFB_PROTOTYPE_5_00MS, DEC ) ), IVAS_ERR_OK ) )
             {
                 return error;
             }