diff --git a/lib_com/ivas_prot.h b/lib_com/ivas_prot.h
index 0902af55301ed2963861d8bc94d602a795667af1..62d3f730bc5b225f5e2f1bab6bac7b5c3f359c34 100755
--- a/lib_com/ivas_prot.h
+++ b/lib_com/ivas_prot.h
@@ -3497,13 +3497,6 @@ ivas_error ivas_cldfb_dec_reconfig(
     const int16_t numCldfbSyntheses_old                         /* i  : number of CLDFB synthesis instances in previous frame */
 );
 
-#ifndef FIX_993_REMOVE_SBA_GET_ORDER
-/*! r: Ambisonic (SBA) order */
-int16_t ivas_sba_get_order(
-    const int16_t nb_channels,                                  /* i  : Number of ambisonic channels            */
-    const int16_t sba_planar                                    /* i  : SBA planar flag                         */
-);
-#endif
 /*! r: Ambisonic (SBA) order used for analysis and coding */
 int16_t ivas_sba_get_analysis_order(
     const int32_t ivas_total_brate,                             /* i  : IVAS total bitrate                      */
diff --git a/lib_com/ivas_sba_config.c b/lib_com/ivas_sba_config.c
index f7f32c6a9a67d711836cc00f8ec18b84bf2d8476..cb573d7f28580224703b477feb63cbef0a5b8c79 100644
--- a/lib_com/ivas_sba_config.c
+++ b/lib_com/ivas_sba_config.c
@@ -64,23 +64,7 @@ void ivas_sba_config(
     int16_t *element_mode          /* o  : element mode of the core coder           */
 )
 {
-#ifndef FIX_993_REMOVE_SBA_GET_ORDER
-    if ( ( sba_order < 0 ) && ( nb_channels < 0 ) )
-    {
-        assert( 0 && "Either order or number of channels must be positive" );
-    }
-    else if ( sba_order < 0 )
-    {
-        sba_order = ivas_sba_get_order( nb_channels, sba_planar );
-    }
-    else if ( nb_channels < 0 )
-    {
-        nb_channels = ivas_sba_get_nchan( sba_order, sba_planar );
-    }
-    else
-#else
     if ( nb_channels > 0 )
-#endif
     {
         if ( sba_planar )
         {
@@ -121,37 +105,6 @@ void ivas_sba_config(
     return;
 }
 
-#ifndef FIX_993_REMOVE_SBA_GET_ORDER
-/*-------------------------------------------------------------------*
- * ivas_sba_get_order()
- *
- * Get Ambisonic order from number of ambisonic channels
- *-------------------------------------------------------------------*/
-
-/*! r: Ambisonic (SBA) order */
-int16_t ivas_sba_get_order(
-    const int16_t nb_channels, /* i  : Number of ambisonic channels     */
-    const int16_t sba_planar   /* i  : SBA Planar flag                  */
-)
-{
-    int16_t sba_order;
-
-    if ( sba_planar )
-    {
-        sba_order = ( nb_channels - 1 ) / 2;
-        assert( ( 2 * sba_order + 1 == nb_channels ) && "Number of channels not supported in Planar SBA!" );
-    }
-    else
-    {
-        sba_order = (int16_t) sqrtf( (float) nb_channels ) - 1;
-        assert( ( ( sba_order + 1 ) * ( sba_order + 1 ) == nb_channels ) && "Number of channels not supported in SBA!" );
-    }
-
-    assert( ( sba_order <= 3 ) && "Error: SBA order must be <= 3!" );
-
-    return ( sba_order );
-}
-#endif
 
 /*-------------------------------------------------------------------*
  * ivas_sba_get_analysis_order()
diff --git a/lib_com/options.h b/lib_com/options.h
index 6e9f3d7710b7e2b0f06a5a7622e2ba97f5bd9260..52357d6c25210c34323435d170e21d6ace5d3190 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -156,10 +156,6 @@
 /*#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_1020_AEID_SELECTION_ERRORS                  /* Philips: issue #1020: fix for acoustic environment ID selection errors */
-#define FIX_993_REMOVE_SBA_GET_ORDER                    /* VA: issue 993: remove unused function ivas_sba_get_order() */
-#define FIX_1002_DEC_PHASE_ECU_USAN_OF_PHASE            /* Eri: issue #1002, usan-value-out-of-range-for-int16, kept BE for PLC-conditions   */
-#define FIX_960_SYN_OUTPUT                              /* VA: issue 960: unused function syn_output() is removed */
 #define FIX_1027_GSC_INT_OVERFLOW                       /* VA: issue 2207: overflow in GSC */
 
 /* #################### End BE switches ################################## */
@@ -168,9 +164,6 @@
 /* any switch which is non-be wrt selection floating point code */
 /* all switches in this category should start with "NONBE_" */
 
-#define NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING       /* FhG: issue 987: solution b: downmix HOA3 to stereo a input for the reverberator */
-#define NONBE_FIX_1006_PAST_DMX_NRG_ERROR                     /* Eri/FhG: Issue 1006: Bug fix in ivas_stereo_dft_dec not replicated in ivas_stereo_dft_dec_dmx */
-#define NONBE_FIX_1010_STEREO_CNG_DIV_BY_ZERO                 /* Eri: Issue 1010: Division by zero in Stereo CNG */
 
 /* ##################### End NON-BE switches ########################### */
 
diff --git a/lib_com/prot.h b/lib_com/prot.h
index c9d07b8831608e4888665177f02ef9e1c277fb82..1e08bbfec1a493099b8b17963340d0cf893bb429 100644
--- a/lib_com/prot.h
+++ b/lib_com/prot.h
@@ -4824,14 +4824,6 @@ void dec_acelp_4t64(
     const int16_t Opt_AMR_WB /* i  : flag indicating AMR-WB IO mode                  */
 );
 
-#ifndef FIX_960_SYN_OUTPUT
-uint32_t syn_output(
-    float *synth,               /* i/o: float synthesis signal                          */
-    const int16_t output_frame, /* i  : output frame length                             */
-    int16_t *synth_out          /* o  : integer 16 bits synthesis signal                */
-);
-
-#endif
 void FEC_exc_estim(
     Decoder_State *st,     /* i/o: Decoder static memory                           */
     const int16_t L_frame, /* i  : length of the frame                             */
diff --git a/lib_dec/FEC_HQ_phase_ecu.c b/lib_dec/FEC_HQ_phase_ecu.c
index 7deb7db6466b25d9d5878e1069c1f1b717379886..425ff21fe97a693c36a11f224bfd4b6366fc0ab3 100644
--- a/lib_dec/FEC_HQ_phase_ecu.c
+++ b/lib_dec/FEC_HQ_phase_ecu.c
@@ -1091,12 +1091,8 @@ static void subst_spec(
         }
 
         Xph = corr_phase[m];
-#ifdef FIX_1002_DEC_PHASE_ECU_USAN_OF_PHASE
         /* extract fractional phase integer index in the range [0...1023] */
         Xph_short = (int16_t) ( 0x000003ff & (int32_t) ( ( Xph * 512 ) / EVS_PI ) );
-#else
-        Xph_short = (int16_t) ( ( (int32_t) ( Xph * 512 / EVS_PI ) ) % 32768 ) & 0x03ff;
-#endif
 
 
         if ( Xph_short >= 512 )
@@ -1142,11 +1138,7 @@ static void subst_spec(
                     mag_chg_local *= 0.5f + ( 1.0f - ( 1.0f / PHASE_DITH ) * ph_dith ) * 0.5f;
                 }
 
-#ifdef FIX_1002_DEC_PHASE_ECU_USAN_OF_PHASE
                 Xph_short = (int16_t) ( ( (int32_t) ( ( Xph * 512 ) / EVS_PI ) ) & 0x000003ff );
-#else
-                Xph_short = (int16_t) ( Xph * 512 / EVS_PI ) & 0x03ff;
-#endif
 
                 if ( Xph_short >= 512 )
                 {
diff --git a/lib_dec/ivas_binRenderer_internal.c b/lib_dec/ivas_binRenderer_internal.c
index 58d24b87ae3a1a97de836c0ece99c91ab627b2fd..75a8247cc16de4c57c45915563d044f4980947a4 100644
--- a/lib_dec/ivas_binRenderer_internal.c
+++ b/lib_dec/ivas_binRenderer_internal.c
@@ -952,7 +952,6 @@ static void ivas_binaural_obtain_DMX(
             set_zero( outRealRightPtr, CLDFB_NO_CHANNELS_MAX );
             set_zero( outImagRightPtr, CLDFB_NO_CHANNELS_MAX );
 
-#ifdef NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING
             /*Ambisonics input requires different processing*/
             if ( hBinRenderer->nInChannels == 16 )
             {
@@ -975,7 +974,6 @@ static void ivas_binaural_obtain_DMX(
                 }
             }
             else
-#endif
             {
                 for ( chIdx = 0; chIdx < hBinRenderer->nInChannels; chIdx++ )
                 {
@@ -1280,11 +1278,7 @@ ivas_error ivas_binRenderer_open(
 
     if ( hBinRenderer->hReverb != NULL )
     {
-#ifdef NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING
         if ( hBinRenderer->hInputSetup->is_loudspeaker_setup == 0 && hBinRenderer->nInChannels != 16 )
-#else
-        if ( hBinRenderer->hInputSetup->is_loudspeaker_setup == 0 )
-#endif
         {
             for ( k = 0; k < 11; k++ )
             {
diff --git a/lib_dec/ivas_stereo_dft_dec.c b/lib_dec/ivas_stereo_dft_dec.c
index 3ae77707f017452a14d7ab70ac2597a7ebd6491e..6ce12cddaa1fbe1582377cb2d30f2cbcf1f57adf 100644
--- a/lib_dec/ivas_stereo_dft_dec.c
+++ b/lib_dec/ivas_stereo_dft_dec.c
@@ -2947,11 +2947,7 @@ void stereo_dft_dec_smooth_parameters(
         if ( hStereoDft->frame_sid_nodata )
         {
             /* set new xfade target if new itd received */
-#ifdef NONBE_FIX_1010_STEREO_CNG_DIV_BY_ZERO
             if ( hStereoDft->ipd_xfade_counter < STEREO_DFT_ITD_CNG_XFADE )
-#else
-            if ( hStereoDft->gipd[k + k_offset] != hStereoDft->ipd_xfade_target )
-#endif
             {
                 if ( ( hStereoDft->gipd[k + k_offset] - hStereoDft->ipd_xfade_prev ) > EVS_PI )
                 {
@@ -2997,11 +2993,7 @@ void stereo_dft_dec_smooth_parameters(
         if ( hStereoDft->frame_sid_nodata )
         {
             /* set new xfade target if new itd received */
-#ifdef NONBE_FIX_1010_STEREO_CNG_DIV_BY_ZERO
             if ( hStereoDft->itd_xfade_counter < STEREO_DFT_ITD_CNG_XFADE )
-#else
-            if ( hStereoDft->itd[k + k_offset] != hStereoDft->itd_xfade_target )
-#endif
             {
                 hStereoDft->itd_xfade_target = hStereoDft->itd[k + k_offset];
                 hStereoDft->itd_xfade_step = ( hStereoDft->itd_xfade_target - hStereoDft->itd_xfade_prev ) / ( STEREO_DFT_ITD_CNG_XFADE - hStereoDft->itd_xfade_counter );
diff --git a/lib_dec/ivas_stereo_dft_dec_dmx.c b/lib_dec/ivas_stereo_dft_dec_dmx.c
index f3f9982ec8e079cd577e9aa9017b466c53b1d883..4cc48bea4df060bea011f287b262f5bde6b21a2e 100644
--- a/lib_dec/ivas_stereo_dft_dec_dmx.c
+++ b/lib_dec/ivas_stereo_dft_dec_dmx.c
@@ -229,11 +229,7 @@ void stereo_dft_unify_dmx(
         if ( st0->bfi && !prev_bfi )
         {
             int16_t idx_k0, idx_k1;
-#ifdef NONBE_FIX_1006_PAST_DMX_NRG_ERROR
             idx_k0 = ( hStereoDft->past_DMX_pos + STEREO_DFT_PAST_MAX - 1 ) % STEREO_DFT_PAST_MAX;
-#else
-            idx_k0 = ( hStereoDft->past_DMX_pos + 1 ) % STEREO_DFT_PAST_MAX;
-#endif
             idx_k1 = ( idx_k0 + 1 ) % STEREO_DFT_PAST_MAX;
 
             /*dmx energy memory*/
diff --git a/lib_dec/syn_outp.c b/lib_dec/syn_outp.c
index 865df569f362f886566833b271d43a4778215bac..9f4e20c86fa386706e1ae31e0accda718acf92c1 100644
--- a/lib_dec/syn_outp.c
+++ b/lib_dec/syn_outp.c
@@ -45,31 +45,7 @@
 #include "wmc_auto.h"
 
 
-#ifdef FIX_960_SYN_OUTPUT
 /* Note: syn_output() is replaced by ivas_syn_output() in IVAS */
-#else
-/*-------------------------------------------------------------------*
- * syn_output()
- *
- * Output synthesis signal with compensation for saturation
- * returns number of clipped samples
- *-------------------------------------------------------------------*/
-
-/*! r: number of clipped samples */
-uint32_t syn_output(
-    float *synth,               /* i/o: float synthesis signal               */
-    const int16_t output_frame, /* i  : output frame length                  */
-    int16_t *synth_out          /* o  : integer 16 bits synthesis signal     */
-)
-{
-    /*-----------------------------------------------------------------*
-     * float to integer conversion with saturation control
-     *-----------------------------------------------------------------*/
-
-    /* integer conversion */
-    return mvr2s( synth, synth_out, output_frame );
-}
-#endif
 
 
 /*-------------------------------------------------------------------*
diff --git a/lib_util/render_config_reader.c b/lib_util/render_config_reader.c
index 8c455278c94d0b4e693fb9f04ef617fa4dcc5752..decafb0a46dbc19e5de42df5fd09436c54d9eaa9 100644
--- a/lib_util/render_config_reader.c
+++ b/lib_util/render_config_reader.c
@@ -2241,11 +2241,7 @@ ivas_error RenderConfigReader_read(
                     return IVAS_ERR_INVALID_RENDER_CONFIG;
                 }
                 idx = strtol( strtok( NULL, ":" ), NULL, 0 );
-#ifdef FIX_1020_AEID_SELECTION_ERRORS
                 pRenderConfigReader->pAE[acIdx].id = idx;
-#else
-                pRenderConfigReader->pAE->id = idx;
-#endif
 
                 aeHasFgIdx = aeHasPredelay = aeHasRt60 = aeHasDsr = FALSE;
                 aeHasERsize = aeHasERabs = FALSE;