diff --git a/lib_com/options.h b/lib_com/options.h
index cc9730b97e4439b30a6a9ff2d67ad08aadd2e697..22375373d46e87311749323dcd78d3380484115d 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -162,15 +162,12 @@
 /*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */
 #define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */
 #define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */
-#define FIX_2371_REMOVE_UNUSED_ISAR_FCNS                /* Dolby: basop issue 2371: remove unused ISAR-related functions */      
 
 /* #################### End BE switches ################################## */
 
 /* #################### Start NON-BE switches ############################ */
 /* any switch which is non-be wrt. TS 26.258 V3.0 */
 #define FIX_1465_SWB_TBE_RANDOM_VECTOR_CREATION         /* Dolby: issue 1465: Fix constant in create_random_vector() to allow more reliable fixed point port */
-#define FIX_BASOP_2317_UNINIT_VALUE_IN_STEREO_CNG       /* Eri: Basop issue 2317: Uninitialized value read in case of DTX and BW switching   */
-#define FIX_1283_STEREO_DFT_COLLAPSE                    /* FhG: issue 1283: fix for critical issue with DFT stereo core coder */
 #define FIX_BASOP_2396_CONSTANT_STRIDE_IN_TC_BUFFER     /* FhG/VA: basop issue 2396: keep TC channel pointers in one constant place during decoding and rendering */
 /* ##################### End NON-BE switches ########################### */
 
diff --git a/lib_enc/cod_tcx.c b/lib_enc/cod_tcx.c
index ca58cff438409d1419c9b91d1aa18e9b6f989418..84c1bf1229dc2cb737b5e2474f5cb353f8b99cbf 100644
--- a/lib_enc/cod_tcx.c
+++ b/lib_enc/cod_tcx.c
@@ -728,11 +728,7 @@ void ShapeSpectrum(
         hTcxCfg->SFM2 = SFM_Cal( spectrum, min( 200, L_frame ) );
     }
 
-#ifndef FIX_1283_STEREO_DFT_COLLAPSE
-    if ( ( total_brate <= ACELP_13k20 && st->bwidth == SWB ) )
-#else
     if ( ( total_brate <= ACELP_13k20 || ( st->element_brate <= IVAS_16k4 && st->element_mode == IVAS_CPE_DFT ) ) && st->bwidth == SWB )
-#endif
     {
         max_low_pre = 0.f;
         for ( i = 0; i < L_frame; i++ )
@@ -776,12 +772,8 @@ void ShapeSpectrum(
         v_multc( spectrum + L_frame, 1.f / gainlpc[FDNS_NPTS - 1], spectrum + L_frame, L_spec - L_frame );
     }
 
-/* reduce the peaks in the IGF region, to make life of the core-coder easier... */
-#ifndef FIX_1283_STEREO_DFT_COLLAPSE
-    if ( total_brate <= ACELP_13k20 && st->bwidth == SWB )
-#else
+    /* reduce the peaks in the IGF region, to make life of the core-coder easier... */
     if ( ( total_brate <= ACELP_13k20 || ( st->element_brate <= IVAS_16k4 && st->element_mode == IVAS_CPE_DFT ) ) && st->bwidth == SWB )
-#endif
     {
         int16_t dist_low, dist_high;
         float max_fac;
diff --git a/lib_enc/ivas_sce_enc.c b/lib_enc/ivas_sce_enc.c
index afa390b67cd6fe28f3535ca3a7d22cecf36fc889..d95157694d7e7b48b40e04ae920c65f15ec32535 100644
--- a/lib_enc/ivas_sce_enc.c
+++ b/lib_enc/ivas_sce_enc.c
@@ -361,9 +361,7 @@ ivas_error create_sce_enc(
     }
 
     st->total_brate = hSCE->element_brate; /* dummy initialization for getting right pointers initialization of input buffers in init_coder_ace_plus() */
-#ifdef FIX_1283_STEREO_DFT_COLLAPSE
     st->element_brate = -1;
-#endif
     st->mct_chan_mode = MCT_CHAN_MODE_REGULAR;
 
     if ( ( error = init_encoder( st, st_ivas, 0, 0, st_ivas->ism_mode, hSCE->element_brate ) ) != IVAS_ERR_OK )
diff --git a/lib_enc/ivas_stereo_dft_enc.c b/lib_enc/ivas_stereo_dft_enc.c
index 85a1952be12a222b4da1fd327d3df15d8ae5b1c7..1908ec1e6da2c08b0395c19320fea67ff9336adf 100644
--- a/lib_enc/ivas_stereo_dft_enc.c
+++ b/lib_enc/ivas_stereo_dft_enc.c
@@ -2980,14 +2980,9 @@ static void stereo_dft_enc_compute_prm(
     /*------------------------------------------------------------------*
      * Compute Side gains
      *-----------------------------------------------------------------*/
-#ifdef FIX_BASOP_2317_UNINIT_VALUE_IN_STEREO_CNG
     mvr2r( pSideGain, hStereoDft->sidSideGain, STEREO_DFT_BAND_MAX ); /* Copy all sideGain values since BW change may be reverted during CNG */
-#endif
     for ( b = 0; b < hStereoDft->nbands; b++ )
     {
-#ifndef FIX_BASOP_2317_UNINIT_VALUE_IN_STEREO_CNG
-        hStereoDft->sidSideGain[b] = *( pSideGain + b );
-#endif
         /* Quantization */
         if ( flag_quant )
         {
diff --git a/lib_isar/isar_PredDecoder.c b/lib_isar/isar_PredDecoder.c
index 7a87c1f3672953c539274c39466df0495d9818f5..b8aff7a5c7f2dd9adb6fd129d6aee513e401c59e 100644
--- a/lib_isar/isar_PredDecoder.c
+++ b/lib_isar/isar_PredDecoder.c
@@ -342,28 +342,6 @@ int16_t ReadPredictors(
     return iBitsRead;
 }
 
-#ifndef FIX_2371_REMOVE_UNUSED_ISAR_FCNS
-/*-------------------------------------------------------------------*
- * Function SetDecodingPassed()
- *
- *
- *-------------------------------------------------------------------*/
-
-void SetDecodingPassed(
-    PredictionDecoder *psPredictionDecoder )
-{
-    int32_t n, ch;
-    for ( ch = 0; ch < psPredictionDecoder->iChannels; ch++ )
-    {
-        for ( n = 0; n < psPredictionDecoder->iNumSubSets; n++ )
-        {
-            psPredictionDecoder->ppiDecodingFailed[ch][n] = 0;
-        }
-    }
-
-    return;
-}
-#endif
 
 /*-------------------------------------------------------------------*
  * Function AnyDecodingUnresolved()
diff --git a/lib_isar/isar_lcld_prot.h b/lib_isar/isar_lcld_prot.h
index a61b9e68d4868fbc3d946310ac8eea033b7a198c..6598f1a14c559bf5ecd4ca9f38fe6718475bf1df 100644
--- a/lib_isar/isar_lcld_prot.h
+++ b/lib_isar/isar_lcld_prot.h
@@ -313,10 +313,6 @@ int16_t GetNumSubSets(
 int32_t **GetDecodingFailedPrevStatus(
     LCLDDecoder *psLCLDDecoder);
 
-#ifndef FIX_2371_REMOVE_UNUSED_ISAR_FCNS
-void SetDecodingPassed(
-    PredictionDecoder *psPredictionDecoder);
-#endif
 
 void UpdateDecodingUnresolved(
     PredictionDecoder *psPredictionDecoder);