diff --git a/lib_com/ivas_prot.h b/lib_com/ivas_prot.h
index d947f5248ad9ff003ca0acdc5874cfd9fa3400a3..c44bd4b97551496d90c9cac0a0d00174014cab81 100644
--- a/lib_com/ivas_prot.h
+++ b/lib_com/ivas_prot.h
@@ -2155,9 +2155,7 @@ void stereo_mdct_core_dec(
 void splitAvailableBits(
     const int16_t total_bits,                                   /* i  : total available bits for TCX coding     */
     const int16_t split_ratio,                                  /* i  : split ratio                             */
-#ifdef LBR_SBA_CORE_CODING_TUNING
     const int16_t isSBAStereoMode,                              /* i  : signal core coding for sba              */
-#endif
     int16_t *bits_ch0,                                          /* o  : bits for channel 0                      */
     int16_t *bits_ch1                                           /* o  : bits for channel 1                      */
 );
@@ -2175,9 +2173,7 @@ void parse_stereo_from_bitstream(
     STEREO_MDCT_DEC_DATA_HANDLE hStereoMdct,                    /* i/o: MDCT stereo decoder structure           */
     Decoder_State **sts,                                        /* i/o: decoder state structure                 */
     const int16_t mct_on,                                       /* i  : flag mct block (1) or stereo (0)        */
-#ifdef LBR_SBA_CORE_CODING_TUNING
     const int16_t isSBAStereoMode,                              /* i: flag core coding for sba         */
-#endif
     Decoder_State *st0,                                         /* i/o: decoder state structure for Bstr        */
     int16_t ms_mask[NB_DIV][MAX_SFB]                            /* o  : bandwise MS mask                        */
 );
@@ -2513,10 +2509,8 @@ ivas_error stereo_memory_enc(
     const int16_t max_bwidth,                                   /* i  : maximum audio bandwidth                 */
     float *tdm_last_ratio,                                      /* o  : TD stereo last ratio                    */
     const IVAS_FORMAT ivas_format                               /* i  : IVAS format                             */
-#ifdef LBR_SBA_CORE_CODING_TUNING
     ,
     const int16_t nchan_transport                               /* i  : number transport chans                  */
-#endif
 
 );
 
@@ -3013,11 +3007,7 @@ void ivas_dirac_param_est_enc(
  *----------------------------------------------------------------------------------*/
 
 /*! r: SBA format mode */
-#ifdef LBR_SBA_CORE_CODING_TUNING
 SBA_MODE ivas_sba_mode_select( 
-#else
-int16_t ivas_sba_mode_select( 
-#endif
     const int32_t ivas_total_brate                              /* i  : IVAS total bitrate                      */
 );
 
diff --git a/lib_com/ivas_stereo_mdct_stereo_com.c b/lib_com/ivas_stereo_mdct_stereo_com.c
index 1b8caa0c7cdb4958831fb19fc8739d354eba30c4..73cd2fd57978455f5cb96a3469b82217a8c1172b 100644
--- a/lib_com/ivas_stereo_mdct_stereo_com.c
+++ b/lib_com/ivas_stereo_mdct_stereo_com.c
@@ -46,9 +46,7 @@
 void splitAvailableBits(
     const int16_t total_bits,      /* i  : total available bits for TCX coding   */
     const int16_t split_ratio,     /* i  : split ratio                           */
-#ifdef LBR_SBA_CORE_CODING_TUNING
     const int16_t isSBAStereoMode, /* i  : signal core coding for sba            */
-#endif
     int16_t *bits_ch0,             /* o  : bits for channel 0                    */
     int16_t *bits_ch1              /* o  : bits for channel 1                    */
 )
@@ -56,13 +54,11 @@ void splitAvailableBits(
     assert( split_ratio >= 1 && split_ratio < SMDCT_BITRATE_RATIO_RANGE );
 
     *bits_ch0 = split_ratio * total_bits / SMDCT_BITRATE_RATIO_RANGE;
-#ifdef LBR_SBA_CORE_CODING_TUNING
     /* for SBA mode bias the distribution towards the W channel */
     if ( split_ratio < 7 && isSBAStereoMode )
     {
         *bits_ch0 += (int16_t) ( 0.2 * *bits_ch0 );
     }
-#endif
     *bits_ch1 = total_bits - *bits_ch0;
 
     return;
diff --git a/lib_com/options.h b/lib_com/options.h
index ec3e206c4f96369945787ba892295bc82f8944ec..a1981a5e79fa66c55ac728690bb964d92b805b1a 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -147,7 +147,6 @@
 /*#define FIX_I1_113*/                                  /* under review : MCT bit distribution optimization for SBA high bitrates*/
 
 
-#define LBR_SBA_CORE_CODING_TUNING                      /* Contribution "3 Core Coder Tuning for low bitrate SBA with 2 TCs" */
 
 #define FIX_WRONG_NBANDS_IN_ITD_ESTIMATION              /* Issue 85: fix incorrect setting of nbands in calc_mean_E_ratio() if bwidth is limited on commandline*/
 
diff --git a/lib_dec/ivas_cpe_dec.c b/lib_dec/ivas_cpe_dec.c
index c75ece2bce02fd54f512b7c6a986222946c61e74..7223b38761970ae953c9b31cc98f282166d225fe 100644
--- a/lib_dec/ivas_cpe_dec.c
+++ b/lib_dec/ivas_cpe_dec.c
@@ -361,27 +361,10 @@ ivas_error ivas_cpe_dec(
 
     if ( hCPE->element_mode != IVAS_CPE_DFT || ( hCPE->nchan_out == 1 && hCPE->hStereoDft->hConfig->res_cod_mode == STEREO_DFT_RES_COD_OFF ) )
     {
-#ifndef LBR_SBA_CORE_CODING_TUNING
-        if (  st_ivas->renderer_type == RENDERER_MC_PARAMMC && ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_MONO || st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_STEREO ) )
-        {
-            if ( ( error = ivas_core_dec( st_ivas, NULL, hCPE, st_ivas->hMCT, n_channels, output, outputHB, NULL, 0 ) ) != IVAS_ERR_OK )
-            {
-                return error;
-            }
-        }
-        else
-        {
-            if ( ( error = ivas_core_dec( NULL, NULL, hCPE, st_ivas->hMCT, n_channels, output, outputHB, NULL, 0 ) ) != IVAS_ERR_OK )
-            {
-                return error;
-            }
-        }
-#else
         if ( ( error = ivas_core_dec( st_ivas, NULL, hCPE, st_ivas->hMCT, n_channels, output, outputHB, NULL, 0 ) ) != IVAS_ERR_OK )
         {
             return error;
         }
-#endif
     }
 
     if ( st_ivas->hMCT )
diff --git a/lib_dec/ivas_mct_dec_mct.c b/lib_dec/ivas_mct_dec_mct.c
index 1d1ccb0a3aaf8622f43e8f0ce251c0f1043163f4..00eff03dac152d37204e3626405f79c340a236a5 100644
--- a/lib_dec/ivas_mct_dec_mct.c
+++ b/lib_dec/ivas_mct_dec_mct.c
@@ -147,11 +147,7 @@ void ivas_mct_dec_mct(
         p_st[0] = sts[hBlock->ch1];
         p_st[1] = sts[hBlock->ch2];
 
-#ifdef LBR_SBA_CORE_CODING_TUNING
         parse_stereo_from_bitstream( hBlock->hStereoMdct, p_st, 1, 0, sts[0], hBlock->mask );
-#else
-        parse_stereo_from_bitstream( hBlock->hStereoMdct, p_st, 1, sts[0], hBlock->mask );
-#endif
     }
 
     return;
diff --git a/lib_dec/ivas_stat_dec.h b/lib_dec/ivas_stat_dec.h
index 7a788f86b66593bb98646d5e2421e73428576fef..740050928930d28ed84cb17f76b0241790d34b51 100644
--- a/lib_dec/ivas_stat_dec.h
+++ b/lib_dec/ivas_stat_dec.h
@@ -324,9 +324,7 @@ typedef struct stereo_mdct_dec_data_structure
     int16_t noise_seeds_channels[CPE_CHANNELS];
     int16_t noise_seed_common;
 #endif
-#ifdef LBR_SBA_CORE_CODING_TUNING
     int16_t isSBAStereoMode;
-#endif
 
 } STEREO_MDCT_DEC_DATA, *STEREO_MDCT_DEC_DATA_HANDLE;
 
diff --git a/lib_dec/ivas_stereo_mdct_core_dec.c b/lib_dec/ivas_stereo_mdct_core_dec.c
index faf86eeb06a1df03f2767f103df5004c90bdf03f..3d4c38f272439cc8ee4368d6d4e418f737044bbd 100644
--- a/lib_dec/ivas_stereo_mdct_core_dec.c
+++ b/lib_dec/ivas_stereo_mdct_core_dec.c
@@ -116,20 +116,12 @@ static void stereo_mdct_dec_stereo(
 
     sts = hCPE->hCoreCoder;
 
-#ifdef LBR_SBA_CORE_CODING_TUNING
     parse_stereo_from_bitstream( hCPE->hStereoMdct, hCPE->hCoreCoder, 0, hCPE->hStereoMdct->isSBAStereoMode, hCPE->hCoreCoder[0], ms_mask );
-#else
-    parse_stereo_from_bitstream( hCPE->hStereoMdct, hCPE->hCoreCoder, 0, hCPE->hCoreCoder[0], ms_mask );
-#endif
 
     /*Split available bits between channels */
     availableBits = sts[0]->bits_frame_channel + sts[1]->bits_frame_channel - sts[0]->next_bit_pos - sts[0]->core * ( NF_GAIN_BITS + SMDCT_MINIMUM_ARITH_BITS ) - sts[1]->core * ( NF_GAIN_BITS + SMDCT_MINIMUM_ARITH_BITS );
 
-#ifdef LBR_SBA_CORE_CODING_TUNING
     splitAvailableBits( availableBits, hCPE->hStereoMdct->split_ratio, hCPE->hStereoMdct->isSBAStereoMode, &sts[0]->bits_frame_channel, &sts[1]->bits_frame_channel );
-#else
-    splitAvailableBits( availableBits, hCPE->hStereoMdct->split_ratio, &sts[0]->bits_frame_channel, &sts[1]->bits_frame_channel );
-#endif
 
     sts[0]->bits_frame_channel += sts[0]->core * SMDCT_MINIMUM_ARITH_BITS;
     sts[1]->bits_frame_channel += sts[1]->core * SMDCT_MINIMUM_ARITH_BITS;
@@ -225,14 +217,12 @@ void stereo_mdct_core_dec(
 
     initMdctStereoDecData( hCPE->hStereoMdct, sts[0]->igf, sts[0]->hIGFDec->igfData.igfInfo.grid, hCPE->element_brate, sts[0]->bwidth );
 
-#ifdef LBR_SBA_CORE_CODING_TUNING
-    hCPE->hStereoMdct->isSBAStereoMode = ( (st_ivas->ivas_format == SBA_FORMAT) && (st_ivas->nchan_transport == 2) );
+    hCPE->hStereoMdct->isSBAStereoMode = ( ( st_ivas->ivas_format == SBA_FORMAT ) && ( st_ivas->nchan_transport == 2 ) );
     /*to prevent unitialized values during condition checks for stereo IGF*/
     if ( hCPE->hStereoMdct->isSBAStereoMode )
     {
         set_s( hCPE->hStereoMdct->IGFStereoMode, -1, 2 );
     }
-#endif
 
     if ( !bfi )
     {
@@ -304,11 +294,7 @@ void stereo_mdct_core_dec(
 
             for ( k = 0; k < nSubframes[0]; k++ )
             {
-                if ( ( hCPE->hStereoMdct->IGFStereoMode[k] != SMDCT_DUAL_MONO || hCPE->hStereoMdct->mdct_stereo_mode[k] != SMDCT_DUAL_MONO )
-#ifdef LBR_SBA_CORE_CODING_TUNING
-                     && !hCPE->hStereoMdct->isSBAStereoMode
-#endif
-                )
+                if ( ( hCPE->hStereoMdct->IGFStereoMode[k] != SMDCT_DUAL_MONO || hCPE->hStereoMdct->mdct_stereo_mode[k] != SMDCT_DUAL_MONO ) && !hCPE->hStereoMdct->isSBAStereoMode )
                 {
                     assert( ( sts[0]->core == sts[1]->core ) || ( hCPE->hStereoMdct->mdct_stereo_mode[0] == SMDCT_DUAL_MONO ) );
 
@@ -384,11 +370,7 @@ void stereo_mdct_core_dec(
         mvs2s( ms_mask[1], hCPE->hStereoMdct->prev_ms_mask[1], MAX_SFB );
     }
 
-    if ( ( !bfi || !( sts[0]->core == ACELP_CORE && sts[1]->core == ACELP_CORE ) )
-#ifdef LBR_SBA_CORE_CODING_TUNING
-         && !hCPE->hStereoMdct->isSBAStereoMode
-#endif
-    )
+    if ( ( !bfi || !( sts[0]->core == ACELP_CORE && sts[1]->core == ACELP_CORE ) ) && !hCPE->hStereoMdct->isSBAStereoMode )
     {
 #ifdef DEBUGGING
         assert( ( sts[0]->core == sts[1]->core ) || ( ( hCPE->hStereoMdct->mdct_stereo_mode[0] == SMDCT_DUAL_MONO ) && ( hCPE->hStereoMdct->mdct_stereo_mode[1] == SMDCT_DUAL_MONO ) ) );
@@ -400,9 +382,6 @@ void stereo_mdct_core_dec(
     ivas_mdct_core_tns_ns( hCPE, 0, fUseTns, tnsData, x, Aq, 0 );
 
     if (
-#ifndef LBR_SBA_CORE_CODING_TUNING
-        st_ivas != NULL &&
-#endif
         st_ivas->renderer_type == RENDERER_MC_PARAMMC && ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_MONO || st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_STEREO ) )
     {
         ivas_ls_setup_conversion_process_mdct_param_mc( st_ivas, x );
diff --git a/lib_dec/ivas_stereo_mdct_stereo_dec.c b/lib_dec/ivas_stereo_mdct_stereo_dec.c
index 05c9c12ae221d09c42137a1955550f8782d6c710..f797eaf289127f07202a52ced4feeba6a188543d 100644
--- a/lib_dec/ivas_stereo_mdct_stereo_dec.c
+++ b/lib_dec/ivas_stereo_mdct_stereo_dec.c
@@ -57,9 +57,7 @@ void parse_stereo_from_bitstream(
     STEREO_MDCT_DEC_DATA_HANDLE hStereoMdct, /* i/o: MDCT stereo decoder structure   */
     Decoder_State **sts,                     /* i/o: decoder state structure         */
     const int16_t mct_on,                    /* i  : flag mct block (1) or stereo (0)*/
-#ifdef LBR_SBA_CORE_CODING_TUNING
     const int16_t isSBAStereoMode,           /* i  : flag core coding for sba        */
-#endif
     Decoder_State *st0,                      /* i/o: decoder state structure for Bstr*/
     int16_t ms_mask[NB_DIV][MAX_SFB]         /* o  : bandwise MS mask                */
 )
@@ -69,9 +67,7 @@ void parse_stereo_from_bitstream(
 #ifdef DEBUGGING
     int16_t nbits_start = st0->next_bit_pos;
 #endif
-#ifdef LBR_SBA_CORE_CODING_TUNING
     if ( !isSBAStereoMode )
-#endif
     {
         nSubframes = ( sts[0]->core == TCX_10_CORE || ( sts[0]->core != sts[1]->core ) ) ? NB_DIV : 1;
         sfbConf = ( sts[0]->core == TCX_20_CORE ) ? &hStereoMdct->stbParamsTCX20 : &hStereoMdct->stbParamsTCX10;
diff --git a/lib_enc/ivas_cpe_enc.c b/lib_enc/ivas_cpe_enc.c
old mode 100755
new mode 100644
index 25cba61cc4244299b459d7cc7d17999c3b5e3efb..b543761491bd57c201045f9c42280183bda1feaa
--- a/lib_enc/ivas_cpe_enc.c
+++ b/lib_enc/ivas_cpe_enc.c
@@ -187,11 +187,7 @@ ivas_error ivas_cpe_enc(
      * dynamically allocate data structures depending on the actual stereo mode
      *----------------------------------------------------------------*/
 
-#ifdef LBR_SBA_CORE_CODING_TUNING
     if ( ( error = stereo_memory_enc( hCPE, input_Fs, max_bwidth, &tdm_last_ratio, ivas_format, st_ivas->nchan_transport ) ) != IVAS_ERR_OK )
-#else
-    if ( ( error = stereo_memory_enc( hCPE, input_Fs, max_bwidth, &tdm_last_ratio, ivas_format ) ) != IVAS_ERR_OK )
-#endif
     {
         return error;
     }
@@ -323,9 +319,7 @@ ivas_error ivas_cpe_enc(
             hCPE->hStereoMdct->mdct_stereo_mode_cmdl = hEncoderConfig->stereo_mode_cmdl;
 #endif
             initMdctStereoEncData( hCPE->hStereoMdct, ivas_format, hCPE->element_mode, hCPE->element_brate, max_bwidth, 0, NULL, 0 );
-#ifdef LBR_SBA_CORE_CODING_TUNING
-            hCPE->hStereoMdct->isSBAStereoMode = ( (ivas_format == SBA_FORMAT) && (st_ivas->nchan_transport == 2) );
-#endif
+            hCPE->hStereoMdct->isSBAStereoMode = ( ( ivas_format == SBA_FORMAT ) && ( st_ivas->nchan_transport == 2 ) );
         }
     }
 
@@ -495,9 +489,7 @@ ivas_error ivas_cpe_enc(
         if ( sts[0]->bwidth != sts[0]->last_bwidth || ( ( hCPE->last_element_brate != hCPE->element_brate || hCPE->last_element_mode != hCPE->element_mode ) && sts[0]->bwidth != sts[0]->max_bwidth ) )
         {
             initMdctStereoEncData( hCPE->hStereoMdct, ivas_format, hCPE->element_mode, hCPE->element_brate, sts[0]->bwidth, 0, NULL, 0 );
-#ifdef LBR_SBA_CORE_CODING_TUNING
-            hCPE->hStereoMdct->isSBAStereoMode = ( (ivas_format == SBA_FORMAT) && (st_ivas->nchan_transport == 2) );
-#endif
+            hCPE->hStereoMdct->isSBAStereoMode = ( ( ivas_format == SBA_FORMAT ) && ( st_ivas->nchan_transport == 2 ) );
 
             if ( hCPE->element_brate <= MAX_MDCT_ITD_BRATE && ivas_format == STEREO_FORMAT )
             {
@@ -957,9 +949,7 @@ ivas_error create_cpe_enc(
         hCPE->hStereoMdct->mdct_stereo_mode_cmdl = st_ivas->hEncoderConfig->mdct_stereo_mode_cmdl;
 #endif
         initMdctStereoEncData( hCPE->hStereoMdct, ivas_format, hCPE->element_mode, hCPE->element_brate, max_bwidth, 0, NULL, 1 );
-#ifdef LBR_SBA_CORE_CODING_TUNING
-        hCPE->hStereoMdct->isSBAStereoMode = ( (ivas_format == SBA_FORMAT) && (st_ivas->nchan_transport == 2) );
-#endif
+        hCPE->hStereoMdct->isSBAStereoMode = ( ( ivas_format == SBA_FORMAT ) && ( st_ivas->nchan_transport == 2 ) );
 
         if ( hCPE->element_mode == IVAS_CPE_MDCT && element_brate <= MAX_MDCT_ITD_BRATE && ivas_format == STEREO_FORMAT )
         {
diff --git a/lib_enc/ivas_mdct_core_enc.c b/lib_enc/ivas_mdct_core_enc.c
index ceea41bcacadc775c0002172d942dbd4d8ffd6d5..4d9d1f257780ba86b07286d2b5b59c0b6bde895b 100644
--- a/lib_enc/ivas_mdct_core_enc.c
+++ b/lib_enc/ivas_mdct_core_enc.c
@@ -713,11 +713,7 @@ void ivas_mdct_core_whitening_enc(
 
     sts[0]->hTcxEnc->fUseTns[1] = 0;
 
-    if ( sts[0]->element_brate < IVAS_80k && sts[0]->core == sts[1]->core && sts[0]->element_mode == IVAS_CPE_MDCT && !mct_on
-#ifdef LBR_SBA_CORE_CODING_TUNING
-         && !hCPE->hStereoMdct->isSBAStereoMode
-#endif
-    )
+    if ( sts[0]->element_brate < IVAS_80k && sts[0]->core == sts[1]->core && sts[0]->element_mode == IVAS_CPE_MDCT && !mct_on && !hCPE->hStereoMdct->isSBAStereoMode )
     {
         int16_t nSampCore;
         int32_t totalRate;
diff --git a/lib_enc/ivas_sba_enc.c b/lib_enc/ivas_sba_enc.c
index 019c387b93b617a38e3e442a37b8840e5608ef64..b267cd2e6661fce1bd94da1a6f38907dbed826db 100644
--- a/lib_enc/ivas_sba_enc.c
+++ b/lib_enc/ivas_sba_enc.c
@@ -526,9 +526,7 @@ ivas_error ivas_sba_enc_reconfigure(
                 }
 
                 initMdctStereoEncData( st_ivas->hCPE[st_ivas->nCPE - 1]->hStereoMdct, st_ivas->hEncoderConfig->ivas_format, st_ivas->hCPE[st_ivas->nCPE - 1]->element_mode, st_ivas->hCPE[st_ivas->nCPE - 1]->element_brate, st_ivas->hEncoderConfig->max_bwidth, 0, NULL, 1 );
-#ifdef LBR_SBA_CORE_CODING_TUNING
-                st_ivas->hCPE[st_ivas->nCPE - 1]->hStereoMdct->isSBAStereoMode = ( (st_ivas->hEncoderConfig->ivas_format == SBA_FORMAT) && (st_ivas->nchan_transport == 2) );
-#endif
+                st_ivas->hCPE[st_ivas->nCPE - 1]->hStereoMdct->isSBAStereoMode = ( ( st_ivas->hEncoderConfig->ivas_format == SBA_FORMAT ) && ( st_ivas->nchan_transport == 2 ) );
             }
         }
     }
diff --git a/lib_enc/ivas_stat_enc.h b/lib_enc/ivas_stat_enc.h
index 5c1b060facfa71a7e3e359176f5fb45e8b886a16..58b6970d58af865040c487a26283312db6f326d9 100644
--- a/lib_enc/ivas_stat_enc.h
+++ b/lib_enc/ivas_stat_enc.h
@@ -311,9 +311,7 @@ typedef struct stereo_mdct_enc_data_structure
 
     int16_t sw_uncorr;
 
-#ifdef LBR_SBA_CORE_CODING_TUNING
     int16_t isSBAStereoMode;
-#endif
 
 } STEREO_MDCT_ENC_DATA, *STEREO_MDCT_ENC_DATA_HANDLE;
 
diff --git a/lib_enc/ivas_stereo_dmx_evs.c b/lib_enc/ivas_stereo_dmx_evs.c
index 3daa28aa96d40312a93ceb7b06f9054ad0127bfb..409b7b0d56f69130664a6b0d5ca0f4ff67b38e7c 100644
--- a/lib_enc/ivas_stereo_dmx_evs.c
+++ b/lib_enc/ivas_stereo_dmx_evs.c
@@ -153,9 +153,9 @@ static void calc_poc(
     int16_t i, n1, n2;
     int16_t n0, *itdLR;
 #ifndef NTT_REMOVE_EPS_ROM
-	const float *c;
+    const float *c;
 #endif
-	const float *s;
+    const float *s;
     float *P;
     float tmp1, tmp2, Lr, Li, Rr, Ri, gamma, igamma, iN;
     float specPOr[L_FRAME48k], specPOi[L_FRAME48k];
@@ -252,7 +252,7 @@ static void calc_poc(
         specPOi[i] = ( Lr * Ri - Li * Rr ) * tmp1;
         gamma -= igamma;
     }
-    //end NTT_REMOVE_EPS_ROM
+    // end NTT_REMOVE_EPS_ROM
 #else
     for ( i = 1; i < n0; i++ )
     {
@@ -273,7 +273,7 @@ static void calc_poc(
 
         gamma -= igamma;
     }
-#endif //end !NTT_REMOVE_EPS_ROM
+#endif // end !NTT_REMOVE_EPS_ROM
 
     specPOr[n0] = sign( specLr[i] ) * sign( specRr[i] ) * wnd[i * step + bias] * gamma;
 
@@ -398,7 +398,7 @@ static float find_poc_peak(
         cnt[n] = 0;
         cQ[n] = P[Lh - itd_cand[n]];
 
-        peak_range = ( int16_t )( abs( itd_cand[n] ) + hPOC->shift_limit / STEREO_DMX_EVS_FIND_POC_PEAK_TAU ) / STEREO_DMX_EVS_FIND_POC_PEAK_TAU2;
+        peak_range = (int16_t) ( abs( itd_cand[n] ) + hPOC->shift_limit / STEREO_DMX_EVS_FIND_POC_PEAK_TAU ) / STEREO_DMX_EVS_FIND_POC_PEAK_TAU2;
 
         for ( i = 1; i <= peak_range; i++ )
         {
@@ -751,7 +751,7 @@ void stereo_dmx_evs_enc(
     float dmx_data[L_FRAME48k];
     int16_t input_frame;
 
-    input_frame = ( int16_t )( input_Fs / FRAMES_PER_SEC );
+    input_frame = (int16_t) ( input_Fs / FRAMES_PER_SEC );
 
     for ( n = 0; n < input_frame; n++ )
     {
@@ -798,7 +798,7 @@ ivas_error stereo_dmx_evs_init_encoder(
     STEREO_DMX_EVS_ENC_HANDLE hStereoDmxEVS;
     int16_t n, input_frame;
 
-    input_frame = ( int16_t )( input_Fs / FRAMES_PER_SEC );
+    input_frame = (int16_t) ( input_Fs / FRAMES_PER_SEC );
 
     hStereoDmxEVS = NULL;
     if ( ( hStereoDmxEVS = (STEREO_DMX_EVS_ENC_HANDLE) count_malloc( sizeof( STEREO_DMX_EVS_ENC_DATA ) ) ) == NULL )
@@ -840,7 +840,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" ) );
     }
 
-    hStereoDmxEVS->hPOC->shift_limit = ( int16_t )( STEREO_DMX_EVS_SHIFT_LIMIT * input_Fs / 1000 );
+    hStereoDmxEVS->hPOC->shift_limit = (int16_t) ( STEREO_DMX_EVS_SHIFT_LIMIT * input_Fs / 1000 );
     for ( n = 0; n < CPE_CHANNELS; n++ )
     {
         hStereoDmxEVS->hPOC->peakQ[n] = 0.0f;
diff --git a/lib_enc/ivas_stereo_mdct_core_enc.c b/lib_enc/ivas_stereo_mdct_core_enc.c
old mode 100755
new mode 100644
index 00a47e37063a7c061ba96f9fd85d66f73a9ffee4..c41df7b24e0cce019cedd74d3d2d9c747a92ca4f
--- a/lib_enc/ivas_stereo_mdct_core_enc.c
+++ b/lib_enc/ivas_stereo_mdct_core_enc.c
@@ -253,9 +253,7 @@ void stereo_mdct_core_enc(
     /*--------------------------------------------------------------*
      * Stereo Processing
      *---------------------------------------------------------------*/
-#ifdef LBR_SBA_CORE_CODING_TUNING
     if ( !hStereoMdct->isSBAStereoMode )
-#endif
     {
         stereo_coder_tcx( hStereoMdct, sts, ms_mask, mdst_spectrum, inv_spectrum, inv_mdst_spectrum, 0 );
     }
@@ -350,11 +348,8 @@ void stereo_mdct_core_enc(
             for ( n = 0; n < nSubframes; n++ )
             {
                 if ( ( hStereoMdct->mdct_stereo_mode[n] != hStereoMdct->IGFStereoMode[n] ||
-                       hStereoMdct->mdct_stereo_mode[n] == SMDCT_BW_MS )
-#ifdef LBR_SBA_CORE_CODING_TUNING
-                     && !hStereoMdct->isSBAStereoMode
-#endif
-                )
+                       hStereoMdct->mdct_stereo_mode[n] == SMDCT_BW_MS ) &&
+                     !hStereoMdct->isSBAStereoMode )
                 {
                     ProcessStereoIGF( hStereoMdct, sts, ms_mask, orig_spectrum, powerSpec, powerSpecMsInv, inv_spectrum, n, hCPE->hCoreCoder[0]->sp_aud_decision0, hCPE->hCoreCoder[0]->element_brate, 0 );
                 }
@@ -402,18 +397,14 @@ void stereo_mdct_core_enc(
 
     /* correct side bits per channel*/
     sts[0]->side_bits_frame_channel -= SMDCT_NBBITS_SPLIT_RATIO;
-#ifdef LBR_SBA_CORE_CODING_TUNING
     if ( !hStereoMdct->isSBAStereoMode )
-#endif
     {
         stereo_bits = write_stereo_to_bitstream( hStereoMdct, sts, ms_mask, 0, hBstr );
     }
-#ifdef LBR_SBA_CORE_CODING_TUNING
     else
     {
         stereo_bits = 0;
     }
-#endif
     /*--------------------------------------------------------------*
      * Split available bits between channels
      *---------------------------------------------------------------*/
@@ -429,11 +420,7 @@ void stereo_mdct_core_enc(
     nAvailBits -= meta_bits;
 
     nAvailBits -= SMDCT_NBBITS_SPLIT_RATIO;
-#ifdef LBR_SBA_CORE_CODING_TUNING
     splitAvailableBits( nAvailBits, hStereoMdct->split_ratio, hStereoMdct->isSBAStereoMode, &sts[0]->bits_frame_channel, &sts[1]->bits_frame_channel );
-#else
-    splitAvailableBits( nAvailBits, hStereoMdct->split_ratio, &sts[0]->bits_frame_channel, &sts[1]->bits_frame_channel );
-#endif
 #ifdef DEBUG_MODE_MDCT
     dbgwrite( &nAvailBits, sizeof( int16_t ), 1, 1, "./res/nAvailBits" );
 #endif
diff --git a/lib_enc/ivas_stereo_switching_enc.c b/lib_enc/ivas_stereo_switching_enc.c
index 86542995450319a27d531da3167865553a324c07..9075d735952c44fd09fc6c26ac73480cb33bee6b 100644
--- a/lib_enc/ivas_stereo_switching_enc.c
+++ b/lib_enc/ivas_stereo_switching_enc.c
@@ -223,10 +223,8 @@ ivas_error stereo_memory_enc(
     const int16_t max_bwidth,     /* i  : maximum audio bandwidth */
     float *tdm_last_ratio,        /* o  : TD stereo last ratio    */
     const IVAS_FORMAT ivas_format /* i  : ivas format             */
-#ifdef LBR_SBA_CORE_CODING_TUNING
     ,
     const int16_t nchan_transport /* i  : number transport chans  */
-#endif
 )
 {
     Encoder_State *st;
@@ -540,9 +538,7 @@ ivas_error stereo_memory_enc(
 #endif
             initMdctStereoEncData( hCPE->hStereoMdct, ivas_format, hCPE->element_mode, hCPE->element_brate, hCPE->hCoreCoder[0]->max_bwidth, 0, NULL, 1 );
 
-#ifdef LBR_SBA_CORE_CODING_TUNING
-            hCPE->hStereoMdct->isSBAStereoMode = ( (ivas_format == SBA_FORMAT) && (nchan_transport == 2) );
-#endif
+            hCPE->hStereoMdct->isSBAStereoMode = ( ( ivas_format == SBA_FORMAT ) && ( nchan_transport == 2 ) );
 
             if ( hCPE->element_mode == IVAS_CPE_MDCT && hCPE->element_brate <= MAX_MDCT_ITD_BRATE && ivas_format == STEREO_FORMAT )
             {