diff --git a/lib_com/ivas_prot.h b/lib_com/ivas_prot.h
index 779b328d979deb5caa6f25277f0786b5f3ffe410..4ae6913962561edacc17b10100f581ce2070ecc0 100755
--- a/lib_com/ivas_prot.h
+++ b/lib_com/ivas_prot.h
@@ -3039,11 +3039,7 @@ void mctStereoIGF_enc(
     MCT_ENC_HANDLE hMCT,                                        /* i/o: MCT encoder structure                   */
     Encoder_State **sts,                                        /* i/o: encoder state structure                 */
     float *orig_spectrum[MCT_MAX_CHANNELS][NB_DIV],             /* i  : MDCT spectrum for ITF                   */
-#ifdef NONBE_FIX_1097_SBA_DTX_BRATE_SWITCHING_ENC 
     float *powerSpec[MCT_MAX_CHANNELS],                         /* i/o: MDCT^2 + MDST^2 spectrum,or estimate    */
-#else
-    float powerSpec[MCT_MAX_CHANNELS][L_FRAME48k],              /* i/o: MDCT^2 + MDST^2 spectrum,or estimate    */
-#endif
     float *powerSpecMsInv[MCT_MAX_CHANNELS][NB_DIV],            /* i  : same as above but for inverse spect.    */
     float *inv_spectrum[MCT_MAX_CHANNELS][NB_DIV],              /* i  : inverse spectrum                        */
     const int16_t sp_aud_decision0[MCT_MAX_CHANNELS]            /* i  : speech audio decision                   */
diff --git a/lib_com/ivas_stereo_td_bit_alloc.c b/lib_com/ivas_stereo_td_bit_alloc.c
index 07bdfb73a8bc0ad506554b79e8d020befc97db17..049d400d48cf078fef8caef96b9039189303260c 100644
--- a/lib_com/ivas_stereo_td_bit_alloc.c
+++ b/lib_com/ivas_stereo_td_bit_alloc.c
@@ -457,18 +457,13 @@ void td_stereo_param_updt(
     {
         mvr2r( IAWB_Ave, tdm_lsfQ_PCh, M );
 
-#ifdef FIX_1111_TDM_LSP_BUFFER
         if ( tdm_lspQ_PCh != NULL )
         {
             lsf2lsp( tdm_lsfQ_PCh, tdm_lspQ_PCh, M, INT_FS_12k8 );
         }
-#else
-        lsf2lsp( tdm_lsfQ_PCh, tdm_lspQ_PCh, M, INT_FS_12k8 );
-#endif
     }
     else if ( flag_ACELP16k == 1 )
     {
-#ifdef FIX_1111_TDM_LSP_BUFFER
         if ( tdm_lspQ_PCh != NULL )
         {
             mvr2r( lsp_old_PCh, tdm_lspQ_PCh, M );
@@ -482,22 +477,13 @@ void td_stereo_param_updt(
             lsp_convert_poly( lsp_temp, L_FRAME, 0 );
             lsp2lsf( lsp_temp, tdm_lsfQ_PCh, M, INT_FS_12k8 );
         }
-#else
-        mvr2r( lsp_old_PCh, tdm_lspQ_PCh, M );
-        lsp_convert_poly( tdm_lspQ_PCh, L_FRAME, 0 );
-        lsp2lsf( tdm_lspQ_PCh, tdm_lsfQ_PCh, M, INT_FS_12k8 );
-#endif
     }
     else
     {
-#ifdef FIX_1111_TDM_LSP_BUFFER
         if ( tdm_lspQ_PCh != NULL )
         {
             mvr2r( lsp_old_PCh, tdm_lspQ_PCh, M );
         }
-#else
-        mvr2r( lsp_old_PCh, tdm_lspQ_PCh, M );
-#endif
         mvr2r( lsf_old_PCh, tdm_lsfQ_PCh, M );
     }
 
diff --git a/lib_com/options.h b/lib_com/options.h
index 4d8e7d5f743612b2af110bd44a27a7852093308f..cf9518a4434b97dac4c6df8fc2b58ad03e804d9a 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -158,11 +158,8 @@
 //#define FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT          /* Orange issue 1031 : new fix point hrtf binary file format */
 //#define FIX_CREND_SIMPLIFY_CODE                         /* Ora : simplify line code in crend */
 #define FLOAT_FIX_POINT_HRTF_FILE_FORMAT                /* allows reading floation or fix point hrtf binary file format */
-#define FIX_1115_FASTCONV_HRTF_FILE_LOAD                /* FhG: issue 1115: fix crash when loading FastConv-only binary HRTF file */
 
 
-#define FIX_1099_JBM_MD_HANDLE_ALLOC                    /* VA: issue 1099: Limit the allocation of `hJbmMetadata` handle to MASA and OMASA only */
-#define FIX_1111_TDM_LSP_BUFFER                         /* VA: issue 1111: remove unused buffer `tdm_lspQ_PCh[]' */
 #define FIX_1101_CLEANING_JBM_CALL                      /* VA: issue 1101: remove obsolete call of ivas_jbm_dec_tc_buffer_open() */
 #define FIX_1053_AEID_FILE_TEST                         /* Philips: Tests for the -aeid file and fix for memory error */
 
@@ -172,9 +169,6 @@
 /* any switch which is non-be wrt selection floating point code */
 /* all switches in this category should start with "NONBE_" */
 
-#define NONBE_FIX_1070_USAN_SEGFAULT_MC_TO_BIN_BTSW_HEADROT   /* fix 1070 USAN: nullptr-with-offset and Segfaults in 7_1_4 to BINAURAL and BINAURAL_ROOM_REVERB decoding with bitrate switching and head rotation*/
-#define REVERT_ZERO_FLUSH_TRESH                               /* FhG: issue 1069: revert threshold value introduced with !1518 due to significant complexity increase*/ 
-#define NONBE_FIX_1097_SBA_DTX_BRATE_SWITCHING_ENC            /* FhG: fix out-of-bound errors when switching from SID frame to active frame*/
 #define NONBE_FIX_1110_STEREO_DTX_BRATE_SWITCHING             /* VA: issue 1110: fix encoder crash in the stereo DTX bitrate switching condition */
 #define NONBE_1131_ACELP_OOB                                  /* VA: issue 1131: fix division-by-zero in acelp gain decoding caused by wrong length of buffer update when switching from HQ core to ACELP core */
 
diff --git a/lib_dec/ivas_binRenderer_internal.c b/lib_dec/ivas_binRenderer_internal.c
index fbf8c916a0425139b6a2889dd48972d8ab799696..7bbc09825f6799ec1eb7245dfc1705a67cb9a6d5 100644
--- a/lib_dec/ivas_binRenderer_internal.c
+++ b/lib_dec/ivas_binRenderer_internal.c
@@ -618,15 +618,7 @@ ivas_error ivas_allocate_binaural_hrtf(
 
     if ( renderer_type == RENDERER_BINAURAL_FASTCONV || bin_input_config == BINAURAL_INPUT_AUDIO_CONFIG_COMBINED )
     {
-#ifndef FIX_1115_FASTCONV_HRTF_FILE_LOAD
-        if ( ( HrtfFastConv->leftHRIRReal != NULL ) && ( HrtfFastConv->leftHRIRImag != NULL ) && ( HrtfFastConv->rightHRIRReal != NULL ) && ( HrtfFastConv->rightHRIRImag != NULL ) )
-        {
-            return IVAS_ERR_OK;
-        }
-        else
-#else
         if ( ( HrtfFastConv->leftHRIRReal == NULL ) && ( HrtfFastConv->leftHRIRImag == NULL ) && ( HrtfFastConv->rightHRIRReal == NULL ) && ( HrtfFastConv->rightHRIRImag == NULL ) )
-#endif
         {
 
             if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->leftHRIRReal, BINAURAL_CONVBANDS, HRTF_LS_CHANNELS, BINAURAL_NTAPS, allocate_init_flag ) )
@@ -650,15 +642,7 @@ ivas_error ivas_allocate_binaural_hrtf(
 
     if ( renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM || bin_input_config == BINAURAL_INPUT_AUDIO_CONFIG_COMBINED )
     {
-#ifndef FIX_1115_FASTCONV_HRTF_FILE_LOAD
-        if ( ( HrtfFastConv->leftBRIRReal != NULL ) && ( HrtfFastConv->leftBRIRImag != NULL ) && ( HrtfFastConv->rightBRIRReal != NULL ) && ( HrtfFastConv->rightBRIRImag != NULL ) )
-        {
-            return IVAS_ERR_OK;
-        }
-        else
-#else
         if ( ( HrtfFastConv->leftBRIRReal == NULL ) && ( HrtfFastConv->leftBRIRImag == NULL ) && ( HrtfFastConv->rightBRIRReal == NULL ) && ( HrtfFastConv->rightBRIRImag == NULL ) )
-#endif
         {
             if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->leftBRIRReal, BINAURAL_CONVBANDS, HRTF_LS_CHANNELS, BINAURAL_NTAPS_MAX, allocate_init_flag ) )
             {
diff --git a/lib_dec/ivas_init_dec.c b/lib_dec/ivas_init_dec.c
index 92859dc9669a204ab5a0671270efc1f179709e25..66d677a65a45370ba645d3e068f82de70e6cc874 100644
--- a/lib_dec/ivas_init_dec.c
+++ b/lib_dec/ivas_init_dec.c
@@ -2074,11 +2074,7 @@ ivas_error ivas_init_decoder(
     }
 
 #endif
-#ifdef FIX_1099_JBM_MD_HANDLE_ALLOC
     if ( ( st_ivas->ivas_format == MASA_FORMAT || st_ivas->ivas_format == MASA_ISM_FORMAT ) && st_ivas->hDecoderConfig->Opt_tsm )
-#else
-    if ( st_ivas->hJbmMetadata == NULL && st_ivas->hDecoderConfig->Opt_tsm )
-#endif
     {
         if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL )
         {
diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec.c
index 60fbb9bcdc97f1c492452869e027d9d9c372f3f9..da386ac0bbf01529c340d10688faec1438635500 100644
--- a/lib_dec/ivas_jbm_dec.c
+++ b/lib_dec/ivas_jbm_dec.c
@@ -1615,7 +1615,6 @@ ivas_error ivas_jbm_dec_flush_renderer(
         {
             if ( mc_mode_old == MC_MODE_MCT )
             {
-#ifdef NONBE_FIX_1070_USAN_SEGFAULT_MC_TO_BIN_BTSW_HEADROT
                 int16_t crendInPlaceRotation = FALSE;
 
                 if ( st_ivas->transport_config != intern_config_old && ( intern_config_old == IVAS_AUDIO_CONFIG_FOA || intern_config_old == IVAS_AUDIO_CONFIG_HOA2 || intern_config_old == IVAS_AUDIO_CONFIG_HOA3 ) )
@@ -1626,16 +1625,10 @@ ivas_error ivas_jbm_dec_flush_renderer(
                         ivas_mc2sba( st_ivas->hTransSetup, hTcBuffer->tc, p_output, hTcBuffer->n_samples_granularity, hIntSetupOld->ambisonics_order, GAIN_LFE );
                     }
                 }
-#endif
                 if ( renderer_type_old == RENDERER_BINAURAL_MIXER_CONV || renderer_type_old == RENDERER_BINAURAL_MIXER_CONV_ROOM )
                 {
-#ifdef NONBE_FIX_1070_USAN_SEGFAULT_MC_TO_BIN_BTSW_HEADROT
                     if ( ( error = ivas_rend_crendProcessSubframe( st_ivas->hCrendWrapper, intern_config_old, st_ivas->hOutSetup.output_config, st_ivas->hDecoderConfig, st_ivas->hCombinedOrientationData,
                                                                    hIntSetupOld, st_ivas->hEFAPdata, st_ivas->hTcBuffer, crendInPlaceRotation ? p_output : st_ivas->hTcBuffer->tc, p_output, hTcBuffer->n_samples_granularity, st_ivas->hDecoderConfig->output_Fs, 0 ) ) != IVAS_ERR_OK )
-#else
-                    if ( ( error = ivas_rend_crendProcessSubframe( st_ivas->hCrendWrapper, intern_config_old, st_ivas->hOutSetup.output_config, st_ivas->hDecoderConfig, st_ivas->hCombinedOrientationData,
-                                                                   hIntSetupOld, st_ivas->hEFAPdata, st_ivas->hTcBuffer, hTcBuffer->tc, p_output, hTcBuffer->n_samples_granularity, st_ivas->hDecoderConfig->output_Fs, 0 ) ) != IVAS_ERR_OK )
-#endif
                     {
                         return error;
                     }
diff --git a/lib_dec/ivas_svd_dec.c b/lib_dec/ivas_svd_dec.c
index 5c84af950b601e679f4727531e88ca82e0029f8a..cf5ad377093650ccaf058390dbac27068f44ff50 100644
--- a/lib_dec/ivas_svd_dec.c
+++ b/lib_dec/ivas_svd_dec.c
@@ -48,14 +48,10 @@
  *-----------------------------------------------------------------------*/
 
 /* The SVD is sensitive to changes to the following constants, so please be careful when trying to tune things   */
-#define SVD_MINIMUM_VALUE     1e-32f   /* minimum value                                                   */
-#define CONVERGENCE_FACTOR    1.0e-04f /* factor for SVD convergence                                      */
-#define SVD_MAX_NUM_ITERATION 75       /* maximum number of interations before exiting the SVD            */
-#ifdef REVERT_ZERO_FLUSH_TRESH
+#define SVD_MINIMUM_VALUE        1e-32f   /* minimum value                                                   */
+#define CONVERGENCE_FACTOR       1.0e-04f /* factor for SVD convergence                                      */
+#define SVD_MAX_NUM_ITERATION    75       /* maximum number of interations before exiting the SVD            */
 #define SVD_ZERO_FLUSH_THRESHOLD 1.0e-20f
-#else
-#define SVD_ZERO_FLUSH_THRESHOLD 0.0f
-#endif
 
 
 /*-----------------------------------------------------------------------*
diff --git a/lib_enc/ivas_core_enc.c b/lib_enc/ivas_core_enc.c
index e8a3267687b2bee8825c8d791ac1f199862c441c..5dcfeb081496de3a4d8b9aa6b0beb7de566d14ac 100644
--- a/lib_enc/ivas_core_enc.c
+++ b/lib_enc/ivas_core_enc.c
@@ -99,11 +99,7 @@ ivas_error ivas_core_enc(
     int16_t Voicing_flag[CPE_CHANNELS];
     float pitch_buf[CPE_CHANNELS][NB_SUBFR16k];
     int16_t unbits[CPE_CHANNELS];
-#ifdef FIX_1111_TDM_LSP_BUFFER
     float tdm_lsfQ_PCh[M];
-#else
-    float tdm_lspQ_PCh[M], tdm_lsfQ_PCh[M];
-#endif
     int16_t last_element_mode, tdm_Pitch_reuse_flag;
     int32_t element_brate, last_element_brate, input_Fs;
     int16_t diff_nBits;
@@ -274,11 +270,7 @@ ivas_error ivas_core_enc(
 
         if ( st->element_mode == IVAS_CPE_TD && n == 0 )
         {
-#ifdef FIX_1111_TDM_LSP_BUFFER
             td_stereo_param_updt( st->lsp_old, st->lsf_old, pitch_buf[0], NULL, tdm_lsfQ_PCh, hStereoTD->tdm_Pri_pitch_buf, st->flag_ACELP16k, hStereoTD->tdm_use_IAWB_Ave_lpc );
-#else
-            td_stereo_param_updt( st->lsp_old, st->lsf_old, pitch_buf[0], tdm_lspQ_PCh, tdm_lsfQ_PCh, hStereoTD->tdm_Pri_pitch_buf, st->flag_ACELP16k, hStereoTD->tdm_use_IAWB_Ave_lpc );
-#endif
         }
     }
 
diff --git a/lib_enc/ivas_mct_core_enc.c b/lib_enc/ivas_mct_core_enc.c
index 0cd304696add7d59d0ba45e68c83b213dfcbf54f..214da9fff729111a50552912a8fc06c081d0c2d7 100644
--- a/lib_enc/ivas_mct_core_enc.c
+++ b/lib_enc/ivas_mct_core_enc.c
@@ -197,27 +197,17 @@ void ivas_mct_core_enc(
     int16_t i, cpe_id, n, nAvailBits;
     int16_t nCPE;
     float *orig_spectrum[MCT_MAX_CHANNELS][2]; /* Pointers to MDCT output for a short block (L/R) */
-#ifdef NONBE_FIX_1097_SBA_DTX_BRATE_SWITCHING_ENC
     float powerSpecMsInv_long_cpe0[CPE_CHANNELS][L_FRAME_PLUS];
     float inv_spectrum_long_cpe0[CPE_CHANNELS][L_FRAME_PLUS];
     float powerSpec_long_cpe0[CPE_CHANNELS][L_FRAME_PLUS];
     float powerSpec_long[MCT_MAX_CHANNELS - CPE_CHANNELS][L_FRAME48k];
     float inv_spectrum_long[MCT_MAX_CHANNELS - CPE_CHANNELS][L_FRAME48k];   /* quantized MDCT spectrum, inv ms mask mdst spectrum, scratch for MS spectra in the MS decision */
     float powerSpecMsInv_long[MCT_MAX_CHANNELS - CPE_CHANNELS][L_FRAME48k]; /* MS inv power spectrum, also inverse MDST spectrum */
-#else
-    float powerSpec[MCT_MAX_CHANNELS][L_FRAME48k];
-    float powerSpecMsInv_long[MCT_MAX_CHANNELS][L_FRAME48k]; /* MS inv power spectrum, also inverse MDST spectrum */
-#endif
-#ifdef NONBE_FIX_1097_SBA_DTX_BRATE_SWITCHING_ENC
     float *powerSpec[MCT_MAX_CHANNELS];
-#endif
     float *powerSpecMsInv[MCT_MAX_CHANNELS][2];
     float *inv_mdst_spectrum[MCT_MAX_CHANNELS][2];
     float *inv_spectrum[MCT_MAX_CHANNELS][2];
     float *mdst_spectrum[MCT_MAX_CHANNELS][2];
-#ifndef NONBE_FIX_1097_SBA_DTX_BRATE_SWITCHING_ENC
-    float inv_spectrum_long[MCT_MAX_CHANNELS][L_FRAME48k]; /* quantized MDCT spectrum, inv ms mask mdst spectrum, scratch for MS spectra in the MS decision */
-#endif
     int16_t total_side_bits;
     int16_t chBitRatios[MCT_MAX_CHANNELS];
     Encoder_State *sts[MCT_MAX_CHANNELS];
@@ -252,7 +242,6 @@ void ivas_mct_core_enc(
         nCPE++;
     }
 
-#ifdef NONBE_FIX_1097_SBA_DTX_BRATE_SWITCHING_ENC
     /* point first CPE channels to longer buffers where switching from ACELP to TCX may occur in SBA with DTX (total memory saving)*/
     for ( ch = 0; ch < CPE_CHANNELS; ch++ )
     {
@@ -264,17 +253,12 @@ void ivas_mct_core_enc(
     }
 
     for ( ch = CPE_CHANNELS; ch < nChannels; ch++ )
-#else
-    for ( ch = 0; ch < nChannels; ch++ )
-#endif
     {
         inv_mdst_spectrum[ch][0] = powerSpecMsInv[ch][0] = powerSpecMsInv_long[ch - CPE_CHANNELS];
         inv_mdst_spectrum[ch][1] = powerSpecMsInv[ch][1] = powerSpecMsInv_long[ch - CPE_CHANNELS] + N_TCX10_MAX;
         inv_spectrum[ch][0] = inv_spectrum_long[ch - CPE_CHANNELS];
         inv_spectrum[ch][1] = inv_spectrum_long[ch - CPE_CHANNELS] + N_TCX10_MAX;
-#ifdef NONBE_FIX_1097_SBA_DTX_BRATE_SWITCHING_ENC
         powerSpec[ch] = powerSpec_long[ch - CPE_CHANNELS];
-#endif
     }
 
     for ( cpe_id = 0, i = 0; cpe_id < nCPE; cpe_id++ )
diff --git a/lib_enc/ivas_mct_enc_mct.c b/lib_enc/ivas_mct_enc_mct.c
index e8c98e9a726ad3be7af10f522e3e23b2a2f3c651..69a9668db021193b83321a4b19a25016bda651d4 100644
--- a/lib_enc/ivas_mct_enc_mct.c
+++ b/lib_enc/ivas_mct_enc_mct.c
@@ -814,14 +814,10 @@ void write_mct_bitstream(
  *--------------------------------------------------------------------*/
 
 void mctStereoIGF_enc(
-    MCT_ENC_HANDLE hMCT,                       /* i/o: MCT encoder structure               */
-    Encoder_State **sts,                       /* i/o: encoder state structure             */
-    float *orig_spectrum[MCT_MAX_CHANNELS][2], /* i  : MDCT spectrum for ITF               */
-#ifdef NONBE_FIX_1097_SBA_DTX_BRATE_SWITCHING_ENC
-    float *powerSpec[MCT_MAX_CHANNELS], /* i/o: MDCT^2 + MDST^2 spectrum,or estimate*/
-#else
-    float powerSpec[MCT_MAX_CHANNELS][L_FRAME48k], /* i/o: MDCT^2 + MDST^2 spectrum,or estimate*/
-#endif
+    MCT_ENC_HANDLE hMCT,                             /* i/o: MCT encoder structure               */
+    Encoder_State **sts,                             /* i/o: encoder state structure             */
+    float *orig_spectrum[MCT_MAX_CHANNELS][2],       /* i  : MDCT spectrum for ITF               */
+    float *powerSpec[MCT_MAX_CHANNELS],              /* i/o: MDCT^2 + MDST^2 spectrum,or estimate*/
     float *powerSpecMsInv[MCT_MAX_CHANNELS][NB_DIV], /* i  : same as above but for inverse spect.*/
     float *inv_spectrum[MCT_MAX_CHANNELS][NB_DIV],   /* i  : inverse spectrum                    */
     const int16_t sp_aud_decision0[MCT_MAX_CHANNELS] /* i  : speech audio decision               */