diff --git a/lib_com/ivas_cnst.h b/lib_com/ivas_cnst.h
index e409c2a891ce395f0e803685d11b053b95d45d4c..db4e1a7c5b0aa50b30654f7208cd1ed930578dc7 100755
--- a/lib_com/ivas_cnst.h
+++ b/lib_com/ivas_cnst.h
@@ -1225,9 +1225,7 @@ enum
 #define MASA_BIT_REDUCT_PARAM                   10
 #define MASA_MAXIMUM_TWO_DIR_BANDS              24
 #define NBITS_HR_COH                            4
-#ifdef NONBE_FIX_982_OMASA_DELAY_COMP_5MS
 #define OMASA_TDREND_MATCHING_GAIN              0.7943f
-#endif
 
 #define MASA_JBM_RINGBUFFER_FRAMES              3
 
diff --git a/lib_com/options.h b/lib_com/options.h
index 024147cdf4e9d4c8db01102b0ca3716553c6769e..49d3c4b0fb2de78c64d17fce42981ffd1cc79d94 100755
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -163,7 +163,6 @@
 
 
 
-
 /* #################### End BE switches ################################## */
 
 /* #################### Start NON-BE switches ############################ */
@@ -171,17 +170,6 @@
 /* all switches in this category should start with "NONBE_" */
 
 #define NONBE_FIX_978_MC_TDREND_REVERB                        /* Eri : activate reverb for TDREND with headtracking */
-#define BE_FIX_567_DOUBLE_STEREO_DMX                          /* NTT: Fix formal issues */   
-#define NONBE_FIX_567_DOUBLE_STEREO_DMX                       /* Orange: Double-precision replaced by single-precision */   
-#define NONBE_FIX_947_STEREO_DMX_EVS_POC                      /* Orange: Fix clicks on POC */
-#ifdef NONBE_FIX_947_STEREO_DMX_EVS_POC
-#define NONBE_FIX_947_STEREO_DMX_ROMOPT                       /* Orange: ROM optimisation for POC*/  
-#endif
-#define NONBE_FIX_947_STEREO_DMX_EVS_PHA                      /* Orange: Fix issues on PHA */
-#ifdef NONBE_FIX_947_STEREO_DMX_EVS_PHA
-#define NONBE_FIX_947_STEREO_DMX_FADOPT                       /* Orange: Fading optimisation */  
-#endif                                                                                     
-#define NONBE_FIX_982_OMASA_DELAY_COMP_5MS                    /* FhG : issue #982 : 5ms and 20ms output different for OMASA */
 
 #ifdef SPLIT_REND_WITH_HEAD_ROT
 #define SPLIT_REND_LCLD_5MS                                   /* Dlb: LCLD 5ms framing operation  */
diff --git a/lib_com/prot.h b/lib_com/prot.h
index d55ffdfbc67a5d6f363acba0b6bea1bf95ee61c5..10477f3587b842e1d9f9329819b266b64b537487 100644
--- a/lib_com/prot.h
+++ b/lib_com/prot.h
@@ -132,12 +132,10 @@ float inv_sqrt(
     const float x /* i  : input value                                     */
 );
 
-#ifdef NONBE_FIX_567_DOUBLE_STEREO_DMX
 /*! r: inverse square root of input value (float) */
 float inv_sqrtf(
     const float x /* i  : input value                                     */
 );
-#endif
 
 /*! r: output random value */
 int16_t own_random(
diff --git a/lib_com/tools.c b/lib_com/tools.c
index 4d70663ebf70e7876a095d3fd33a8ce8bb4f6ae4..10633883fd155f9d4045923f253d266f5a2cc1de 100644
--- a/lib_com/tools.c
+++ b/lib_com/tools.c
@@ -768,7 +768,6 @@ float inv_sqrt(
     return (float) ( 1.0 / sqrt( x ) );
 }
 
-#ifdef NONBE_FIX_567_DOUBLE_STEREO_DMX
 /*---------------------------------------------------------------------*
  * inv_sqrtf()
  *
@@ -782,7 +781,6 @@ float inv_sqrtf(
 {
     return ( 1.0f / sqrtf( x ) );
 }
-#endif
 
 /*-------------------------------------------------------------------*
  * conv()
diff --git a/lib_dec/ivas_ism_renderer.c b/lib_dec/ivas_ism_renderer.c
index b2a72317717d4c4e20c04e572559b6cd00282115..3dbc6a61901c0c3fd790312c880da90fc1e21131 100644
--- a/lib_dec/ivas_ism_renderer.c
+++ b/lib_dec/ivas_ism_renderer.c
@@ -523,16 +523,6 @@ void ivas_omasa_separate_object_render_jbm(
 
     for ( obj = 0; obj < num_objects; obj++ )
     {
-#ifndef NONBE_FIX_982_OMASA_DELAY_COMP_5MS
-        /* Delay the signal to match CLDFB delay. Delay the whole buffer with the first rendering call of the stretched buffer. */
-        if ( slots_rendered == 0 )
-        {
-            int16_t tcBufferSize;
-
-            tcBufferSize = hSpatParamRendCom->num_slots * hSpatParamRendCom->slot_size;
-            delay_signal( input_f[obj], tcBufferSize, st_ivas->hMasaIsmData->delayBuffer[obj], st_ivas->hMasaIsmData->delayBuffer_size );
-        }
-#endif
         offsetSamples = 0;
 
         for ( subframe_idx = first_sf; subframe_idx < last_sf; subframe_idx++ )
diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec.c
index 36ce6117b31b858f301f70821a5d36123225b5ee..89aa3f8d4c766bd8d14c9a1d6b5e33c939f79664 100644
--- a/lib_dec/ivas_jbm_dec.c
+++ b/lib_dec/ivas_jbm_dec.c
@@ -934,7 +934,6 @@ void ivas_jbm_dec_feed_tc_to_renderer(
                 ivas_ism_dec_digest_tc( st_ivas );
             }
 
-#ifdef NONBE_FIX_982_OMASA_DELAY_COMP_5MS
             if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_DIRAC )
             {
                 int16_t num_objects;
@@ -957,7 +956,6 @@ void ivas_jbm_dec_feed_tc_to_renderer(
                     delay_signal( st_ivas->hTcBuffer->tc[CPE_CHANNELS + n], st_ivas->hTcBuffer->n_samples_available, st_ivas->hMasaIsmData->delayBuffer[n], st_ivas->hMasaIsmData->delayBuffer_size );
                 }
             }
-#endif
 #ifdef NONBE_FIX_984_OMASA_EXT_OUTPUT
         }
 #endif
diff --git a/lib_dec/ivas_omasa_dec.c b/lib_dec/ivas_omasa_dec.c
index 75c5d97e22d44adab7729e1b1787ab5e2c42128b..ab032e24404a98a19280a94a4503e9823d4ad160 100644
--- a/lib_dec/ivas_omasa_dec.c
+++ b/lib_dec/ivas_omasa_dec.c
@@ -45,16 +45,6 @@
 #endif
 #include "wmc_auto.h"
 
-#ifndef NONBE_FIX_982_OMASA_DELAY_COMP_5MS
-/*-------------------------------------------------------------------------
- * Local constants
- *------------------------------------------------------------------------*/
-
-#define OMASA_TDREND_MATCHING_GAIN 0.7943f
-#ifdef NONBE_FIX_984_OMASA_EXT_OUTPUT
-#define EXT_RENDER_IIR_FAC 0.95f
-#endif
-#else
 #ifdef NONBE_FIX_984_OMASA_EXT_OUTPUT
 /*-------------------------------------------------------------------------
  * Local constants
@@ -62,7 +52,6 @@
 
 #define EXT_RENDER_IIR_FAC 0.95f
 #endif
-#endif
 
 /*-------------------------------------------------------------------*
  * ivas_omasa_data_open()
@@ -747,34 +736,22 @@ void ivas_omasa_dirac_rend_jbm(
     int16_t n;
     float data_separated_objects[MAX_NUM_OBJECTS][L_FRAME48k];
 
-#ifdef NONBE_FIX_982_OMASA_DELAY_COMP_5MS
     if ( !st_ivas->hDecoderConfig->Opt_tsm )
     {
         *nSamplesRendered = min( nSamplesAsked, st_ivas->hTcBuffer->n_samples_available );
-#endif
 
         if ( st_ivas->ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ || st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ )
         {
-#ifdef NONBE_FIX_982_OMASA_DELAY_COMP_5MS
             mvr2r( &output_f[CPE_CHANNELS][st_ivas->hTcBuffer->n_samples_rendered], data_separated_objects[0], *nSamplesRendered );
-#else
-        mvr2r( output_f[CPE_CHANNELS], data_separated_objects[0], nSamplesAsked );
-#endif
         }
         else
         {
             for ( n = 0; n < st_ivas->nchan_ism; n++ )
             {
-#ifdef NONBE_FIX_982_OMASA_DELAY_COMP_5MS
                 mvr2r( &output_f[n + CPE_CHANNELS][st_ivas->hTcBuffer->n_samples_rendered], data_separated_objects[n], *nSamplesRendered );
-#else
-            mvr2r( output_f[n + CPE_CHANNELS], data_separated_objects[n], nSamplesAsked );
-#endif
             }
         }
-#ifdef NONBE_FIX_982_OMASA_DELAY_COMP_5MS
     }
-#endif
 
     subframes_rendered = st_ivas->hSpatParamRendCom->subframes_rendered;
     slots_rendered = st_ivas->hSpatParamRendCom->slots_rendered;
@@ -804,36 +781,14 @@ ivas_error ivas_omasa_dirac_td_binaural_jbm(
 {
     int16_t n;
     float data_separated_objects[MAX_NUM_OBJECTS][L_FRAME48k];
-#ifndef NONBE_FIX_982_OMASA_DELAY_COMP_5MS
-    float gain = OMASA_TDREND_MATCHING_GAIN;
-#endif
     ivas_error error;
     float *p_sepobj[MAX_NUM_OBJECTS];
-#ifndef NONBE_FIX_982_OMASA_DELAY_COMP_5MS
-    float *tc_local[MAX_TRANSPORT_CHANNELS];
-#endif
 
     for ( n = 0; n < MAX_NUM_OBJECTS; n++ )
     {
         p_sepobj[n] = &data_separated_objects[n][0];
     }
 
-#ifndef NONBE_FIX_982_OMASA_DELAY_COMP_5MS
-    /* Delay the object signals to match the CLDFB delay. Delay the whole buffer with the first rendering call of the stretched buffer. */
-    if ( st_ivas->hSpatParamRendCom->slots_rendered == 0 )
-    {
-        int16_t tcBufferSize;
-
-        tcBufferSize = st_ivas->hSpatParamRendCom->num_slots * st_ivas->hSpatParamRendCom->slot_size;
-
-        for ( n = 0; n < st_ivas->nchan_ism; n++ )
-        {
-            tc_local[n] = st_ivas->hTcBuffer->tc[n + 2];
-            v_multc( tc_local[n], gain, tc_local[n], tcBufferSize );
-            delay_signal( tc_local[n], tcBufferSize, st_ivas->hMasaIsmData->delayBuffer[n], st_ivas->hMasaIsmData->delayBuffer_size );
-        }
-    }
-#endif
     ivas_dirac_dec_binaural_render( st_ivas, nSamplesAsked, nSamplesRendered, nSamplesAvailable, nchan_transport, output_f );
 
     /* reset combined orientation access index before calling the td renderer */
diff --git a/lib_enc/ivas_rom_enc.c b/lib_enc/ivas_rom_enc.c
index 8273e0e444bc2a8b5532eb3d937b48c4b567622f..57eede1ee576e9c5b4c7719ca2196aec7d409029 100644
--- a/lib_enc/ivas_rom_enc.c
+++ b/lib_enc/ivas_rom_enc.c
@@ -534,7 +534,6 @@ const float ari_bit_estimate_s17_LC[RANGE_N_CONTEXT][RANGE_N_SYMBOLS] =
  * Stereo downmix to EVS ROM tables
  *----------------------------------------------------------------------------------*/
 
-#ifdef NONBE_FIX_947_STEREO_DMX_EVS_POC
 
 const float Stereo_dmx_s_wnd_coef_16k[L_FRAME16k >> 2] = {
     0.00009518625f, 0.00038070876f, 0.00085645882f, 0.00152225529f, 0.00237784467f, 0.00342290120f, 0.00465702698f, 0.00607975212f, 0.00769053493f, 0.00948876211f, 
@@ -593,28 +592,6 @@ const float Stereo_dmx_s_wnd_coef_48k[L_FRAME48k >> 2] = {
     0.46899585921f, 0.47225590178f, 0.47551712789f, 0.47877939840f, 0.48204257416f, 0.48530651596f, 0.48857108456f, 0.49183614071f, 0.49510154512f, 0.49836715849f, 
 };
 
-#else
-const float Stereo_dmx_s_wnd_coef_16k[L_FRAME16k >> 4] = {
-    0.00154133327f, 0.0138150426f, 0.0380602330f, 0.0736799166f, 0.119797014f, 0.175276011f, 0.238750681f, 0.308658302f, 0.383277327f, 0.460770488f,
-    0.539229512f, 0.616722703f, 0.691341758f, 0.761249363f, 0.824724138f, 0.880203009f, 0.926320136f, 0.961939812f, 0.986184955f, 0.998458624f,
-};
-
-const float Stereo_dmx_s_wnd_coef_32k[L_FRAME32k >> 4] = {
-    0.000385481922f, 0.00346577191f, 0.00960735977f, 0.0187723786f, 0.0309043285f, 0.0459284224f, 0.0637519881f, 0.0842651874f, 0.107341543f, 0.132838756f,
-    0.160599619f, 0.190453023f, 0.222214893f, 0.255689442f, 0.290670186f, 0.326941460f, 0.364279807f, 0.402454913f, 0.441231340f, 0.480370134f,
-    0.519629955f, 0.558768749f, 0.597545147f, 0.635720134f, 0.673058629f, 0.709329903f, 0.744310737f, 0.777785182f, 0.809546947f, 0.839400351f,
-    0.867161214f, 0.892658472f, 0.915734828f, 0.936248004f, 0.954071581f, 0.969095647f, 0.981227636f, 0.990392625f, 0.996534228f, 0.999614537f
-};
-
-const float Stereo_dmx_s_wnd_coef_48k[L_FRAME48k >> 4] = {
-    0.000171337553f, 0.00154133327f, 0.00427756971f, 0.00837254710f, 0.0138150426f, 0.0205901340f, 0.0286792554f, 0.0380602330f, 0.0487073623f, 0.0605914444f,
-    0.0736799166f, 0.0879369006f, 0.103323318f, 0.119797014f, 0.137312800f, 0.155822709f, 0.175276011f, 0.195619285f, 0.216796920f, 0.238750681f,
-    0.261420637f, 0.284744442f, 0.308658302f, 0.333096594f, 0.357992321f, 0.383277327f, 0.408882231f, 0.434736967f, 0.460770488f, 0.486911595f,
-    0.513088524f, 0.539229512f, 0.565263212f, 0.591117799f, 0.616722703f, 0.642007649f, 0.666903436f, 0.691341758f, 0.715255499f, 0.738579512f,
-    0.761249363f, 0.783203125f, 0.804380774f, 0.824724138f, 0.844177306f, 0.862687230f, 0.880203009f, 0.896676719f, 0.912063122f, 0.926320136f,
-    0.939408541f, 0.951292694f, 0.961939812f, 0.971320748f, 0.979409873f, 0.986184955f, 0.991627395f, 0.995722473f, 0.998458624f, 0.999828696f
-};
-#endif
 
 const float Stereo_dmx_wnd_coef_32k[L_FRAME32k] = {
     0.00245436677f, 0.00736304140f, 0.0122715384f, 0.0171797406f, 0.0220875274f, 0.0269947834f, 0.0319013894f, 0.0368072242f, 0.0417121723f, 0.0466161147f,
diff --git a/lib_enc/ivas_rom_enc.h b/lib_enc/ivas_rom_enc.h
index 3dae881bc884d839afa32ed8f974844d6c297b96..f5ab81f8c093215254a2f3e60ad991bc5a7b7bca 100644
--- a/lib_enc/ivas_rom_enc.h
+++ b/lib_enc/ivas_rom_enc.h
@@ -120,15 +120,9 @@ extern const uint16_t ECSQ_tab_vals[ECSQ_PARAM_COUNT - 1][1 + ECSQ_TAB_VALS_SIZE
  * Stereo downmix to EVS ROM tables
  *----------------------------------------------------------------------------------*/
 
-#ifdef NONBE_FIX_947_STEREO_DMX_EVS_POC
 extern const float Stereo_dmx_s_wnd_coef_16k[L_FRAME16k >> 2];
 extern const float Stereo_dmx_s_wnd_coef_32k[L_FRAME32k >> 2];
 extern const float Stereo_dmx_s_wnd_coef_48k[L_FRAME48k >> 2];
-#else
-extern const float Stereo_dmx_s_wnd_coef_16k[L_FRAME16k >> 4];
-extern const float Stereo_dmx_s_wnd_coef_32k[L_FRAME32k >> 4];
-extern const float Stereo_dmx_s_wnd_coef_48k[L_FRAME48k >> 4];
-#endif
 extern const float Stereo_dmx_wnd_coef_32k[L_FRAME32k];
 extern const float Stereo_dmx_wnd_coef_48k[L_FRAME48k];
 
diff --git a/lib_enc/ivas_stat_enc.h b/lib_enc/ivas_stat_enc.h
index 434692f7220206f8df5e8e8b091aab3e71319471..3962ac055f232389b780a957c227cd5a3bd203be 100644
--- a/lib_enc/ivas_stat_enc.h
+++ b/lib_enc/ivas_stat_enc.h
@@ -1074,9 +1074,6 @@ typedef struct stereo_dmx_evs_phase_only_correlation_structure
 
 typedef struct stereo_dmx_evs_correlation_filter_structure
 {
-#ifndef NONBE_FIX_947_STEREO_DMX_EVS_PHA
-    int16_t init_frmCntr;
-#endif
     float isd_rate_s;
     float iccr_s;
     float ipd_ff[STEREO_DMX_EVS_NB_SUBBAND_MAX];
@@ -1097,7 +1094,6 @@ typedef struct stereo_dmx_evs_correlation_filter_structure
     STEREO_DMX_EVS_PHA curr_pha;
     STEREO_DMX_EVS_PHA prev_pha;
     int16_t pha_hys_cnt;
-#ifdef NONBE_FIX_947_STEREO_DMX_EVS_PHA
     STEREO_DMX_EVS_PHA proc_pha;
     bool force_poc;
 
@@ -1109,21 +1105,16 @@ typedef struct stereo_dmx_evs_correlation_filter_structure
     int16_t pha_ipd_chanswitch;
     int16_t pha_ipd_chanswitch_allowed;
     float pha_ipd_sf_Threshold;
-#endif
 
     int16_t prc_thres;
     STEREO_DMX_EVS_PRC curr_prc;
     STEREO_DMX_EVS_PRC prev_prc;
     int16_t prc_hys_cnt;
     float fad_g_prc[L_FRAME48k];
-#ifndef NONBE_FIX_947_STEREO_DMX_EVS_PHA
-    int16_t fad_len_prc;
-#endif
 
     float trns_aux_energy[CPE_CHANNELS];
     float crst_fctr;
 
-#ifdef NONBE_FIX_947_STEREO_DMX_EVS_PHA
     int16_t n_fad_g;
     int16_t n_fad_cnt;
     float dmx_pha_ener;
@@ -1133,7 +1124,6 @@ typedef struct stereo_dmx_evs_correlation_filter_structure
     float dmx_pha_gain_sgc;
     float dmx_poc_gain_sgc;
     float low_egy_thres_sgc;
-#endif
 
 } STEREO_DMX_EVS_PHA_DATA, *STEREO_DMX_EVS_PHA_HANDLE;
 
diff --git a/lib_enc/ivas_stereo_dmx_evs.c b/lib_enc/ivas_stereo_dmx_evs.c
index 11cc506c9c50c611081c224a1bdeca4dd879a46a..d4f280fb84d9cdbe86fc55aba3ecde88d7df6e4c 100644
--- a/lib_enc/ivas_stereo_dmx_evs.c
+++ b/lib_enc/ivas_stereo_dmx_evs.c
@@ -58,11 +58,7 @@
 #define STEREO_DMX_EVS_POC_FORGETTING        0.78f
 #define STEREO_DMX_EVS_TARGET_POC_FORGETTING 0.79f
 #define STEREO_DMX_EVS_POC_W_FORGETTING      0.875f
-#ifdef BE_FIX_567_DOUBLE_STEREO_DMX
-#define STEREO_DMX_EVS_SHIFT_LIMIT STEREO_DFT_ZP_NS_ENC
-#else
-#define STEREO_DMX_EVS_SHIFT_LIMIT 5.625f /* ms */
-#endif
+#define STEREO_DMX_EVS_SHIFT_LIMIT           STEREO_DFT_ZP_NS_ENC
 
 #define STEREO_DMX_EVS_DMX_EGY_FORGETTING 0.25f
 #define STEREO_DMX_EVS_CORR_FORGETTING    0.78f
@@ -92,14 +88,10 @@
 #define STEREO_DMX_EVS_SWTCH_PRC_THRES_48 29
 
 #define STEREO_DMX_EVS_SWTCH_PRC_HYS_THRES 1
-#ifdef NONBE_FIX_947_STEREO_DMX_EVS_PHA
-#define STEREO_DMX_EVS_IFF_AMIN  0.857696f
-#define STEREO_DMX_EVS_IFF_AMAX  0.944061f
-#define STEREO_DMX_EVS_IFF_FREQ  3000.0f
-#define STEREO_DMX_EVS_PHA_WND_C 1.8f
-#else
-#define STEREO_DMX_EVS_FADE_LEN_PRC 20.0f
-#endif
+#define STEREO_DMX_EVS_IFF_AMIN            0.857696f
+#define STEREO_DMX_EVS_IFF_AMAX            0.944061f
+#define STEREO_DMX_EVS_IFF_FREQ            3000.0f
+#define STEREO_DMX_EVS_PHA_WND_C           1.8f
 
 #define STEREO_DMX_EVS_NB_SBFRM      5
 #define STEREO_DMX_EVS_TRNS_DTC_INST 75.0f
@@ -109,7 +101,6 @@
 
 #define STEREO_DMX_EVS_TRNS_EGY_FORGETTING 0.75f
 
-#ifdef NONBE_FIX_947_STEREO_DMX_EVS_PHA
 #define STEREO_DMX_EVS_FAD_R              3
 #define STEREO_DMX_EVS_SGC_EGY_FORGETTING 0.9f
 #define STEREO_DMX_EVS_SGC_GR_S           1.00461543f
@@ -123,7 +114,6 @@
 
 #define STEREO_DMX_EVS_IPD_ILD_THRES 3.16f // 5dB
 #define STEREO_DMX_EVS_IPD_SF_THRES  0.05f
-#endif
 
 /*-----------------------------------------------------------------------*
  * Local function prototypes
@@ -137,9 +127,7 @@ static void adapt_gain( const float src[], float dst[], const float gain, const
 static void create_M_signal( const float srcL[], const float srcR[], float dmx[], const float w_curr, const int16_t input_frame, const float wnd[], float *w_prev, float *dmx_energy, float *src_energy );
 static float find_poc_peak( STEREO_DMX_EVS_POC_HANDLE hPOC, float itd[], const int16_t input_frame, const float ratio );
 static void calc_energy( const float src1[], const float src2[], float energy[], const int16_t input_frame, const float ratio );
-#ifdef NONBE_FIX_947_STEREO_DMX_EVS_PHA
 static float spectral_flatness( const float sig[], const int16_t sig_length );
-#endif
 
 /*-------------------------------------------------------------------*
  * estimate_itd_wnd_fft()
@@ -231,11 +219,7 @@ static void calc_poc(
     int16_t cos_step, cos_max;
     float eps_cos, eps_sin, EPS;
 
-#ifdef NONBE_FIX_947_STEREO_DMX_EVS_PHA
     int16_t isd_cnt_h, isd_cnt_l, ild_cnt, n, freq_8k, freq_ipd_max, nsbd, input_frame_pha, pha_ipd_ild_chan2rephase;
-#else
-    int16_t isd_cnt_h, isd_cnt_l, ild_cnt, n, freq_8k, freq_ipd_max, nsbd, input_frame_pha;
-#endif
     float Nr, Ni, Dr, Di, tPr, tPi, Pn, energy, isd_rate;
     float eneL, eneR, IPDr, IPDi, tIPDr, tIPDi, ICCr;
     float *Pr, *Pi, *ipd_ff, *p_curr_taps;
@@ -414,13 +398,6 @@ static void calc_poc(
     }
     specPOr[n0] = sign( specLr[n0] * specRr[n0] ) * wnd[i * step + bias] * gamma;
 
-#ifndef NONBE_FIX_947_STEREO_DMX_EVS_PHA
-    hPHA->init_frmCntr--;
-    if ( hPHA->init_frmCntr < 0 )
-    {
-        hPHA->init_frmCntr = 0;
-    }
-#endif
     freq_8k = L_FRAME16k / 2;
     freq_ipd_max = (int16_t) ( freq_8k * 5000.0f / ( 8000.0f * STEREO_DMX_EVS_SUBBAND_SIZE ) );
 
@@ -529,11 +506,7 @@ static void calc_poc(
             tPi += IPDi;
 
             /* ICCr */
-#ifdef NONBE_FIX_567_DOUBLE_STEREO_DMX
             Pn = inv_sqrtf( ( IPDr * IPDr + IPDi * IPDi ) + EPSILON );
-#else
-            Pn = (float) inv_sqrt( ( IPDr * IPDr + IPDi * IPDi ) + EPSILON );
-#endif
             IPDr *= Pn;
             IPDi *= Pn;
 
@@ -546,51 +519,22 @@ static void calc_poc(
             eneL += ( specLr[i] * specLr[i] + specLi[i] * specLi[i] );
             eneR += ( specRr[i] * specRr[i] + specRi[i] * specRi[i] );
         }
-#ifdef NONBE_FIX_567_DOUBLE_STEREO_DMX
         Pn = inv_sqrtf( ( tPr * tPr + tPi * tPi ) + EPSILON );
-#else
-        Pn = (float) inv_sqrt( ( tPr * tPr + tPi * tPi ) + EPSILON );
-#endif
 
         tPr *= Pn;
         tPi *= Pn;
 
-#ifdef NONBE_FIX_947_STEREO_DMX_EVS_PHA
 
         Pr[n] = ipd_ff[n] * Pr[n] + ( 1.0f - ipd_ff[n] ) * tPr;
         Pi[n] = ipd_ff[n] * Pi[n] + ( 1.0f - ipd_ff[n] ) * tPi;
-#ifdef NONBE_FIX_567_DOUBLE_STEREO_DMX
         Pn = inv_sqrtf( ( Pr[n] * Pr[n] + Pi[n] * Pi[n] ) + EPSILON );
-#else
-        Pn = (float) inv_sqrt( ( Pr[n] * Pr[n] + Pi[n] * Pi[n] ) + EPSILON );
-#endif
         Pr[n] *= Pn;
         Pi[n] *= Pn;
 
-#else
-        if ( hPHA->init_frmCntr == 0 )
-        {
-            Pr[n] = ipd_ff[n] * Pr[n] + ( 1.0f - ipd_ff[n] ) * tPr;
-            Pi[n] = ipd_ff[n] * Pi[n] + ( 1.0f - ipd_ff[n] ) * tPi;
-#ifdef NONBE_FIX_567_DOUBLE_STEREO_DMX
-            Pn = inv_sqrtf( ( Pr[n] * Pr[n] + Pi[n] * Pi[n] ) + EPSILON );
-#else
-            Pn = (float) inv_sqrt( ( Pr[n] * Pr[n] + Pi[n] * Pi[n] ) + EPSILON );
-#endif
-            Pr[n] *= Pn;
-            Pi[n] *= Pn;
-        }
-        else
-        {
-            Pr[n] = tPr;
-            Pi[n] = tPi;
-        }
-#endif
         Pr[n] = ( Pr[n] > 1.0f ) ? 1.0f : Pr[n];
         Pr[n] = ( Pr[n] < -1.0f ) ? -1.0f : Pr[n];
     }
 
-#ifdef NONBE_FIX_947_STEREO_DMX_EVS_PHA
     /* Computes Spectral flatness on one channel */
     tmp1 = spectral_flatness( &tEl[1], nsbd - 1 );
     if ( tmp1 < hPHA->pha_ipd_sf_Threshold )
@@ -601,16 +545,10 @@ static void calc_poc(
     {
         hPHA->pha_ipd_chanswitch_allowed = 1;
     }
-#endif
 
-#ifdef NONBE_FIX_567_DOUBLE_STEREO_DMX
     ICCr = sqrtf( ( Nr * Nr + Ni * Ni ) / ( eneL * eneR + EPSILON ) );
-#else
-    ICCr = (float) sqrt( ( Nr * Nr + Ni * Ni ) / ( eneL * eneR + EPSILON ) );
-#endif
     hPHA->iccr_s = STEREO_DMX_EVS_ICCR_FORGETTING * hPHA->iccr_s + ( 1.0f - STEREO_DMX_EVS_ICCR_FORGETTING ) * ICCr;
 
-#ifdef NONBE_FIX_947_STEREO_DMX_EVS_PHA
     if ( hPHA->curr_pha == STEREO_DMX_EVS_PHA_IPD )
     {
         hPHA->force_poc = FALSE;
@@ -792,7 +730,6 @@ static void calc_poc(
         isd_rate = (float) isd_cnt_l / freq_8k;
         for ( i = 1; i < nsbd; i++ )
         {
-#ifdef NONBE_FIX_567_DOUBLE_STEREO_DMX
             rfft_pha_buf[i * 2] = sqrtf( ( 1.0f + Pr[i] ) / 2.0f );
             rfft_pha_buf[i * 2 + 1] = sqrtf( ( 1.0f - Pr[i] ) / 2.0f ) * sign( Pi[i] );
             if ( isd_rate > STEREO_DMX_EVS_ISD_DIST_THRES_IPD )
@@ -800,15 +737,6 @@ static void calc_poc(
                 rfft_pha_buf[i * 2 + 1] = sqrtf( ( 1.0f - rfft_pha_buf[i * 2] ) / 2.0f ) * sign( rfft_pha_buf[i * 2 + 1] );
                 rfft_pha_buf[i * 2] = sqrtf( ( 1.0f + rfft_pha_buf[i * 2] ) / 2.0f );
             }
-#else
-            rfft_pha_buf[i * 2] = (float) sqrt( ( 1.0f + Pr[i] ) / 2.0f );
-            rfft_pha_buf[i * 2 + 1] = (float) sqrt( ( 1.0f - Pr[i] ) / 2.0f ) * sign( Pi[i] );
-            if ( isd_rate > STEREO_DMX_EVS_ISD_DIST_THRES_IPD )
-            {
-                rfft_pha_buf[i * 2 + 1] = (float) sqrt( ( 1.0f - rfft_pha_buf[i * 2] ) / 2.0f ) * sign( rfft_pha_buf[i * 2 + 1] );
-                rfft_pha_buf[i * 2] = (float) sqrt( ( 1.0f + rfft_pha_buf[i * 2] ) / 2.0f );
-            }
-#endif
             if ( ( tEr[i] > STEREO_DMX_EVS_LR_EGY * tEl[i] ) || ( tEl[i] > STEREO_DMX_EVS_LR_EGY * tEr[i] ) )
             {
                 ild_cnt++;
@@ -842,125 +770,6 @@ static void calc_poc(
             p_curr_taps[i] = rfft_pha_buf[input_frame_pha - i];
         }
     }
-#else
-    if ( hPHA->curr_pha == STEREO_DMX_EVS_PHA_IPD )
-    {
-        hPHA->p_curr_taps[0] = NULL;
-        hPHA->p_curr_taps[1] = hPHA->curr_taps[1];
-
-        rfft_pha_buf[0] = 1.;
-        rfft_pha_buf[1] = 1.;
-
-        ild_cnt = 0;
-        for ( i = 1; i < nsbd; i++ )
-        {
-            rfft_pha_buf[i * 2] = Pr[i];
-            rfft_pha_buf[i * 2 + 1] = Pi[i];
-            if ( ( tEr[i] > STEREO_DMX_EVS_LR_EGY * tEl[i] ) || ( tEl[i] > STEREO_DMX_EVS_LR_EGY * tEr[i] ) )
-            {
-                ild_cnt++;
-                tEr[i] = 1;
-            }
-            else
-            {
-                tEr[i] = -1;
-            }
-        }
-        if ( ild_cnt > nsbd * STEREO_DMX_EVS_ILD_PRC )
-        {
-            for ( i = 1; i < nsbd; i++ )
-            {
-                if ( tEr[i] > 0 )
-                {
-                    rfft_pha_buf[i * 2] = 1.;
-                    rfft_pha_buf[i * 2 + 1] = 0.;
-                }
-            }
-        }
-
-        rfft( rfft_pha_buf, hPHA->rfft_ipd_coef, input_frame_pha, +1 );
-        mvr2r( rfft_pha_buf, hPHA->p_curr_taps[1], hPHA->pha_len );
-    }
-    else
-    {
-        if ( ( hPHA->iccr_s < STEREO_DMX_EVS_ICCR_HYST_L ) || ( ( hPHA->iccr_s < STEREO_DMX_EVS_ICCR_HYST_H ) && ( hPHA->p_curr_taps[0] != NULL ) ) )
-        {
-            /* IPDn */
-
-            set_f( &( Pr[freq_ipd_max] ), 1.0f, ( nsbd - freq_ipd_max ) );
-            set_f( &( Pi[freq_ipd_max] ), 0.0f, ( nsbd - freq_ipd_max ) );
-
-            for ( n = 0; n < CPE_CHANNELS; n++ )
-            {
-                hPHA->p_curr_taps[n] = hPHA->curr_taps[n];
-            }
-
-            rfft_pha_buf[0] = 1.;
-            rfft_pha_buf[1] = 1.;
-
-            ild_cnt = 0;
-            isd_rate = (float) isd_cnt_l / freq_8k;
-            for ( i = 1; i < nsbd; i++ )
-            {
-#ifdef NONBE_FIX_567_DOUBLE_STEREO_DMX
-                rfft_pha_buf[i * 2] = sqrtf( ( 1.0f + Pr[i] ) / 2.0f );
-                rfft_pha_buf[i * 2 + 1] = sqrtf( ( 1.0f - Pr[i] ) / 2.0f ) * sign( Pi[i] );
-                if ( isd_rate > STEREO_DMX_EVS_ISD_DIST_THRES_IPD )
-                {
-                    rfft_pha_buf[i * 2 + 1] = sqrtf( ( 1.0f - rfft_pha_buf[i * 2] ) / 2.0f ) * sign( rfft_pha_buf[i * 2 + 1] );
-                    rfft_pha_buf[i * 2] = sqrtf( ( 1.0f + rfft_pha_buf[i * 2] ) / 2.0f );
-                }
-#else
-                rfft_pha_buf[i * 2] = (float) sqrt( ( 1.0f + Pr[i] ) / 2.0f );
-                rfft_pha_buf[i * 2 + 1] = (float) sqrt( ( 1.0f - Pr[i] ) / 2.0f ) * sign( Pi[i] );
-                if ( isd_rate > STEREO_DMX_EVS_ISD_DIST_THRES_IPD )
-                {
-                    rfft_pha_buf[i * 2 + 1] = (float) sqrt( ( 1.0f - rfft_pha_buf[i * 2] ) / 2.0f ) * sign( rfft_pha_buf[i * 2 + 1] );
-                    rfft_pha_buf[i * 2] = (float) sqrt( ( 1.0f + rfft_pha_buf[i * 2] ) / 2.0f );
-                }
-#endif
-                if ( ( tEr[i] > STEREO_DMX_EVS_LR_EGY * tEl[i] ) || ( tEl[i] > STEREO_DMX_EVS_LR_EGY * tEr[i] ) )
-                {
-                    ild_cnt++;
-                    tEr[i] = 1;
-                }
-                else
-                {
-                    tEr[i] = -1;
-                }
-            }
-            if ( ild_cnt > nsbd * STEREO_DMX_EVS_ILD_PRC )
-            {
-                for ( i = 1; i < nsbd; i++ )
-                {
-                    if ( tEr[i] > 0 )
-                    {
-                        rfft_pha_buf[i * 2] = 1.;
-                        rfft_pha_buf[i * 2 + 1] = 0.;
-                    }
-                }
-            }
-
-            rfft( rfft_pha_buf, hPHA->rfft_ipd_coef, input_frame_pha, +1 );
-            mvr2r( rfft_pha_buf, hPHA->p_curr_taps[1], hPHA->pha_len );
-
-            /* PHA L2R */
-            p_curr_taps = hPHA->p_curr_taps[0];
-            p_curr_taps[0] = rfft_pha_buf[0];
-            for ( i = 1; i < hPHA->pha_len; i++ )
-            {
-                p_curr_taps[i] = rfft_pha_buf[input_frame_pha - i];
-            }
-        }
-        else
-        {
-            for ( n = 0; n < CPE_CHANNELS; n++ )
-            {
-                hPHA->p_curr_taps[n] = NULL;
-            }
-        }
-    }
-#endif
 
     for ( n = 0; n < CPE_CHANNELS; n++ )
     {
@@ -976,11 +785,7 @@ static void calc_poc(
             {
                 energy += hPHA->p_curr_taps[n][i] * hPHA->p_curr_taps[n][i];
             }
-#ifdef NONBE_FIX_567_DOUBLE_STEREO_DMX
             energy = inv_sqrtf( energy + EPSILON );
-#else
-            energy = (float) inv_sqrt( energy + EPSILON );
-#endif
             for ( i = 0; i < hPHA->pha_len; i++ )
             {
                 hPHA->p_curr_taps[n][i] *= energy;
@@ -1273,9 +1078,7 @@ static void weighted_ave(
     const float wnd[]          /* i  : window coef                    */
 )
 {
-#ifdef NONBE_FIX_947_STEREO_DMX_EVS_POC
 
-#ifdef NONBE_FIX_947_STEREO_DMX_ROMOPT
 
     int16_t i, len, len2;
     float gain_tmp = 0.f, gain_sub;
@@ -1299,50 +1102,10 @@ static void weighted_ave(
         dst[i] = src1[i] * gain + src2[i] * ( 1.0f - gain_tmp );
     }
 
-#else
-
-    int16_t i, len;
-    float gain_tmp = 0.f, gain_sub;
-
-    len = input_frame >> 1;
-    gain_sub = gain - old_gain;
-
-    for ( i = 0; i < len; i++ )
-    {
-        gain_tmp = old_gain + gain_sub * wnd[i];
-        dst[i] = src1[i] * gain_tmp + src2[i] * ( 1.0f - gain_tmp );
-    }
-    for ( ; i < input_frame; i++ )
-    {
-        dst[i] = src1[i] * gain + src2[i] * ( 1.0f - gain_tmp );
-    }
-
-#endif
-
-#else
-
-    int16_t i, len;
-    float gain_tmp = 0.f, gain_sub;
-
-    len = input_frame >> 4;
-    gain_sub = gain - old_gain;
-
-    for ( i = 0; i < len; i++ )
-    {
-        gain_tmp = old_gain + gain_sub * wnd[i];
-        dst[i] = src1[i] * gain_tmp + src2[i] * ( 1.0f - gain_tmp );
-    }
-    for ( ; i < input_frame; i++ )
-    {
-        dst[i] = src1[i] * gain + src2[i] * ( 1.0f - gain_tmp );
-    }
-
-#endif
 
     return;
 }
 
-#ifdef NONBE_FIX_947_STEREO_DMX_EVS_PHA
 /*-------------------------------------------------------------------*
  * spectral_flatness()
  *
@@ -1373,7 +1136,6 @@ static float spectral_flatness(
     return geoMean / ariMean;
 }
 
-#endif
 
 /*-------------------------------------------------------------------*
  * calc_energy()
@@ -1421,7 +1183,6 @@ static void calc_energy(
 }
 
 
-#ifdef NONBE_FIX_947_STEREO_DMX_EVS_PHA
 /*-------------------------------------------------------------------*
  * calc_energy_sgc()
  *
@@ -1437,7 +1198,6 @@ static void calc_energy_sgc(
     *energy = ratio * *energy + ( 1.0f - ratio ) * sum2_f( src, input_frame );
     return;
 }
-#endif
 
 
 /*-------------------------------------------------------------------*
@@ -1455,9 +1215,7 @@ static void adapt_gain(
     const float wnd[]          /* i  : window coef                    */
 )
 {
-#ifdef NONBE_FIX_947_STEREO_DMX_EVS_POC
 
-#ifdef NONBE_FIX_947_STEREO_DMX_ROMOPT
 
     int16_t i, len, len2;
     float gain_tmp, gain_sub;
@@ -1477,46 +1235,12 @@ static void adapt_gain(
         dst[i] = src[i] * gain_tmp;
     }
 
-#else
-
-    int16_t i, len;
-    float gain_tmp, gain_sub;
-
-    len = input_frame >> 1;
-    gain_sub = gain - old_gain;
-
-    for ( i = 0; i < len; i++ )
-    {
-        gain_tmp = old_gain + gain_sub * wnd[i];
-        dst[i] = src[i] * gain_tmp;
-    }
-
-#endif
-
-    for ( ; i < input_frame; i++ )
-    {
-        dst[i] = src[i] * gain;
-    }
-
-#else
-
-    int16_t i, len;
-    float gain_tmp, gain_sub;
-
-    len = input_frame >> 4;
-    gain_sub = gain - old_gain;
 
-    for ( i = 0; i < len; i++ )
-    {
-        gain_tmp = old_gain + gain_sub * wnd[i];
-        dst[i] = src[i] * gain_tmp;
-    }
     for ( ; i < input_frame; i++ )
     {
         dst[i] = src[i] * gain;
     }
 
-#endif
 
     return;
 }
@@ -1578,8 +1302,6 @@ static void create_M_signal(
 }
 
 
-#ifdef NONBE_FIX_947_STEREO_DMX_EVS_PHA
-
 /*-------------------------------------------------------------------*
  * apply_gain_sgc()
  *
@@ -1617,8 +1339,6 @@ static void apply_gain_sgc(
     *gain *= lr;
 }
 
-#endif
-
 
 /*-------------------------------------------------------------------*
  * stereo_dmx_evs_enc()
@@ -1634,14 +1354,9 @@ void stereo_dmx_evs_enc(
     const bool is_binaural                   /* i  : indication that input is binaural audio */
 )
 {
-#ifdef NONBE_FIX_947_STEREO_DMX_EVS_PHA
 
     float dmx_weight, corr;
-#ifdef NONBE_FIX_947_STEREO_DMX_FADOPT
     int16_t k, m, n, pha_len, fad_len, input_subframe, input_frame, n_fad_r, n_fad_g, m_fad_g, n_fad_cnt, sbfad_len;
-#else
-    int16_t k, m, n, pha_len, fad_len, input_subframe, input_frame, n_fad_r, n_fad_g, m_fad_g, n_fad_cnt;
-#endif
     float data_f[CPE_CHANNELS][L_FRAME48k];
     float mem_prev[STEREO_DMX_EVS_FAD_LEN_MAX], data_mem[STEREO_DMX_EVS_DATA_LEN_MAX];
     float dmx_poc_data[L_FRAME48k], dmx_pha_data[L_FRAME48k], subframe_energy[STEREO_DMX_EVS_NB_SBFRM];
@@ -1887,11 +1602,7 @@ void stereo_dmx_evs_enc(
         else
         {
             hPHA->n_fad_g = input_frame - hPHA->n_fad_g - 1;
-#ifdef NONBE_FIX_947_STEREO_DMX_FADOPT
             hPHA->n_fad_cnt = 0;
-#else
-            hPHA->n_fad_cnt = is_transient ? 0 : n_fad_r - hPHA->n_fad_cnt;
-#endif
         }
     }
     else if ( is_transient )
@@ -1908,7 +1619,6 @@ void stereo_dmx_evs_enc(
         n_fad_cnt = hPHA->n_fad_cnt;
         m_fad_g = input_frame - n_fad_g - 1;
 
-#ifdef NONBE_FIX_947_STEREO_DMX_FADOPT
         if ( n_fad_r == 1 )
         {
             n_fad_cnt = 0;
@@ -1960,20 +1670,6 @@ void stereo_dmx_evs_enc(
                 }
             }
         }
-#else
-        for ( n = 0; n < fad_len; n++ )
-        {
-            p_dmx_data[n] *= fad_g[n_fad_g];
-            p_dmx_data[n] += fad_g[m_fad_g] * p_dmx_data_fo[n];
-
-            if ( ++n_fad_cnt == n_fad_r )
-            {
-                n_fad_cnt = 0;
-                n_fad_g++;
-                m_fad_g--;
-            }
-        }
-#endif
 
         hPHA->n_fad_g = n_fad_g;
         hPHA->n_fad_cnt = n_fad_cnt;
@@ -1981,247 +1677,6 @@ void stereo_dmx_evs_enc(
 
     mvr2s( p_dmx_data, data, n_samples );
 
-#else
-
-    int16_t n;
-    float dmx_weight, corr;
-    float data_f[CPE_CHANNELS][L_FRAME48k];
-
-    int16_t k, m, pha_len, fad_len;
-    float mem_prev[STEREO_DMX_EVS_FAD_LEN_MAX], data_mem[STEREO_DMX_EVS_DATA_LEN_MAX];
-    float *p_data_mem, *p_prev_taps, *p_curr_taps, *fad_g, *p_data;
-    float dmx_poc_data[L_FRAME48k], dmx_pha_data[L_FRAME48k], *p_dmx_data, ftmp;
-    STEREO_DMX_EVS_PRC curr_prc;
-    int16_t input_subframe, is_transient;
-    float *p_sub_frame, subframe_energy[STEREO_DMX_EVS_NB_SBFRM];
-
-    int16_t input_frame;
-
-    if ( is_binaural )
-    {
-        /* use of is_binaural flag is to be considered */
-    }
-
-    input_frame = (int16_t) ( input_Fs / FRAMES_PER_SEC );
-
-    for ( n = 0; n < input_frame; n++ )
-    {
-        data_f[0][n] = (float) data[2 * n];
-        data_f[1][n] = (float) data[2 * n + 1];
-    }
-    if ( n_samples < input_frame )
-    {
-        set_f( data_f[0] + n_samples, 0.0f, input_frame - n_samples );
-        set_f( data_f[1] + n_samples, 0.0f, input_frame - n_samples );
-    }
-
-
-    input_subframe = n_samples / STEREO_DMX_EVS_NB_SBFRM;
-    is_transient = 0;
-    for ( k = 0; k < CPE_CHANNELS; k++ )
-    {
-        ftmp = 0;
-        for ( m = 0; m < STEREO_DMX_EVS_NB_SBFRM; m++ )
-        {
-            p_sub_frame = &( data_f[k][m * input_subframe] );
-            subframe_energy[m] = 0;
-            for ( n = 0; n < input_subframe; n++ )
-            {
-                subframe_energy[m] += p_sub_frame[n] * p_sub_frame[n];
-            }
-
-            if ( subframe_energy[m] / ( hStereoDmxEVS->hPHA->trns_aux_energy[k] + EPSILON ) > hStereoDmxEVS->hPHA->crst_fctr )
-            {
-                is_transient = 1;
-            }
-
-            if ( hStereoDmxEVS->hPHA->init_frmCntr == 0 )
-            {
-                hStereoDmxEVS->hPHA->trns_aux_energy[k] = STEREO_DMX_EVS_TRNS_EGY_FORGETTING * hStereoDmxEVS->hPHA->trns_aux_energy[k] + ( 1.0f - STEREO_DMX_EVS_TRNS_EGY_FORGETTING ) * subframe_energy[m];
-            }
-            else
-            {
-                hStereoDmxEVS->hPHA->trns_aux_energy[k] = 0.5f * hStereoDmxEVS->hPHA->trns_aux_energy[k] + 0.5f * subframe_energy[m];
-            }
-
-            ftmp += subframe_energy[m];
-        }
-
-        for ( m = 1; m < STEREO_DMX_EVS_NB_SBFRM; m++ )
-        {
-            if ( subframe_energy[m] / ( subframe_energy[m - 1] + EPSILON ) > STEREO_DMX_EVS_TRNS_DTC_INST )
-            {
-                is_transient = 1;
-            }
-        }
-    }
-
-    estimate_itd( &corr, hStereoDmxEVS->hPOC, hStereoDmxEVS->hPHA, data_f[0], data_f[1], &hStereoDmxEVS->itd, input_frame );
-
-    /* poc */
-
-    if ( hStereoDmxEVS->itd )
-    {
-        dmx_weight = ( ( hStereoDmxEVS->itd > 0 ) ? ( -1 ) : 1 ) * 0.5f * corr + 0.5f;
-    }
-    else
-    {
-        dmx_weight = 0.5f;
-    }
-
-    create_M_signal( data_f[0], data_f[1], dmx_poc_data, dmx_weight, input_frame, hStereoDmxEVS->s_wnd,
-                     hStereoDmxEVS->dmx_weight, hStereoDmxEVS->pre_dmx_energy, hStereoDmxEVS->aux_dmx_energy );
-
-    /* pha */
-
-    pha_len = hStereoDmxEVS->hPHA->pha_len;
-    fad_len = hStereoDmxEVS->hPHA->fad_len;
-    fad_g = hStereoDmxEVS->hPHA->fad_g;
-
-    set_zero( dmx_pha_data, n_samples );
-    set_zero( mem_prev, fad_len );
-
-    for ( k = 0; k < CPE_CHANNELS; k++ )
-    {
-        p_data = data_f[k];
-        mvr2r( hStereoDmxEVS->hPHA->data_mem[k], data_mem, pha_len );
-        mvr2r( &( p_data[n_samples - pha_len] ), hStereoDmxEVS->hPHA->data_mem[k], pha_len );
-        p_data_mem = &( data_mem[pha_len] );
-        mvr2r( p_data, p_data_mem, n_samples );
-
-        p_prev_taps = hStereoDmxEVS->hPHA->p_prev_taps[k];
-        if ( p_prev_taps )
-        {
-            for ( n = 0; n < fad_len; n++ )
-            {
-                for ( ftmp = 0, m = 0; m < pha_len; m++ )
-                {
-                    ftmp += p_data_mem[n - m] * p_prev_taps[m];
-                }
-                mem_prev[n] += ftmp * INV_SQRT_2;
-            }
-        }
-        else
-        {
-            for ( n = 0; n < fad_len; n++ )
-            {
-                mem_prev[n] += p_data[n] * INV_SQRT_2;
-            }
-        }
-
-        p_curr_taps = hStereoDmxEVS->hPHA->p_curr_taps[k];
-        if ( p_curr_taps )
-        {
-            for ( n = 0; n < n_samples; n++ )
-            {
-                for ( ftmp = 0, m = 0; m < pha_len; m++ )
-                {
-                    ftmp += p_data_mem[n - m] * p_curr_taps[m];
-                }
-                dmx_pha_data[n] += ftmp * INV_SQRT_2;
-            }
-        }
-        else
-        {
-            for ( n = 0; n < n_samples; n++ )
-            {
-                dmx_pha_data[n] += p_data[n] * INV_SQRT_2;
-            }
-        }
-    }
-
-    for ( n = 0, m = ( fad_len - 1 ); n < fad_len; n++, m-- )
-    {
-        dmx_pha_data[n] *= fad_g[n];
-        dmx_pha_data[n] += ( mem_prev[n] ) * fad_g[m];
-    }
-
-    /* prc switch */
-
-    curr_prc = hStereoDmxEVS->hPHA->curr_prc;
-    if ( abs( (int16_t) hStereoDmxEVS->itd ) > hStereoDmxEVS->hPHA->prc_thres )
-    {
-        if ( hStereoDmxEVS->hPHA->curr_prc != STEREO_DMX_EVS_PRC_POC )
-        {
-            if ( hStereoDmxEVS->hPHA->prev_prc == STEREO_DMX_EVS_PRC_POC )
-            {
-                hStereoDmxEVS->hPHA->prc_hys_cnt += 1;
-            }
-            else
-            {
-                hStereoDmxEVS->hPHA->prc_hys_cnt = 0;
-            }
-
-            if ( hStereoDmxEVS->hPHA->prc_hys_cnt >= STEREO_DMX_EVS_SWTCH_PRC_HYS_THRES )
-            {
-                hStereoDmxEVS->hPHA->curr_prc = STEREO_DMX_EVS_PRC_POC;
-            }
-        }
-        hStereoDmxEVS->hPHA->prev_prc = STEREO_DMX_EVS_PRC_POC;
-    }
-    else
-    {
-        if ( hStereoDmxEVS->hPHA->curr_prc != STEREO_DMX_EVS_PRC_PHA )
-        {
-            if ( hStereoDmxEVS->hPHA->prev_prc == STEREO_DMX_EVS_PRC_PHA )
-            {
-                hStereoDmxEVS->hPHA->prc_hys_cnt += 1;
-            }
-            else
-            {
-                hStereoDmxEVS->hPHA->prc_hys_cnt = 0;
-            }
-
-            if ( hStereoDmxEVS->hPHA->prc_hys_cnt >= STEREO_DMX_EVS_SWTCH_PRC_HYS_THRES )
-            {
-                hStereoDmxEVS->hPHA->curr_prc = STEREO_DMX_EVS_PRC_PHA;
-            }
-        }
-        hStereoDmxEVS->hPHA->prev_prc = STEREO_DMX_EVS_PRC_PHA;
-    }
-
-    if ( ( is_transient == 1 ) || ( hStereoDmxEVS->aux_dmx_energy[0] > STEREO_DMX_EVS_ILDS_EGY * hStereoDmxEVS->aux_dmx_energy[1] ) || ( hStereoDmxEVS->aux_dmx_energy[1] > STEREO_DMX_EVS_ILDS_EGY * hStereoDmxEVS->aux_dmx_energy[0] ) || ( ( hStereoDmxEVS->hPHA->p_curr_taps[0] == NULL ) && ( hStereoDmxEVS->hPHA->p_curr_taps[1] == NULL ) ) )
-    {
-        hStereoDmxEVS->hPHA->curr_prc = STEREO_DMX_EVS_PRC_POC;
-        hStereoDmxEVS->hPHA->prc_hys_cnt = 0;
-    }
-
-    if ( hStereoDmxEVS->hPHA->curr_prc == STEREO_DMX_EVS_PRC_POC )
-    {
-        p_dmx_data = dmx_poc_data;
-
-        if ( curr_prc != hStereoDmxEVS->hPHA->curr_prc )
-        {
-            fad_len = hStereoDmxEVS->hPHA->fad_len_prc;
-            fad_g = hStereoDmxEVS->hPHA->fad_g_prc;
-
-            for ( n = 0, m = ( fad_len - 1 ); n < fad_len; n++, m-- )
-            {
-                p_dmx_data[n] *= fad_g[n];
-                p_dmx_data[n] += fad_g[m] * dmx_pha_data[n];
-            }
-        }
-    }
-    else
-    {
-        p_dmx_data = dmx_pha_data;
-
-        if ( curr_prc != hStereoDmxEVS->hPHA->curr_prc )
-        {
-            fad_len = hStereoDmxEVS->hPHA->fad_len_prc;
-            fad_g = hStereoDmxEVS->hPHA->fad_g_prc;
-
-            for ( n = 0, m = ( fad_len - 1 ); n < fad_len; n++, m-- )
-            {
-                p_dmx_data[n] *= fad_g[n];
-                p_dmx_data[n] += fad_g[m] * dmx_poc_data[n];
-            }
-        }
-    }
-
-    mvr2s( p_dmx_data, data, n_samples );
-
-#endif
 
     return;
 }
@@ -2242,11 +1697,7 @@ ivas_error stereo_dmx_evs_init_encoder(
     int16_t n, input_frame;
 
     int16_t m, len, pha_len, fad_len, fad_len2, trans_len, itrh, rfft_ipd_coef_step, n0, input_frame_pha;
-#ifdef NONBE_FIX_947_STEREO_DMX_EVS_PHA
     float *win, *fad_g, fad_r, tmp_r, a_step, *ipd_ff;
-#else
-    float *win, *fad_g, fad_r, tmp_r, a_min, a_max, a_step, *ipd_ff;
-#endif
     const float *p_ipd_w;
 
     input_frame = (int16_t) ( input_Fs / FRAMES_PER_SEC );
@@ -2291,11 +1742,7 @@ ivas_error stereo_dmx_evs_init_encoder(
         return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for STEREO_DMX_EVS_POC_DATA\n" ) );
     }
 
-#ifdef BE_FIX_567_DOUBLE_STEREO_DMX
     hStereoDmxEVS->hPOC->shift_limit = NS2SA( input_Fs, STEREO_DMX_EVS_SHIFT_LIMIT );
-#else
-    hStereoDmxEVS->hPOC->shift_limit = (int16_t) ( STEREO_DMX_EVS_SHIFT_LIMIT * input_Fs / 1000 );
-#endif
 
     for ( n = 0; n < CPE_CHANNELS; n++ )
     {
@@ -2364,9 +1811,7 @@ ivas_error stereo_dmx_evs_init_encoder(
         hStereoDmxEVS->hPHA->fad_len = STEREO_DMX_EVS_FAD_LEN_16;
         hStereoDmxEVS->hPHA->prc_thres = STEREO_DMX_EVS_SWTCH_PRC_THRES_16;
         hStereoDmxEVS->hPHA->crst_fctr = STEREO_DMX_EVS_CRST_FCTR_16;
-#ifdef NONBE_FIX_947_STEREO_DMX_EVS_PHA
         hStereoDmxEVS->hPHA->low_egy_thres_sgc = STEREO_DMX_EVS_SGC_LEGY_THRES_16;
-#endif
     }
     else if ( input_Fs == 32000 )
     {
@@ -2374,9 +1819,7 @@ ivas_error stereo_dmx_evs_init_encoder(
         hStereoDmxEVS->hPHA->fad_len = STEREO_DMX_EVS_FAD_LEN_32;
         hStereoDmxEVS->hPHA->prc_thres = STEREO_DMX_EVS_SWTCH_PRC_THRES_32;
         hStereoDmxEVS->hPHA->crst_fctr = STEREO_DMX_EVS_CRST_FCTR_32;
-#ifdef NONBE_FIX_947_STEREO_DMX_EVS_PHA
         hStereoDmxEVS->hPHA->low_egy_thres_sgc = STEREO_DMX_EVS_SGC_LEGY_THRES_32;
-#endif
     }
     else if ( input_Fs == 48000 )
     {
@@ -2384,9 +1827,7 @@ ivas_error stereo_dmx_evs_init_encoder(
         hStereoDmxEVS->hPHA->fad_len = STEREO_DMX_EVS_FAD_LEN_48;
         hStereoDmxEVS->hPHA->prc_thres = STEREO_DMX_EVS_SWTCH_PRC_THRES_48;
         hStereoDmxEVS->hPHA->crst_fctr = STEREO_DMX_EVS_CRST_FCTR_48;
-#ifdef NONBE_FIX_947_STEREO_DMX_EVS_PHA
         hStereoDmxEVS->hPHA->low_egy_thres_sgc = STEREO_DMX_EVS_SGC_LEGY_THRES_48;
-#endif
     }
     else
     {
@@ -2394,9 +1835,6 @@ ivas_error stereo_dmx_evs_init_encoder(
     }
 
     hStereoDmxEVS->hPHA->pha_len = len / 2;
-#ifndef NONBE_FIX_947_STEREO_DMX_EVS_PHA
-    hStereoDmxEVS->hPHA->init_frmCntr = (int16_t) ( FRAMES_PER_SEC * 0.2f );
-#endif
     hStereoDmxEVS->hPHA->isd_rate_s = 0.0f;
     hStereoDmxEVS->hPHA->iccr_s = 0.0f;
 
@@ -2404,21 +1842,13 @@ ivas_error stereo_dmx_evs_init_encoder(
     fad_len = hStereoDmxEVS->hPHA->fad_len;
 
     trans_len = (int16_t) ( (float) pha_len / 20.0f );
-#ifdef NONBE_FIX_947_STEREO_DMX_EVS_PHA
     set_f( hStereoDmxEVS->hPHA->win, STEREO_DMX_EVS_PHA_WND_C, pha_len - trans_len );
-#else
-    set_f( hStereoDmxEVS->hPHA->win, 1.8f, pha_len - trans_len );
-#endif
     hStereoDmxEVS->hPHA->win[0] = 1.0f;
     tmp_r = 1.0f / ( ( trans_len * 2 ) + 1 );
     win = &( hStereoDmxEVS->hPHA->win[pha_len - trans_len] );
     for ( n = 0; n < trans_len; n++ )
     {
-#ifdef NONBE_FIX_947_STEREO_DMX_EVS_PHA
         win[n] = ( 0.5f * ( 1.0f + cosf( ( PI2 * ( n + 1 ) ) * tmp_r ) ) ) * STEREO_DMX_EVS_PHA_WND_C;
-#else
-        win[n] = ( 0.5f * ( 1.0f + cosf( ( PI2 * ( n + 1 ) ) * tmp_r ) ) ) * 1.8f;
-#endif
     }
 
     fad_g = hStereoDmxEVS->hPHA->fad_g;
@@ -2434,7 +1864,6 @@ ivas_error stereo_dmx_evs_init_encoder(
     hStereoDmxEVS->hPHA->prev_pha = STEREO_DMX_EVS_PHA_IPD;
     hStereoDmxEVS->hPHA->pha_hys_cnt = 0;
 
-#ifdef NONBE_FIX_947_STEREO_DMX_EVS_PHA
 
     hStereoDmxEVS->hPHA->pha_ipd_chan_cnt = 0;
     hStereoDmxEVS->hPHA->pha_ipd_chan_thresh = 10;
@@ -2465,29 +1894,6 @@ ivas_error stereo_dmx_evs_init_encoder(
     {
         ipd_ff[n] = STEREO_DMX_EVS_IFF_AMIN;
     }
-#else
-
-    /* Compute the forgetting factor */
-    a_min = 0.8576958985908941f;
-    a_max = 0.9440608762859234f;
-    itrh = (int16_t) ( ( 3000 * input_frame ) / ( input_Fs * STEREO_DMX_EVS_SUBBAND_SIZE ) ); /* 3kHz */
-    n0 = L_FRAME16k / ( 2 * STEREO_DMX_EVS_SUBBAND_SIZE );
-    a_step = ( a_min - a_max ) / ( n0 + 1 - itrh );
-    ipd_ff = hStereoDmxEVS->hPHA->ipd_ff;
-    for ( n = 0; n < itrh; n++ )
-    {
-        ipd_ff[n] = a_max;
-    }
-    for ( ; n < ( n0 + 1 ); n++ ) /* 8kHz */
-    {
-        ipd_ff[n] = a_max + ( n - itrh ) * a_step;
-    }
-    for ( ; n < STEREO_DMX_EVS_NB_SUBBAND_MAX; n++ )
-    {
-        ipd_ff[n] = a_min;
-    }
-
-#endif
     set_f( hStereoDmxEVS->hPHA->Pr, 1.0, STEREO_DMX_EVS_NB_SUBBAND_MAX );
     set_zero( hStereoDmxEVS->hPHA->Pi, STEREO_DMX_EVS_NB_SUBBAND_MAX );
 
@@ -2527,12 +1933,7 @@ ivas_error stereo_dmx_evs_init_encoder(
     hStereoDmxEVS->hPHA->prev_prc = STEREO_DMX_EVS_PRC_POC;
     hStereoDmxEVS->hPHA->prc_hys_cnt = 0;
 
-#ifndef NONBE_FIX_947_STEREO_DMX_EVS_PHA
-    hStereoDmxEVS->hPHA->fad_len_prc = (int16_t) ( STEREO_DMX_EVS_FADE_LEN_PRC * (float) input_Fs / 1000.0f );
-    fad_len = hStereoDmxEVS->hPHA->fad_len_prc;
-#else
     fad_len = input_frame;
-#endif
 
     fad_g = hStereoDmxEVS->hPHA->fad_g_prc;
     fad_r = 1.0f / (float) ( fad_len + 1 );
@@ -2548,7 +1949,6 @@ ivas_error stereo_dmx_evs_init_encoder(
         hStereoDmxEVS->hPHA->trns_aux_energy[n] = 0.0f;
     }
 
-#ifdef NONBE_FIX_947_STEREO_DMX_EVS_PHA
 
     hStereoDmxEVS->hPHA->n_fad_g = input_frame;
     hStereoDmxEVS->hPHA->n_fad_cnt = 0;
@@ -2561,7 +1961,6 @@ ivas_error stereo_dmx_evs_init_encoder(
     hStereoDmxEVS->hPHA->dmx_pha_ener = 0.0f;
     hStereoDmxEVS->hPHA->dmx_poc_ener = 0.0f;
 
-#endif
 
     *hStereoDmxEVS_out = hStereoDmxEVS;
 
diff --git a/lib_rend/ivas_dirac_dec_binaural_functions.c b/lib_rend/ivas_dirac_dec_binaural_functions.c
index e0a4dc95492a89b0bb500db07a6b8812707cad16..7df39793286acfa8bc5f462a32438b176b083776 100644
--- a/lib_rend/ivas_dirac_dec_binaural_functions.c
+++ b/lib_rend/ivas_dirac_dec_binaural_functions.c
@@ -2138,11 +2138,7 @@ static void ivas_dirac_dec_binaural_determine_processing_matrices(
 
             if ( ivas_format == MASA_ISM_FORMAT )
             {
-#ifdef NONBE_FIX_982_OMASA_DELAY_COMP_5MS
                 gainFactor = OMASA_TDREND_MATCHING_GAIN * sqrtf( hDiracDecBin->earlyPartEneCorrection[bin] );
-#else
-                gainFactor = 0.7943f * sqrtf( hDiracDecBin->earlyPartEneCorrection[bin] );
-#endif
             }
             else
             {