diff --git a/lib_com/ivas_cnst.h b/lib_com/ivas_cnst.h
index 90cfa6777525d3c69f496079b8b2d1a186bff2bb..c31fa83049eba0dd5e6d233d578db23cf63b914b 100755
--- a/lib_com/ivas_cnst.h
+++ b/lib_com/ivas_cnst.h
@@ -1289,14 +1289,8 @@ typedef enum
 #define LFE_CHANNEL                             3
 
 #define MIN_LFE_NRG                             0.5f
-#ifdef ADJUST_MCT_CHANNELS_MAX   
 #define MCT_MAX_CHANNELS                        11                          /* == 7.1.4 LS channels without the LFE channel */
 #define MCT_MAX_BLOCKS                          ( ( MCT_MAX_CHANNELS + 1 ) / CPE_CHANNELS )    /* max. number of channel pairs (MCT_MAX_CHANNELS/2) within MCT*/
-#else
-#define MCT_MAX_CHANNELS                        12
-#define MCT_MAX_BLOCKS                          ( MCT_MAX_CHANNELS / CPE_CHANNELS )    /* max. number of channel pairs (MCT_MAX_CHANNELS/2) within MCT*/
-#define MAX_NUM_DATA                            max( MCT_MAX_CHANNELS, 4 )
-#endif
 
 #define NBBITS_MCT_RATIO                        4
 #define BITRATE_MCT_RATIO_RANGE                 ( 1 << NBBITS_MCT_RATIO )   /* Range of the coded bitrate distribution ratio */
diff --git a/lib_com/ivas_prot.h b/lib_com/ivas_prot.h
index 68c08c131202fdbfdceb999756500897550515a9..3e9c15a2a50d7ee476e2f95468a52af7730d5540 100755
--- a/lib_com/ivas_prot.h
+++ b/lib_com/ivas_prot.h
@@ -84,13 +84,9 @@ void ivas_write_format(
 void ivas_write_format_sid(
     const IVAS_FORMAT ivas_format,                              /* i  : IVAS format                             */
     const int16_t element_mode,                                 /* i  : element bitrate                         */
-#ifdef NONBE_FIX_1052_SBA_EXT_FIX
     BSTR_ENC_HANDLE hBstr,                                      /* i/o: encoder bitstream handle                */
     const int16_t sba_order,                                    /* i  : Ambisonic (SBA) order                   */
     const int16_t sba_planar                                    /* i  : SBA planar flag                         */
-#else
-    BSTR_ENC_HANDLE hBstr                                       /* i/o: encoder bitstream handle                */
-#endif
 );
 
 ivas_error create_sce_enc(
diff --git a/lib_com/ivas_rom_com.c b/lib_com/ivas_rom_com.c
index 2c4ab2f661fecabd683ebd5b75f04c91fa0e0160..744fdf25b0dd3104c0e4020b4d516530b43fc045 100644
--- a/lib_com/ivas_rom_com.c
+++ b/lib_com/ivas_rom_com.c
@@ -2471,13 +2471,11 @@ const uint16_t ivas_param_mc_sym_freq_ild_delta_combined_48_16bits[2 * PARAM_MC_
  * MASA ROM tables
  *----------------------------------------------------------------------------------*/
 
-#ifdef FIX_1121_MASA_DESCRIPTOR
 const uint8_t ivasmasaFormatDescriptor[8] = 
 { 
     0x49, 0x56, 0x41, 0x53, 0x4D, 0x41, 0x53, 0x41 /* "IVASMASA" */
 };
 
-#endif
 const float diffuseness_reconstructions_hr[HR_MASA_ER_LEVELS] =
 {
      0.00f,
diff --git a/lib_com/ivas_rom_com.h b/lib_com/ivas_rom_com.h
index 18f2062d7fc0e162d2d16f225efa26f8b4c27462..774aef466aecbcc547d4015c028af5ed1e16e083 100644
--- a/lib_com/ivas_rom_com.h
+++ b/lib_com/ivas_rom_com.h
@@ -264,10 +264,8 @@ extern const uint16_t ivas_param_mc_sym_freq_icc_delta_combined_48_16bits[2 * PA
  * MASA ROM tables
  *----------------------------------------------------------------------------------*/
 
-#ifdef FIX_1121_MASA_DESCRIPTOR
 extern const uint8_t ivasmasaFormatDescriptor[8]; /* "IVASMASA" */
 
-#endif
 extern const int16_t bits_direction_masa[DIRAC_DIFFUSE_LEVELS];
 extern const int16_t no_theta_masa[NO_SPHERICAL_GRIDS - 2];
 extern const int16_t no_phi_masa[NO_SPHERICAL_GRIDS][MAX_NO_THETA];
diff --git a/lib_com/options.h b/lib_com/options.h
index e490d7750e1faa6e709a0b9f98caa506c8c7fd5e..6b1a8d303a1d8b298c767eb030478f3b9e5cfaad 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -162,10 +162,6 @@
 //#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_1053_AEID_FILE_TEST                         /* Philips: Tests for the -aeid file and fix for memory error */
-#define FIX_1121_MASA_DESCRIPTOR                        /* VA: issue 1121: Define 'ivasmasaFormatDescriptor' at one common place */
-#define FIX_1113_CLDFB_REND_IN_ISAR                     /* issue 1113: fix the use of CLDFB renderer in split-rendering at the external renderer */
-#define ADJUST_MCT_CHANNELS_MAX                         /* FhG: set correct max mct channels constant*/
 #define FIX_745_FIX_DATA_TYPE_CONVERSION                /* VA: issue 745: implicit data type conversion when calling IVAS_DEC_Configure() */
 
 /* #################### End BE switches ################################## */
@@ -176,8 +172,6 @@
 
 #define NONBE_MDCT_ST_DTX_SKIP_DEWHITENING_OF_NOISE_SHAPES_ON_SID_FRAMES /* FhG: issue 1133: skip de-whitening of bg noise shape after frameloss period if the first good frame is an SID */
 #define NONBE_MDCT_ST_PLC_DO_NOT_SCALE_OLD_OUT_IF_FIRST_GOOD_IS_SID /* FhG: issue 1133: in TCX PLC, don't scale hHQ_core->old_out after applying fade to noise in burst frame error */
-#define NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER                  /* FhG: issue 1128: set output ambisonics order to input order for EXT output */
-#define NONBE_FIX_1052_SBA_EXT_FIX                            /* VA: SBA external output support fix - do not overwrite "output_config" parameter */
 #define NONBE_FIX_1130_DIV_ZERO_LEV_DUR                       /* VA: issue 1130: avoid div by zero in L-D by thresholding R[0] to a min value of 100.0 */
 
 /* ##################### End NON-BE switches ########################### */
diff --git a/lib_dec/ivas_binRenderer_internal.c b/lib_dec/ivas_binRenderer_internal.c
index 1ed443d61841d2105ede0322284a9d5f55e6fa77..f4e3e39fddddbb7128e7fdc1b4c5f7a7e2ba6db1 100644
--- a/lib_dec/ivas_binRenderer_internal.c
+++ b/lib_dec/ivas_binRenderer_internal.c
@@ -1014,11 +1014,7 @@ ivas_error ivas_rend_openCldfbRend(
         return error;
     }
 
-#ifdef FIX_1113_CLDFB_REND_IN_ISAR
     pCldfbRend->binaural_latency_ns = (int32_t) ( pCldfbRend->hHrtfFastConv->FASTCONV_HOA3_latency_s * 1000000000.f );
-#else
-    pCldfbRend->binaural_latency_ns = (int32_t) ( FASTCONV_HOA3_latency_s * 1000000000.f );
-#endif
     hBinRenderer->hReverb = NULL;
     hBinRenderer->hEFAPdata = NULL;
 
diff --git a/lib_dec/ivas_init_dec.c b/lib_dec/ivas_init_dec.c
index 839894d1e309e5b6d81a122af0fee5f08de4dcfa..907f5619ab0235d7f0684355f3221013fdf76e50 100644
--- a/lib_dec/ivas_init_dec.c
+++ b/lib_dec/ivas_init_dec.c
@@ -55,7 +55,6 @@ static ivas_error ivas_read_format( Decoder_Struct *st_ivas, int16_t *num_bits_r
 static ivas_error doSanityChecks_IVAS( Decoder_Struct *st_ivas );
 
 
-#ifdef NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER
 /*-------------------------------------------------------------------*
  * ivas_set_audio_config_from_sba_order()
  *
@@ -66,12 +65,6 @@ static ivas_error doSanityChecks_IVAS( Decoder_Struct *st_ivas );
 static AUDIO_CONFIG ivas_set_audio_config_from_sba_order(
     const int16_t sba_order /* i  : Ambisonic (SBA) order           */
 )
-#else
-static AUDIO_CONFIG ivas_set_output_config_from_sba_order( const int16_t sba_order );
-
-
-static AUDIO_CONFIG ivas_set_output_config_from_sba_order( const int16_t sba_order )
-#endif
 {
     AUDIO_CONFIG output_config;
 
@@ -89,12 +82,8 @@ static AUDIO_CONFIG ivas_set_output_config_from_sba_order( const int16_t sba_ord
             output_config = IVAS_AUDIO_CONFIG_HOA3;
             break;
         default:
-#ifdef NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER
             output_config = IVAS_AUDIO_CONFIG_INVALID;
             break;
-#else
-            assert( 0 );
-#endif
     }
 
     return output_config;
@@ -179,17 +168,6 @@ ivas_error ivas_dec_setup(
             /* read Ambisonic (SBA) order */
             st_ivas->sba_order = st_ivas->bit_stream[num_bits_read + 1];
             st_ivas->sba_order += 2 * st_ivas->bit_stream[num_bits_read];
-#ifndef NONBE_FIX_1052_SBA_EXT_FIX
-            if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL )
-            {
-#ifdef NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER
-                st_ivas->hDecoderConfig->output_config = ivas_set_audio_config_from_sba_order( st_ivas->sba_order );
-#else
-                st_ivas->hDecoderConfig->output_config = ivas_set_output_config_from_sba_order( st_ivas->sba_order );
-#endif
-                st_ivas->hDecoderConfig->nchan_out = audioCfg2channels( st_ivas->hDecoderConfig->output_config );
-            }
-#endif
 
             num_bits_read += SBA_ORDER_BITS;
             if ( st_ivas->ini_frame > 0 && ivas_total_brate != st_ivas->last_active_ivas_total_brate && ivas_total_brate > IVAS_SID_5k2 )
@@ -429,18 +407,6 @@ ivas_error ivas_dec_setup(
                 break;
         }
 
-#ifndef NONBE_FIX_1052_SBA_EXT_FIX
-        if ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL )
-        {
-#ifdef NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER
-            st_ivas->hDecoderConfig->output_config = ivas_set_audio_config_from_sba_order( st_ivas->sba_order );
-#else
-            st_ivas->hDecoderConfig->output_config = ivas_set_output_config_from_sba_order( st_ivas->sba_order );
-#endif
-            st_ivas->hDecoderConfig->nchan_out = audioCfg2channels( st_ivas->hDecoderConfig->output_config );
-        }
-
-#endif
         if ( st_ivas->ini_frame > 0 && st_ivas->ivas_format == SBA_FORMAT )
         {
             int16_t nchan_transport_old, nchan_transport;
@@ -808,9 +774,7 @@ ivas_error ivas_init_decoder_front(
 
     st_ivas->nSCE = 0;
     st_ivas->nCPE = 0;
-#ifdef NONBE_FIX_1052_SBA_EXT_FIX
     st_ivas->nchan_ism = 0;
-#endif
     st_ivas->nchan_transport = -1;
 
     st_ivas->ism_mode = ISM_MODE_NONE;
@@ -976,17 +940,9 @@ ivas_error ivas_init_decoder(
         {
             hDecoderConfig->nchan_out = audioCfg2channels( st_ivas->transport_config );
         }
-#ifdef NONBE_FIX_1052_SBA_EXT_FIX
         else if ( st_ivas->ivas_format == SBA_ISM_FORMAT || st_ivas->ivas_format == SBA_FORMAT )
-#else
-        else if ( st_ivas->ivas_format == SBA_ISM_FORMAT )
-#endif
         {
-#ifdef NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER
             hDecoderConfig->nchan_out = audioCfg2channels( ivas_set_audio_config_from_sba_order( st_ivas->sba_order ) );
-#else
-            hDecoderConfig->nchan_out = audioCfg2channels( IVAS_AUDIO_CONFIG_HOA3 );
-#endif
             hDecoderConfig->nchan_out += st_ivas->nchan_ism;
         }
         else if ( st_ivas->ivas_format == MASA_ISM_FORMAT || st_ivas->ivas_format == MASA_FORMAT )
@@ -1012,17 +968,11 @@ ivas_error ivas_init_decoder(
         ivas_output_init( &( st_ivas->hOutSetup ), st_ivas->transport_config );
         st_ivas->intern_config = st_ivas->transport_config;
     }
-#ifdef NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER
-#ifdef NONBE_FIX_1052_SBA_EXT_FIX
     else if ( output_config == IVAS_AUDIO_CONFIG_EXTERNAL && ( st_ivas->ivas_format == SBA_ISM_FORMAT || st_ivas->ivas_format == SBA_FORMAT ) )
-#else
-    else if ( output_config == IVAS_AUDIO_CONFIG_EXTERNAL && st_ivas->ivas_format == SBA_ISM_FORMAT )
-#endif
     {
         st_ivas->intern_config = ivas_set_audio_config_from_sba_order( st_ivas->sba_order );
         ivas_output_init( &( st_ivas->hOutSetup ), st_ivas->intern_config );
     }
-#endif
     else
     {
         ivas_output_init( &( st_ivas->hOutSetup ), output_config );
@@ -1036,16 +986,6 @@ ivas_error ivas_init_decoder(
         st_ivas->hOutSetup.nchan_out_woLFE = audioCfg2channels( st_ivas->intern_config );
     }
 
-#ifndef NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER
-    if ( st_ivas->ivas_format == SBA_ISM_FORMAT && output_config == IVAS_AUDIO_CONFIG_EXTERNAL )
-    {
-        st_ivas->hOutSetup.ambisonics_order = SBA_HOA3_ORDER;
-        st_ivas->intern_config = IVAS_AUDIO_CONFIG_HOA3;
-        st_ivas->hOutSetup.output_config = IVAS_AUDIO_CONFIG_HOA3;
-        st_ivas->hOutSetup.nchan_out_woLFE = audioCfg2channels( IVAS_AUDIO_CONFIG_HOA3 );
-    }
-
-#endif
     /* Only initialize transport setup if it is used */
     if ( st_ivas->transport_config != IVAS_AUDIO_CONFIG_INVALID )
     {
@@ -1232,11 +1172,7 @@ ivas_error ivas_init_decoder(
             return error;
         }
 
-#ifdef NONBE_FIX_1052_SBA_EXT_FIX
         if ( hDecoderConfig->output_config != IVAS_AUDIO_CONFIG_FOA && st_ivas->hDecoderConfig->output_config != IVAS_AUDIO_CONFIG_STEREO && st_ivas->hDecoderConfig->output_config != IVAS_AUDIO_CONFIG_MONO && !( hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL && st_ivas->intern_config == IVAS_AUDIO_CONFIG_FOA ) )
-#else
-        if ( hDecoderConfig->output_config != IVAS_AUDIO_CONFIG_FOA && st_ivas->hDecoderConfig->output_config != IVAS_AUDIO_CONFIG_STEREO && st_ivas->hDecoderConfig->output_config != IVAS_AUDIO_CONFIG_MONO )
-#endif
         {
             if ( ( error = ivas_dirac_dec_config( st_ivas, DIRAC_OPEN ) ) != IVAS_ERR_OK )
             {
diff --git a/lib_dec/ivas_masa_dec.c b/lib_dec/ivas_masa_dec.c
index 121cb3df43efa88045f2d537a659da633be8db8e..50cd432deaf0630db12f525a909ed395f7637abb 100644
--- a/lib_dec/ivas_masa_dec.c
+++ b/lib_dec/ivas_masa_dec.c
@@ -1835,9 +1835,6 @@ static void create_masa_ext_out_meta(
     IVAS_QMETADATA_HANDLE hQMetaData,
     const int16_t nchan_transport )
 {
-#ifndef FIX_1121_MASA_DESCRIPTOR
-    const uint8_t ivasmasaFormatDescriptor[8] = { 0x49, 0x56, 0x41, 0x53, 0x4D, 0x41, 0x53, 0x41 }; /* "IVASMASA" */
-#endif
     int16_t i, sf, b_old, b_new, dir;
     MASA_DECRIPTIVE_META *descMeta;
     int16_t *bandMap;
diff --git a/lib_dec/ivas_mct_core_dec.c b/lib_dec/ivas_mct_core_dec.c
index 909d08058ee4d28be638bfbda7fd60cfb199ce81..6774b473db51aa933b182d4affc055991b984b76 100644
--- a/lib_dec/ivas_mct_core_dec.c
+++ b/lib_dec/ivas_mct_core_dec.c
@@ -77,15 +77,11 @@ void ivas_mct_side_bits(
     {
         for ( ch = 0; ch < CPE_CHANNELS; ch++ )
         {
-#ifdef ADJUST_MCT_CHANNELS_MAX
             if ( i < MCT_MAX_CHANNELS )
             {
-#endif
                 sts[i] = hCPE[cpe_id]->hCoreCoder[ch];
                 i++;
-#ifdef ADJUST_MCT_CHANNELS_MAX
             }
-#endif
         }
     }
 
@@ -201,30 +197,14 @@ void ivas_mct_core_dec(
     {
         for ( ch = 0; ch < CPE_CHANNELS; ch++ )
         {
-#ifdef ADJUST_MCT_CHANNELS_MAX
             if ( i < MCT_MAX_CHANNELS )
             {
-#endif
                 sts[i] = hCPE[cpe_id]->hCoreCoder[ch];
                 i++;
-#ifdef ADJUST_MCT_CHANNELS_MAX
             }
-#endif
-        }
-    }
-
-#ifndef ADJUST_MCT_CHANNELS_MAX
-    /*seems like obsolete code*/
-    for ( ch = 0, i = 0; ch < nChannels; ch++ )
-    {
-        if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
-        {
-            continue;
         }
-        i++;
     }
 
-#endif
     bfi = sts[0]->bfi;
 
     for ( ch = 0; ch < nChannels; ch++ )
diff --git a/lib_dec/ivas_output_config.c b/lib_dec/ivas_output_config.c
index 5b331378ca2bcc10e95db528ba856eec34cf333e..44a10edbe2eca04a5b29c2a76f0aa2621bf4d0a5 100644
--- a/lib_dec/ivas_output_config.c
+++ b/lib_dec/ivas_output_config.c
@@ -318,15 +318,11 @@ void ivas_renderer_select(
 
         if ( ivas_format == SBA_FORMAT && ( output_config != IVAS_AUDIO_CONFIG_5_1 && output_config != IVAS_AUDIO_CONFIG_5_1_2 && output_config != IVAS_AUDIO_CONFIG_5_1_4 && output_config != IVAS_AUDIO_CONFIG_7_1 && output_config != IVAS_AUDIO_CONFIG_7_1_4 && output_config != IVAS_AUDIO_CONFIG_LS_CUSTOM && output_config != IVAS_AUDIO_CONFIG_MONO && output_config != IVAS_AUDIO_CONFIG_STEREO ) )
         {
-#ifdef NONBE_FIX_1052_SBA_EXT_FIX
             if ( output_config == IVAS_AUDIO_CONFIG_EXTERNAL )
             {
                 /* 'internal_config' was already set in ivas_set_audio_config_from_sba_order() */
             }
             else if ( output_config == IVAS_AUDIO_CONFIG_HOA2 || output_config == IVAS_AUDIO_CONFIG_FOA )
-#else
-            if ( output_config == IVAS_AUDIO_CONFIG_HOA2 || output_config == IVAS_AUDIO_CONFIG_FOA )
-#endif
             {
                 *internal_config = output_config;
             }
@@ -334,11 +330,7 @@ void ivas_renderer_select(
             {
                 *internal_config = IVAS_AUDIO_CONFIG_FOA;
             }
-#ifdef NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER
             else if ( output_config != IVAS_AUDIO_CONFIG_EXTERNAL )
-#else
-            if ( output_config != IVAS_AUDIO_CONFIG_EXTERNAL )
-#endif
             {
                 *internal_config = IVAS_AUDIO_CONFIG_HOA3;
             }
diff --git a/lib_dec/ivas_spar_decoder.c b/lib_dec/ivas_spar_decoder.c
index 82b87bdcd23b29f1bc8107acaaaad56eb8257ccd..ff086adb545df6cfd33ae580a3922e2d94d41539 100644
--- a/lib_dec/ivas_spar_decoder.c
+++ b/lib_dec/ivas_spar_decoder.c
@@ -1556,11 +1556,7 @@ void ivas_spar_dec_upmixer_sf(
         }
     }
 
-#ifdef NONBE_FIX_1052_SBA_EXT_FIX
     if ( hDecoderConfig->ivas_total_brate < IVAS_24k4 && ( st_ivas->intern_config == IVAS_AUDIO_CONFIG_HOA2 || st_ivas->intern_config == IVAS_AUDIO_CONFIG_HOA3 ) )
-#else
-    if ( ( hDecoderConfig->ivas_total_brate < IVAS_24k4 ) && ( ( hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_HOA2 ) || ( hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_HOA3 ) ) )
-#endif
     {
         ivas_spar_calc_smooth_facs( cldfb_in_ts_re[0], cldfb_in_ts_im[0], num_spar_bands, hSpar->subframe_nbslots[hSpar->subframes_rendered], hSpar->subframes_rendered == 0, &hSpar->hFbMixer->pFb->fb_bin_to_band, hSpar->hMdDec->smooth_fac, hSpar->hMdDec->smooth_buf );
     }
@@ -1570,11 +1566,7 @@ void ivas_spar_dec_upmixer_sf(
         md_idx = hSpar->render_to_md_map[ts + slot_idx_start];
         ivas_spar_get_parameters( hSpar, hDecoderConfig, md_idx, numch_out, numch_in, num_spar_bands, mixer_mat );
 
-#ifdef NONBE_FIX_1052_SBA_EXT_FIX
         if ( hDecoderConfig->ivas_total_brate < IVAS_24k4 && ( st_ivas->intern_config == IVAS_AUDIO_CONFIG_HOA2 || st_ivas->intern_config == IVAS_AUDIO_CONFIG_HOA3 ) )
-#else
-        if ( ( hDecoderConfig->ivas_total_brate < IVAS_24k4 ) && ( ( hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_HOA2 ) || ( hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_HOA3 ) ) )
-#endif
         {
             for ( spar_band = 0; spar_band < num_spar_bands; spar_band++ )
             {
@@ -1663,11 +1655,7 @@ void ivas_spar_dec_upmixer_sf(
         }
     }
 
-#ifdef NONBE_FIX_1052_SBA_EXT_FIX
     if ( hDecoderConfig->output_config != IVAS_AUDIO_CONFIG_FOA && hDecoderConfig->output_config != IVAS_AUDIO_CONFIG_STEREO && hDecoderConfig->output_config != IVAS_AUDIO_CONFIG_MONO && !( hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL && st_ivas->intern_config == IVAS_AUDIO_CONFIG_FOA ) )
-#else
-    if ( hDecoderConfig->output_config != IVAS_AUDIO_CONFIG_FOA && hDecoderConfig->output_config != IVAS_AUDIO_CONFIG_STEREO && hDecoderConfig->output_config != IVAS_AUDIO_CONFIG_MONO )
-#endif
     {
         ivas_dirac_dec_render_sf( st_ivas, output, nchan_internal, cldfb_in_ts_re, cldfb_in_ts_im );
     }
diff --git a/lib_dec/lib_dec.c b/lib_dec/lib_dec.c
index 88dc02d3ed2cc699c5e115168267fca5a9a1fd6d..7cca9fc39b317b819750db8980a77979f7474ffe 100644
--- a/lib_dec/lib_dec.c
+++ b/lib_dec/lib_dec.c
@@ -2133,9 +2133,7 @@ static ivas_error copyRendererConfigStruct(
     mvr2r( hRCin->roomAcoustics.pAcoustic_rt60, hRCout->roomAcoustics.pAcoustic_rt60, CLDFB_NO_CHANNELS_MAX );
     mvr2r( hRCin->roomAcoustics.pAcoustic_dsr, hRCout->roomAcoustics.pAcoustic_dsr, CLDFB_NO_CHANNELS_MAX );
     mvr2r( hRCin->directivity, hRCout->directivity, 3 * MAX_NUM_OBJECTS );
-#ifdef FIX_1053_AEID_FILE_TEST
     mvr2r( hRCin->distAtt, hRCout->distAtt, 3 );
-#endif
 
     hRCout->split_rend_config = hRCin->split_rend_config;
 
diff --git a/lib_enc/ivas_cpe_enc.c b/lib_enc/ivas_cpe_enc.c
index 044fb1c59a85bf6e7803c6cda8424a4bd86c405c..a3a2bec2573d72bcaa9d7b193ecede972e1c3900 100644
--- a/lib_enc/ivas_cpe_enc.c
+++ b/lib_enc/ivas_cpe_enc.c
@@ -599,19 +599,7 @@ ivas_error ivas_cpe_enc(
 
     if ( sts[0]->core_brate == SID_2k40 )
     {
-#ifdef NONBE_FIX_1052_SBA_EXT_FIX
         ivas_write_format_sid( ivas_format, hCPE->element_mode, sts[0]->hBstr, hEncoderConfig->sba_order, hEncoderConfig->sba_planar );
-#else
-        ivas_write_format_sid( ivas_format, hCPE->element_mode, sts[0]->hBstr );
-        if ( ivas_format == SBA_FORMAT )
-        {
-            /* Write SBA planar flag */
-            push_indice( sts[0]->hBstr, IND_SMODE, st_ivas->hEncoderConfig->sba_planar, SBA_PLANAR_BITS );
-
-            /* Write SBA order */
-            push_indice( sts[0]->hBstr, IND_SMODE, st_ivas->hEncoderConfig->sba_order, SBA_ORDER_BITS );
-        }
-#endif
     }
 
     /*----------------------------------------------------------------*
diff --git a/lib_enc/ivas_init_enc.c b/lib_enc/ivas_init_enc.c
index e9b2b5765f6a23ffd4653f5ecd51e352817f5c58..05621dfaaaf765870ec498d27afefef931b71ce9 100644
--- a/lib_enc/ivas_init_enc.c
+++ b/lib_enc/ivas_init_enc.c
@@ -135,13 +135,9 @@ void ivas_write_format(
 void ivas_write_format_sid(
     const IVAS_FORMAT ivas_format, /* i  : IVAS format               */
     const int16_t element_mode,    /* i  : element bitrate           */
-#ifdef NONBE_FIX_1052_SBA_EXT_FIX
-    BSTR_ENC_HANDLE hBstr,   /* i/o: encoder bitstream handle  */
-    const int16_t sba_order, /* i  : Ambisonic (SBA) order     */
-    const int16_t sba_planar /* i  : SBA planar flag           */
-#else
-    BSTR_ENC_HANDLE hBstr /* i/o: encoder bitstream handle                */
-#endif
+    BSTR_ENC_HANDLE hBstr,         /* i/o: encoder bitstream handle  */
+    const int16_t sba_order,       /* i  : Ambisonic (SBA) order     */
+    const int16_t sba_planar       /* i  : SBA planar flag           */
 )
 {
     int16_t ind = 0; /* to avoid compilation warning */
@@ -199,7 +195,6 @@ void ivas_write_format_sid(
 
     push_indice( hBstr, IND_IVAS_FORMAT, ind, SID_FORMAT_NBITS );
 
-#ifdef NONBE_FIX_1052_SBA_EXT_FIX
     if ( ivas_format == SBA_FORMAT )
     {
         /* Write SBA planar flag */
@@ -208,7 +203,6 @@ void ivas_write_format_sid(
         /* Write SBA order */
         push_indice( hBstr, IND_SMODE, sba_order, SBA_ORDER_BITS );
     }
-#endif
 
     return;
 }
diff --git a/lib_enc/ivas_ism_enc.c b/lib_enc/ivas_ism_enc.c
index 88713e74097ce4e2ef37e8423bd0032b256f4f46..6e2732f44a4e3e5c34d70b033f1023522519658b 100644
--- a/lib_enc/ivas_ism_enc.c
+++ b/lib_enc/ivas_ism_enc.c
@@ -280,11 +280,7 @@ ivas_error ivas_ism_enc(
 
     if ( sid_flag )
     {
-#ifdef NONBE_FIX_1052_SBA_EXT_FIX
         ivas_write_format_sid( st_ivas->hEncoderConfig->ivas_format, IVAS_SCE, st->hBstr, -1, -1 );
-#else
-        ivas_write_format_sid( st_ivas->hEncoderConfig->ivas_format, IVAS_SCE, st->hBstr );
-#endif
     }
 
     /*only metadata encoding is needed for this case*/
diff --git a/lib_enc/ivas_mct_core_enc.c b/lib_enc/ivas_mct_core_enc.c
index fa25c6cecec0cc1ed03ee1c04c20eccac77589d7..9df01a94591dc097eb7b5e99a7dd0bd0caa1ae79 100644
--- a/lib_enc/ivas_mct_core_enc.c
+++ b/lib_enc/ivas_mct_core_enc.c
@@ -265,14 +265,10 @@ void ivas_mct_core_enc(
     {
         for ( ch = 0; ch < CPE_CHANNELS; ch++ )
         {
-#ifdef ADJUST_MCT_CHANNELS_MAX
             if ( cpe_id * CPE_CHANNELS + ch < nChannels )
             {
-#endif
                 sts[i] = hCPE[cpe_id]->hCoreCoder[ch];
-#ifdef ADJUST_MCT_CHANNELS_MAX
             }
-#endif
 
             if ( hCPE[cpe_id]->hCoreCoder[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
             {
diff --git a/lib_enc/ivas_sce_enc.c b/lib_enc/ivas_sce_enc.c
index b36048ce0b0773e69a2ddc762b92292fb47fbbca..8f5d472ea95f605c7159b8a4001d6260bbc2c12d 100644
--- a/lib_enc/ivas_sce_enc.c
+++ b/lib_enc/ivas_sce_enc.c
@@ -223,19 +223,7 @@ ivas_error ivas_sce_enc(
 
     if ( st->core_brate == SID_2k40 )
     {
-#ifdef NONBE_FIX_1052_SBA_EXT_FIX
         ivas_write_format_sid( ivas_format, IVAS_SCE, st->hBstr, st_ivas->hEncoderConfig->sba_order, st_ivas->hEncoderConfig->sba_planar );
-#else
-        ivas_write_format_sid( ivas_format, IVAS_SCE, st->hBstr );
-        if ( ivas_format == SBA_FORMAT )
-        {
-            /* Write SBA planar flag */
-            push_indice( st->hBstr, IND_SMODE, st_ivas->hEncoderConfig->sba_planar, SBA_PLANAR_BITS );
-
-            /* Write SBA order */
-            push_indice( st->hBstr, IND_SMODE, st_ivas->hEncoderConfig->sba_order, SBA_ORDER_BITS );
-        }
-#endif
     }
 
     /*----------------------------------------------------------------*
diff --git a/lib_rend/ivas_mcmasa_ana.c b/lib_rend/ivas_mcmasa_ana.c
index 49e7d00eec0465c5c8f11598db7294d59460c1e4..0449159a2fd3c6c0f2ead10c91eb3fdccd90d2a6 100644
--- a/lib_rend/ivas_mcmasa_ana.c
+++ b/lib_rend/ivas_mcmasa_ana.c
@@ -1069,9 +1069,6 @@ void ivas_create_masa_out_meta(
     float surroundingCoherence[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS] /* i  : Estimated surround coherence    */
 )
 {
-#ifndef FIX_1121_MASA_DESCRIPTOR
-    const uint8_t ivasmasaFormatDescriptor[8] = { 0x49, 0x56, 0x41, 0x53, 0x4D, 0x41, 0x53, 0x41 }; /* "IVASMASA" */
-#endif
     int16_t i, sf, band;
     uint8_t numFrequencyBands;
     uint8_t numDirections;
diff --git a/lib_util/masa_file_reader.c b/lib_util/masa_file_reader.c
index bc75b0bdbdd780cca8a86c24cccd7716cc8b00ed..56f22d3fed15137ae2db4dd4bc531cd4d438bf65 100644
--- a/lib_util/masa_file_reader.c
+++ b/lib_util/masa_file_reader.c
@@ -33,9 +33,7 @@
 #include "masa_file_reader.h"
 #include "ivas_prot.h"
 #include "ivas_stat_com.h"
-#ifdef FIX_1121_MASA_DESCRIPTOR
 #include "ivas_rom_com.h" /* load 'ivasmasaFormatDescriptor[8]' */
-#endif
 #include <stdlib.h>
 #include <math.h>
 
@@ -114,9 +112,6 @@ ivas_error MasaFileReader_readNextFrame(
         return IVAS_ERR_UNEXPECTED_NULL_POINTER;
     }
 
-#ifndef FIX_1121_MASA_DESCRIPTOR
-    const uint8_t ivasmasaFormatDescriptor[8] = { 0x49, 0x56, 0x41, 0x53, 0x4D, 0x41, 0x53, 0x41 }; /* "IVASMASA" */
-#endif
     uint16_t twoByteBuffer = 0;
     int16_t i, j, b;
     IVAS_MASA_METADATA_HANDLE hMeta;