diff --git a/lib_com/ivas_cnst.h b/lib_com/ivas_cnst.h
index dd01994e4cd474d53201844236e79b92d380bc94..8ebe56c1853a0c0977fc652faef66a4f2842b6f2 100755
--- a/lib_com/ivas_cnst.h
+++ b/lib_com/ivas_cnst.h
@@ -1197,10 +1197,8 @@ enum
 #define MASA_RATIO_TOLERANCE                    0.1f
 #define MASA_RATIO_THRESHOLD                    0.015f
 #define MASA_ANGLE_TOLERANCE                    0.5f
-#ifdef  NON_BE_FIX_1048_THRESHOLD_COH_BASOP
 #define MASA_SUR_COH_THRESHOLD                  1e-7f
 #define MASA_SUR_COH_PRECISION                  1e7f
-#endif
 #define MASA_LIMIT_NO_BANDS_SUR_COH             8
 #define MINIMUM_BIT_BUDGET_NORMAL_META          100
 #define DIFF_DFRATIO_2BIT_LIMIT_IDX_HODIRAC     4
diff --git a/lib_com/mslvq_com.c b/lib_com/mslvq_com.c
index 282741fb0feddf97fc8252554e0309d9856e2a2f..e6c01dcfebfd90a29b0d54627d74e679fed9833c 100644
--- a/lib_com/mslvq_com.c
+++ b/lib_com/mslvq_com.c
@@ -828,11 +828,7 @@ void deindex_lvq_SHB(
 
         /* find idx_leader */
         i = 1;
-#ifdef NONBE_FIX_1054_NEGATIVE_LVQ_INDEX
         while ( index > table_no_cv[i] )
-#else
-        while ( index >= table_no_cv[i] )
-#endif
         {
             i++;
         }
diff --git a/lib_com/nelp.c b/lib_com/nelp.c
index b21740f5ca0a8a833b6ab1680f2f41cca5bfa707..bbe521a916676d0ff3a06020e693e90cdce32b45 100644
--- a/lib_com/nelp.c
+++ b/lib_com/nelp.c
@@ -121,11 +121,7 @@ void generate_nelp_excitation(
 
         for ( j = 0; j < len; j++ )
         {
-#ifdef FIX_970_USAN_IN_NELP_SEED
             tmp[j] = ( ( *seed ) = (int16_t) ( 521 * ( *seed ) + 259 ) ) / PCM16_TO_FLT_FAC;
-#else
-            tmp[j] = ( ( *seed ) = 521 * ( *seed ) + 259 ) / PCM16_TO_FLT_FAC;
-#endif
             tmp1[j] = ABSVAL( tmp[j] );
             I[j] = j;
         }
diff --git a/lib_com/options.h b/lib_com/options.h
index fe344ed7ab329b2dba6bb910b4b715278970c995..a390324e60ff266f449ec131a31d2c28556fe460 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -156,26 +156,15 @@
 /*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */
 /*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */
 
-#define FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI      /* FhG: move setting of pointers for parameter decoding so they are skipped in lost frames when they are not needed */
-#define FIX_970_USAN_IN_NELP_SEED
-#define FIX_1044_ISM_REND_MEMORY                        /* VA: issue 1044: Lower the memory of the ISM renderer handle. */
 #define FIX_1060_USAN_ARRAY_BOUNDS                      /* FhG: issue 1060: USAN array-bounds errors */
 
+
 /* #################### End BE switches ################################## */
 
 /* #################### Start NON-BE switches ############################ */
 /* any switch which is non-be wrt selection floating point code */
 /* all switches in this category should start with "NONBE_" */
 
-#define NON_BE_FIX_1041_USE_OLD_CNG_LSPS_IF_NONSTAB     /* FhG: fix bug in TD MDCT-Stereo concealment */
-#define NONBE_FIX_1075                                  /* FhG: fix segfault for bitrate switching + BINAURAL_ROOM_REVERB output in MC */
-#define NON_BE_FIX_EVS_USAN_ERR_IN_WAVEADJUST           /* FhG: address issue 1037 */
-#define NON_BE_1055_RESET_LP_MEMORIES                   /* VA: issue 1055: Correctly reset LP filter MA and AR memories in bitrate switching */
-#define NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM   /* FhG: issue 1058: do not initialize EFAP when IntSetup is HOA3 */
-#define NONBE_FIX_1056_ISM_RATE_SWITCH                  /* FhG: Fix #1056: fix TC buffer udpate on a ISM rate switch */	
-#define NON_BE_FIX_1048_THRESHOLD_COH_BASOP             /* Nokia: Fix 1048 replace comparison with 0 with comparison to threshold, to align with BASOP*/
-#define NONBE_FIX_1054_NEGATIVE_LVQ_INDEX               /* Nokia: issue 1054: Input to decode_comb in deindex_lvq_SHB should be positive */
-#define NONBE_FIX_1063_DIV_BY_ZERO_SUMNRG               /* VoiceAge: issue 1063: division by zero for angle_rot feature in the UNCLR classifier */
 #define NONBE_FIX_1045_ISM_BITRATE_SWITCHING            /* Eri: Difference between ROM/File HRTF in ISM bitrate switching */
 
 /* ##################### End NON-BE switches ########################### */
diff --git a/lib_dec/dec_LPD.c b/lib_dec/dec_LPD.c
index 331e93c3f9f28c1e28c9ae85378258907f98e099..a652f3724fc4d44e814ef6a2b749d85c19b06ebf 100644
--- a/lib_dec/dec_LPD.c
+++ b/lib_dec/dec_LPD.c
@@ -604,20 +604,12 @@ void decoder_LPD(
 
         for ( k = 0; k < 2; k++ )
         {
-#ifndef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI
-            /* Set pointer to parameters */
-            prm = param + ( k * DEC_NPRM_DIV );
-
-            /* Stability Factor */
-#endif
             if ( !bfi )
             {
-#ifdef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI
                 /* Set pointer to parameters */
                 prm = param + ( k * DEC_NPRM_DIV );
 
                 /* Stability Factor */
-#endif
                 st->stab_fac = lsf_stab( &lsf[( k + 1 ) * M], &lsf[k * M], 0, st->L_frame );
             }
 
diff --git a/lib_dec/dec_tcx.c b/lib_dec/dec_tcx.c
index 906baf35959db1ecd718257cce84f85ed8ad0f31..d8f4b17881bd51dd9358e876e4f656a442da0f09 100644
--- a/lib_dec/dec_tcx.c
+++ b/lib_dec/dec_tcx.c
@@ -93,9 +93,7 @@ void decoder_tcx(
     tmp_concealment_method = 0;
     nf_seed = 0;
     fUseTns = 0; /* flag that is set if TNS data is present */
-#ifdef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI
     prm_sqQ = NULL;
-#endif
 
     set_f( xn_buf, 0, L_MDCT_OVLP_MAX + L_FRAME_PLUS + L_MDCT_OVLP_MAX );
 
@@ -733,15 +731,12 @@ void decoder_tcx_invQ(
     TCX_CONFIG_HANDLE hTcxCfg = st->hTcxCfg;
 
     tnsSize = 0;
-#ifndef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI
-    prm_target = NULL; /* just to suppress MSVC warnigs */
-#else
+
     /* just to suppress MSVC warnigs */
     prm_target = NULL;
     prm_ltp = NULL;
     prm_tns = NULL;
     prm_sqQ = NULL;
-#endif
 
     /*-----------------------------------------------------------------*
      * Initializations
@@ -761,11 +756,6 @@ void decoder_tcx_invQ(
         noiseFillingSize = st->hIGFDec->infoIGFStartLine;
     }
 
-#ifndef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI
-    prm_ltp = &prm[1 + NOISE_FILL_RANGES];
-    prm_tns = prm_ltp + LTPSIZE;
-#endif
-
     /*-----------------------------------------------------------*
      * Read TCX parameters                                       *
      *-----------------------------------------------------------*/
@@ -775,10 +765,8 @@ void decoder_tcx_invQ(
     if ( !bfi )
     {
         index = prm[0];
-#ifdef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI
         prm_ltp = &prm[1 + NOISE_FILL_RANGES];
         prm_tns = prm_ltp + LTPSIZE;
-#endif
 
         /* read noise level (fac_ns) */
         st->hTcxDec->noise_filling_index[frame_cnt] = prm[1];
@@ -794,23 +782,16 @@ void decoder_tcx_invQ(
         *fUseTns = 0;
     }
 
-#ifndef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI
-    prm_hm = prm_tns + tnsSize;
-    prm_sqQ = prm_hm + NPRM_CTX_HM;
-    *prm_sqQ1 = prm_sqQ;
-#endif
-
     /*-----------------------------------------------------------*
      * Spectrum data                                             *
      *-----------------------------------------------------------*/
 
     if ( !bfi )
     {
-#ifdef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI
         prm_hm = prm_tns + tnsSize;
         prm_sqQ = prm_hm + NPRM_CTX_HM;
         *prm_sqQ1 = prm_sqQ;
-#endif
+
         /*-----------------------------------------------------------*
          * Context HM                                                *
          *-----------------------------------------------------------*/
diff --git a/lib_dec/er_dec_tcx.c b/lib_dec/er_dec_tcx.c
index d7ece99b1deadc244a43d68a96a0cdb058daf768..4d658aa111480332117c7fe8610f1d6815f40970 100644
--- a/lib_dec/er_dec_tcx.c
+++ b/lib_dec/er_dec_tcx.c
@@ -567,11 +567,7 @@ void con_tcx(
 
             alpha_inv = 1.0f - alpha_delayed;
 
-#ifdef NON_BE_FIX_1041_USE_OLD_CNG_LSPS_IF_NONSTAB
             a2lsp_stab( A_local, lsp_local, st->lspold_cng );
-#else
-            a2lsp_stab( A_local, lsp_local, lsp_local );
-#endif
 
             for ( i = 0; i < M; i++ )
             {
diff --git a/lib_dec/ivas_binRenderer_internal.c b/lib_dec/ivas_binRenderer_internal.c
index 59c15f6a04d8abb60faeb847a4321591438d9b6f..0b005615dda02cda6fb6c684da6a1d40590e220b 100644
--- a/lib_dec/ivas_binRenderer_internal.c
+++ b/lib_dec/ivas_binRenderer_internal.c
@@ -1261,9 +1261,7 @@ ivas_error ivas_binRenderer_open(
         }
 
         /* initialize the dmx matrix */
-#ifdef NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM
         if ( hBinRenderer->nInChannels != HOA3_CHANNELS )
-#endif
         {
             for ( chIdx = 0; chIdx < BINAURAL_CHANNELS; chIdx++ )
             {
@@ -1280,17 +1278,10 @@ ivas_error ivas_binRenderer_open(
     }
 
     hBinRenderer->hEFAPdata = NULL;
-#ifdef NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM
+
     if ( hBinRenderer->hReverb != NULL && hBinRenderer->nInChannels != HOA3_CHANNELS )
-#else
-    if ( hBinRenderer->hReverb != NULL )
-#endif
     {
-#ifdef NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM
         if ( hBinRenderer->hInputSetup->is_loudspeaker_setup == 0 )
-#else
-        if ( hBinRenderer->hInputSetup->is_loudspeaker_setup == 0 && hBinRenderer->nInChannels != HOA3_CHANNELS )
-#endif
         {
             for ( k = 0; k < 11; k++ )
             {
diff --git a/lib_dec/ivas_init_dec.c b/lib_dec/ivas_init_dec.c
index 4fb2f78a2e860cb24aea9416d84aefc3a6ac9d5d..ba543f5fd5b14a613568f3b69d33be34d93a785f 100644
--- a/lib_dec/ivas_init_dec.c
+++ b/lib_dec/ivas_init_dec.c
@@ -2086,7 +2086,7 @@ ivas_error ivas_init_decoder(
             {
                 return error;
             }
-#ifdef NONBE_FIX_1075
+
             if ( st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
             {
                 if ( ( error = ivas_reverb_open( &st_ivas->hReverb, st_ivas->hHrtfStatistics, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )
@@ -2094,7 +2094,6 @@ ivas_error ivas_init_decoder(
                     return error;
                 }
             }
-#endif
 
             /* Allocate 'hIsmRendererData' handle and memory for delay buffer within 'hMasaIsmData' */
             if ( ( error = ivas_omasa_separate_object_renderer_open( st_ivas ) ) != IVAS_ERR_OK )
@@ -2164,7 +2163,7 @@ ivas_error ivas_init_decoder(
             {
                 return error;
             }
-#ifdef NONBE_FIX_1075
+
             if ( st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
             {
                 if ( ( error = ivas_reverb_open( &st_ivas->hReverb, st_ivas->hHrtfStatistics, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )
@@ -2172,7 +2171,6 @@ ivas_error ivas_init_decoder(
                     return error;
                 }
             }
-#endif
         }
     }
 
diff --git a/lib_dec/ivas_ism_dec.c b/lib_dec/ivas_ism_dec.c
index 92fe91e15184901a98addd84856408e2210e984c..ef13d2463db77908b7b861b266ccc3e96dd50ffd 100644
--- a/lib_dec/ivas_ism_dec.c
+++ b/lib_dec/ivas_ism_dec.c
@@ -130,12 +130,8 @@ static ivas_error ivas_ism_bitrate_switching_dec(
 
     {
         /* transfer subframe info from DirAC or ParamMC to central tc buffer */
-#ifdef NONBE_FIX_1056_ISM_RATE_SWITCH
         /* only do this if we are not having done everything already in the TC decoding part and having only played out from the TC buffer */
         if ( last_ism_mode == ISM_MODE_PARAM && st_ivas->hSpatParamRendCom != NULL && st_ivas->hTcBuffer->tc_buffer_mode != TC_BUFFER_MODE_BUFFER )
-#else
-        if ( last_ism_mode == ISM_MODE_PARAM && st_ivas->hSpatParamRendCom != NULL && ( st_ivas->renderer_type != RENDERER_MONO_DOWNMIX && st_ivas->renderer_type != RENDERER_DISABLE ) )
-#endif
         {
             st_ivas->hTcBuffer->nb_subframes = st_ivas->hSpatParamRendCom->nb_subframes;
             st_ivas->hTcBuffer->subframes_rendered = st_ivas->hSpatParamRendCom->subframes_rendered;
diff --git a/lib_dec/ivas_mct_dec.c b/lib_dec/ivas_mct_dec.c
index 61f00bb85128c6ca1491a69a1dee8b181dc40cdd..368f6e76b73251af322a48132a5a3ed6dca9ad0f 100644
--- a/lib_dec/ivas_mct_dec.c
+++ b/lib_dec/ivas_mct_dec.c
@@ -1251,7 +1251,7 @@ static ivas_error ivas_mc_dec_reconfig(
                 {
                     return error;
                 }
-#ifdef NONBE_FIX_1075
+
                 if ( st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
                 {
                     if ( ( error = ivas_reverb_open( &st_ivas->hReverb, st_ivas->hHrtfStatistics, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )
@@ -1259,7 +1259,6 @@ static ivas_error ivas_mc_dec_reconfig(
                         return error;
                     }
                 }
-#endif
 
                 if ( st_ivas->hIntSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
                 {
diff --git a/lib_dec/ivas_omasa_dec.c b/lib_dec/ivas_omasa_dec.c
index 5f6b7e694514e1ebc3f591549ab3836bd4d09df5..9b2e4293c6e077a47ec434c0f128c4ac64a248ad 100644
--- a/lib_dec/ivas_omasa_dec.c
+++ b/lib_dec/ivas_omasa_dec.c
@@ -384,7 +384,7 @@ ivas_error ivas_omasa_dec_config(
                     {
                         return error;
                     }
-#ifdef NONBE_FIX_1075
+
                     if ( st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
                     {
                         if ( ( error = ivas_reverb_open( &st_ivas->hReverb, st_ivas->hHrtfStatistics, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )
@@ -392,8 +392,8 @@ ivas_error ivas_omasa_dec_config(
                             return error;
                         }
                     }
-#endif
                 }
+
                 /* Allocate 'hIsmRendererData' handle and memory for delay buffer within 'hMasaIsmData' */
                 if ( ( error = ivas_omasa_separate_object_renderer_open( st_ivas ) ) != IVAS_ERR_OK )
                 {
diff --git a/lib_dec/ivas_qmetadata_dec.c b/lib_dec/ivas_qmetadata_dec.c
index e28615dd457d3d7bf9fe84961876cbecfd66c00f..bc895de45c81d75db7b121615465823731503f5b 100644
--- a/lib_dec/ivas_qmetadata_dec.c
+++ b/lib_dec/ivas_qmetadata_dec.c
@@ -4070,9 +4070,7 @@ static int16_t read_surround_coherence_hr(
     IVAS_QDIRECTION *q_direction;
     int16_t min_index;
     int16_t d, idx;
-#ifdef NON_BE_FIX_1048_THRESHOLD_COH_BASOP
     int32_t int_error_ratio_surr;
-#endif
 
     coding_subbands = hQMetaData->q_direction[0].cfg.nbands;
     q_direction = hQMetaData->q_direction;
@@ -4096,10 +4094,10 @@ static int16_t read_surround_coherence_hr(
             {
                 error_ratio_surr = 1.0f - q_direction[0].band_data[j].energy_ratio[sf];
             }
-#ifdef NON_BE_FIX_1048_THRESHOLD_COH_BASOP
+
             int_error_ratio_surr = (int32_t) ( MASA_SUR_COH_PRECISION * error_ratio_surr );
             error_ratio_surr = (float) ( int_error_ratio_surr * MASA_SUR_COH_THRESHOLD );
-#endif
+
             if ( error_ratio_surr <= 0 )
             {
                 error_ratio_surr = 0;
diff --git a/lib_dec/ivas_sba_dec.c b/lib_dec/ivas_sba_dec.c
index 3161d6920da013cf21b173e271cbd5e2a37b7c8c..1b676b2a1ba4e09426ee207a308d2da3b16150c5 100644
--- a/lib_dec/ivas_sba_dec.c
+++ b/lib_dec/ivas_sba_dec.c
@@ -503,7 +503,7 @@ ivas_error ivas_sba_dec_reconfigure(
                         return error;
                     }
                 }
-#ifdef NONBE_FIX_1075
+
                 if ( st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
                 {
                     if ( ( error = ivas_reverb_open( &st_ivas->hReverb, st_ivas->hHrtfStatistics, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )
@@ -511,7 +511,6 @@ ivas_error ivas_sba_dec_reconfigure(
                         return error;
                     }
                 }
-#endif
             }
 
             /* Allocate memory for OSBA delay buffer */
diff --git a/lib_dec/ivas_stat_dec.h b/lib_dec/ivas_stat_dec.h
index c2deed15faede8221afa740aed7b41b56194b233..ac0a802257c6ac251b83cb5310aecb17069d9942 100644
--- a/lib_dec/ivas_stat_dec.h
+++ b/lib_dec/ivas_stat_dec.h
@@ -804,18 +804,10 @@ typedef struct ivas_lfe_dec_data_structure
 
 typedef struct renderer_struct
 {
-#ifdef FIX_1044_ISM_REND_MEMORY
     float prev_gains[MAX_NUM_OBJECTS][MAX_OUTPUT_CHANNELS];
-#else
-    float prev_gains[MAX_CICP_CHANNELS - 1][MAX_OUTPUT_CHANNELS];
-#endif
     float *interpolator;
     int16_t interpolator_length;
-#ifdef FIX_1044_ISM_REND_MEMORY
     float gains[MAX_NUM_OBJECTS][MAX_OUTPUT_CHANNELS];
-#else
-    float gains[MAX_CICP_CHANNELS - 1][MAX_OUTPUT_CHANNELS];
-#endif
 
 } ISM_RENDERER_DATA, *ISM_RENDERER_HANDLE;
 
diff --git a/lib_dec/updt_dec.c b/lib_dec/updt_dec.c
index 17f19e112518a96fb5af57586a165084abbd6780..391e609b3584c105aa8ce4c1d221ff5d604d809e 100644
--- a/lib_dec/updt_dec.c
+++ b/lib_dec/updt_dec.c
@@ -521,11 +521,7 @@ void updt_dec_common(
         st->stab_fac_smooth_lt = ENV_SMOOTH_FAC * st->stab_fac + ( 1.0f - ENV_SMOOTH_FAC ) * st->stab_fac_smooth_lt;
     }
 
-#ifdef NON_BE_1055_RESET_LP_MEMORIES
     if ( ( st->core_brate <= SID_2k40 && st->cng_type == FD_CNG ) || ( st->tcxonly && ( st->codec_mode == MODE2 || st->element_mode > EVS_MONO ) ) )
-#else
-    if ( ( st->core_brate <= SID_2k40 && st->cng_type == FD_CNG ) || ( st->tcxonly && st->codec_mode == MODE2 ) )
-#endif
     {
         /* reset LP memories */
         set_zero( st->mem_MA, M );
diff --git a/lib_dec/waveadjust_fec_dec.c b/lib_dec/waveadjust_fec_dec.c
index d5cf31cef8dfe1b28cb94a906563293d668c7df3..6d979c8fabc33e673986a81579caf244458fc94e 100644
--- a/lib_dec/waveadjust_fec_dec.c
+++ b/lib_dec/waveadjust_fec_dec.c
@@ -742,13 +742,9 @@ void concealment_decode(
             /* sign randomization */
             for ( i = 0; i < hPlcInfo->L_frameTCX; i++ )
             {
-#ifdef NON_BE_FIX_EVS_USAN_ERR_IN_WAVEADJUST
                 int16_t rnd;
                 rnd = own_random( seed );
                 sign = ( rnd >= 0 ) - ( rnd < 0 );
-#else
-                sign = ( ( own_random( seed ) >> 15 ) << 1 ) + 1;
-#endif
                 invkoef[i] *= sign;
             }
         }
diff --git a/lib_enc/core_enc_updt.c b/lib_enc/core_enc_updt.c
index a04f22fc59d3e25ba0d11a7de7da3f1c5f7de8e9..32903f55ba320d67e4021b12b8010090cbad86dc 100644
--- a/lib_enc/core_enc_updt.c
+++ b/lib_enc/core_enc_updt.c
@@ -92,11 +92,7 @@ void core_encode_update(
         }
     }
 
-#ifdef NON_BE_1055_RESET_LP_MEMORIES
     if ( ( st->Opt_DTX_ON && st->core_brate <= SID_2k40 && st->cng_type == FD_CNG ) || ( st->tcxonly && ( st->codec_mode == MODE2 || st->element_mode > EVS_MONO ) ) )
-#else
-    if ( ( st->Opt_DTX_ON && st->core_brate <= SID_2k40 && st->cng_type == FD_CNG ) || ( st->tcxonly && st->codec_mode == MODE2 ) )
-#endif
     {
         /* reset LP memories */
         set_zero( st->mem_MA, M );
diff --git a/lib_enc/ivas_qmetadata_enc.c b/lib_enc/ivas_qmetadata_enc.c
index 9b8b2b7223ea38b7a5953d26122d71f48056d65b..a875f14771f5cf4f91bcaa9483b7aaa592f416fc 100644
--- a/lib_enc/ivas_qmetadata_enc.c
+++ b/lib_enc/ivas_qmetadata_enc.c
@@ -4926,9 +4926,8 @@ static int16_t encode_surround_coherence_hr(
     int16_t max_val = 0, nbits_max;
     int16_t no_cv_shift[MASA_MAXIMUM_CODING_SUBBANDS], min_idx;
     int16_t idx16;
-#ifdef NON_BE_FIX_1048_THRESHOLD_COH_BASOP
     int32_t int_error_ratio_surr;
-#endif
+
     coding_subbands = hQMetaData->q_direction[0].cfg.nbands;
     all_coherence_zero = hQMetaData->all_coherence_zero;
     q_direction = &( hQMetaData->q_direction[0] );
@@ -4957,10 +4956,10 @@ static int16_t encode_surround_coherence_hr(
                 {
                     error_ratio_surr = 1.0f - q_direction[0].band_data[j].energy_ratio[sf];
                 }
-#ifdef NON_BE_FIX_1048_THRESHOLD_COH_BASOP
+
                 int_error_ratio_surr = (int32_t) ( MASA_SUR_COH_PRECISION * error_ratio_surr );
                 error_ratio_surr = (float) ( int_error_ratio_surr * MASA_SUR_COH_THRESHOLD );
-#endif
+
                 if ( error_ratio_surr <= 0 )
                 {
                     error_ratio_surr = 0;
diff --git a/lib_enc/ivas_stereo_dft_enc_itd.c b/lib_enc/ivas_stereo_dft_enc_itd.c
index 166db84c6610e36dd6302aff99a83af921799e9a..b54fd07a1aa833f69909f02db840e28d6ba865ea 100755
--- a/lib_enc/ivas_stereo_dft_enc_itd.c
+++ b/lib_enc/ivas_stereo_dft_enc_itd.c
@@ -641,9 +641,7 @@ void stereo_dft_enc_compute_itd(
     const float *dft_trigo32k;
     float trigo_enc[STEREO_DFT_N_32k_ENC / 2 + 1];
     float cng_xcorr_filt;
-#ifdef NONBE_FIX_1063_DIV_BY_ZERO_SUMNRG
     float sum_nrg_delta;
-#endif
     int16_t prev_itd_max;
     int16_t itd_max_flip;
 
@@ -729,9 +727,6 @@ void stereo_dft_enc_compute_itd(
         grand_dot_prod_img += xcorr[2 * i + 1];
         xcorr_abs[i] = sqrtf( xcorr[2 * i] * xcorr[2 * i] + xcorr[2 * i + 1] * xcorr[2 * i + 1] );
 
-#ifndef NONBE_FIX_1063_DIV_BY_ZERO_SUMNRG
-        /* VM: prod_LL tends to overflow, better to replace with sum(log(prod_L)) and retrain the classifier */
-#endif
         prod_LL = prod_L;
         prod_RR = prod_R;
 
@@ -788,7 +783,6 @@ void stereo_dft_enc_compute_itd(
         hStereoClassif->unclr_fv[E_gainIPD] = g_IPD;
         hStereoClassif->xtalk_fv[E_gainIPD] = g_IPD;
 
-#ifdef NONBE_FIX_1063_DIV_BY_ZERO_SUMNRG
         if ( sum_nrg_L >= sum_nrg_R )
         {
             sum_nrg_delta = max( sum_nrg_L - sum_nrg_R, 1.0f );
@@ -798,9 +792,6 @@ void stereo_dft_enc_compute_itd(
             sum_nrg_delta = min( sum_nrg_L - sum_nrg_R, -1.0f );
         }
         angle_rot = fabsf( atanf( 2.0f * ( grand_dot_prod_real ) / sum_nrg_delta ) );
-#else
-        angle_rot = fabsf( atanf( 2.0f * ( grand_dot_prod_real ) / ( sum_nrg_L - sum_nrg_R + 1.0f ) ) );
-#endif
         hStereoClassif->unclr_fv[E_angle_rot] = angle_rot;
         hStereoClassif->xtalk_fv[E_angle_rot] = angle_rot;