diff --git a/lib_com/ivas_error.h b/lib_com/ivas_error.h
index c6d18125e296bfbb0310733888cb81a336bc98d5..563b10e39112c34c9c5093d1d50bde1242ca558a 100644
--- a/lib_com/ivas_error.h
+++ b/lib_com/ivas_error.h
@@ -134,9 +134,7 @@ typedef enum
     IVAS_ERR_BITSTREAM_READER_INVALID_FORMAT,
     IVAS_ERR_NO_FILE_OPEN,
     IVAS_ERR_SAMPLING_RATE_UNKNOWN,
-#ifdef FIX_1370_EXTERNAL_ORIENTATION_CHECK
     IVAS_ERR_EXTERNAL_ORIENTATION_INVALID_FORMAT,
-#endif
 
     /*----------------------------------------*
      *    renderer (lib_rend only)            *
@@ -274,10 +272,8 @@ static inline const char *ivas_error_to_string( ivas_error error_code )
             return "Invalid input format";
         case IVAS_ERR_INVALID_INDEX:
             return "Invalid index";
-#ifdef FIX_1370_EXTERNAL_ORIENTATION_CHECK
         case IVAS_ERR_EXTERNAL_ORIENTATION_INVALID_FORMAT:
             return "Euler angles were detected in the input but only Quaternions are supported";
-#endif
         default:
             break;
     }
diff --git a/lib_com/ivas_prot.h b/lib_com/ivas_prot.h
index 01bbfe77540fc6ce56a1c33a2241cd02b88382a5..895cb3ac07a1680669d4de9edae8509c1548e7e4 100755
--- a/lib_com/ivas_prot.h
+++ b/lib_com/ivas_prot.h
@@ -308,14 +308,9 @@ ivas_error ivas_init_decoder(
 
 ivas_error ivas_output_buff_dec(
     float *p_output_f[],                                        /* i/o: output audio buffers                    */
-#ifdef FIX_1330_JBM_MEMORY
     const int16_t nchan_out_buff,                               /* i  : number of output channels               */
     const int16_t Opt_tsm,                                      /* i  : TSM option flag                         */
     DECODER_TC_BUFFER_HANDLE hTcBuffer                          /* i  : TSM buffer handle                       */
-#else
-    const int16_t nchan_out_buff_old,                           /* i  : previous frame number of output channels*/
-    const int16_t nchan_out_buff                                /* i  : number of output channels               */
-#endif
 );
 
 ivas_error stereo_dmx_evs_init_encoder(
@@ -5829,12 +5824,7 @@ void ivas_omasa_separate_object_render_jbm(
     const uint16_t nSamplesRendered,                            /* i  : number of samples rendered              */
     float input_f[][L_FRAME48k],                                /* i  : separated object signal                 */
     float *output_f[],                                          /* o  : rendered time signal                    */
-#ifdef FIX_1330_JBM_MEMORY
     const int16_t subframes_rendered                            /* i  : number of subframes rendered            */
-#else
-    const int16_t subframes_rendered,                           /* i  : number of subframes rendered            */
-    const int16_t slots_rendered                                /* i  : number of CLDFB slots rendered          */
-#endif
 );
 
 void ivas_omasa_encode_masa_to_total(
diff --git a/lib_com/ivas_tools.c b/lib_com/ivas_tools.c
index b63a923a1b0678e4608e2ffa196e6185a62a9ba4..e7ada0a3432364b499f974d3625af3546d294af6 100644
--- a/lib_com/ivas_tools.c
+++ b/lib_com/ivas_tools.c
@@ -198,24 +198,18 @@ void ivas_buffer_deinterleaved_to_interleaved(
 )
 {
     int16_t ch, m;
-#ifdef FIX_1330_JBM_MEMORY
     float buffer[MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS][L_FRAME48k]; /* temp buffer needed when "*audio[]" and "*audio_out[]" are the same */
 
     for ( ch = 0; ch < n_channels; ch++ )
     {
         mvr2r( audio[ch], buffer[ch], frame_length );
     }
-#endif
 
     for ( ch = 0; ch < n_channels; ch++ )
     {
         for ( m = 0; m < frame_length; m++ )
         {
-#ifdef FIX_1330_JBM_MEMORY
             audio_out[m * n_channels + ch] = buffer[ch][m];
-#else
-            audio_out[m * n_channels + ch] = audio[ch][m];
-#endif
         }
     }
 
diff --git a/lib_com/options.h b/lib_com/options.h
index 121cdad56d505faa0d2e7aa177a759fd0cfd9c89..62cb9b3b78724f08aee14e914d2cde8393279942 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -163,9 +163,6 @@
 
 /*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */
 #define TMP_FIX_1119_SPLIT_RENDERING_VOIP               /* FhG: Add error check for unsupported config: split rendering with VoIP mode */
-#define FIX_1330_JBM_MEMORY                             /* VA: issue 1330: memory savings in the JBM decoder */
-#define FIX_1370_EXTERNAL_ORIENTATION_CHECK             /* Nokia: add sanity check for Euler angles for external orientations */
-#define FIX_1371_EARLY_PART_INIT_FASTCONV               /* Nokia: fix uninitialized variable in FASTCONV path of binaural reverb init */
 
 /* #################### End BE switches ################################## */
 
@@ -178,6 +175,7 @@
 #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 NONBE_1328_FIX_NON_LINEARITY                    /* VA: Fix possible issue when computing bwe_exc_extended and previous frame were almost 0  */
 #define NONBE_1321_JBM_ASSERT_BITRATE_SWITCHING         /* FhG: Fix assert being hit in JBM code during rate switching */
+
 /* ##################### End NON-BE switches ########################### */
 
 /* ################## End DEVELOPMENT switches ######################### */
diff --git a/lib_dec/ivas_binRenderer_internal.c b/lib_dec/ivas_binRenderer_internal.c
index 7cd919233e031442c775f5da63ffe3c24a970e0e..8cda55017c4e8c4a8be270e89da91b594acade35 100644
--- a/lib_dec/ivas_binRenderer_internal.c
+++ b/lib_dec/ivas_binRenderer_internal.c
@@ -999,6 +999,7 @@ ivas_error ivas_binRenderer_open(
     if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM || ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV && st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )
     {
         pRoomAcoustics = ( st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) ? &( st_ivas->hRenderConfig->roomAcoustics ) : NULL;
+
         if ( ( error = ivas_binaural_reverb_init( &( hBinRenderer->hReverb ),
                                                   st_ivas->hHrtfStatistics,
                                                   hBinRenderer->conv_band,
@@ -1007,12 +1008,7 @@ ivas_error ivas_binRenderer_open(
                                                   st_ivas->hDecoderConfig->output_Fs,
                                                   st_ivas->hHrtfFastConv->fastconvReverberationTimes,
                                                   st_ivas->hHrtfFastConv->fastconvReverberationEneCorrections,
-#ifdef FIX_1371_EARLY_PART_INIT_FASTCONV
-                                                  NULL
-#else
-                                                  hBinRenderer->earlyPartEneCorrection
-#endif
-                                                  ) ) != IVAS_ERR_OK )
+                                                  NULL ) ) != IVAS_ERR_OK )
 
         {
             return error;
diff --git a/lib_dec/ivas_init_dec.c b/lib_dec/ivas_init_dec.c
index 5989880c14c64d8efdbb22c7589c22d986a3c8ab..2c2f814ab88b811d47b6fe7f01dfddf3b901f8de 100644
--- a/lib_dec/ivas_init_dec.c
+++ b/lib_dec/ivas_init_dec.c
@@ -1252,9 +1252,7 @@ ivas_error ivas_init_decoder(
     int16_t sce_id, cpe_id;
     int16_t numCldfbAnalyses, numCldfbSyntheses;
     int16_t granularity, n_channels_transport_jbm;
-#ifdef FIX_1330_JBM_MEMORY
     int16_t nchan_out_buff;
-#endif
     int32_t output_Fs, ivas_total_brate;
     int32_t delay_ns;
     AUDIO_CONFIG output_config;
@@ -2389,28 +2387,11 @@ ivas_error ivas_init_decoder(
      * Allocate floating-point output audio buffers
      *-----------------------------------------------------------------*/
 
-#ifdef FIX_1330_JBM_MEMORY
     nchan_out_buff = ivas_get_nchan_buffers_dec( st_ivas, st_ivas->sba_analysis_order, ivas_total_brate );
     if ( ( error = ivas_output_buff_dec( st_ivas->p_output_f, nchan_out_buff, hDecoderConfig->Opt_tsm, st_ivas->hTcBuffer ) ) != IVAS_ERR_OK )
     {
         return error;
     }
-#else
-    k = ivas_get_nchan_buffers_dec( st_ivas, st_ivas->sba_analysis_order, ivas_total_brate );
-    for ( n = 0; n < k; n++ )
-    {
-        /* note: these are intra-frame heap memories */
-        if ( ( st_ivas->p_output_f[n] = (float *) malloc( ( 48000 / FRAMES_PER_SEC ) * sizeof( float ) ) ) == NULL )
-        {
-            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for floating-point output audio buffer!\n" ) );
-        }
-    }
-
-    for ( ; n < MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS; n++ )
-    {
-        st_ivas->p_output_f[n] = NULL;
-    }
-#endif
 
     return IVAS_ERR_OK;
 }
@@ -2886,15 +2867,7 @@ void ivas_destroy_dec(
     /* floating-point output audio buffers */
     for ( i = 0; i < MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS; i++ )
     {
-#ifdef FIX_1330_JBM_MEMORY
         st_ivas->p_output_f[i] = NULL;
-#else
-        if ( st_ivas->p_output_f[i] != NULL )
-        {
-            free( st_ivas->p_output_f[i] );
-            st_ivas->p_output_f[i] = NULL;
-        }
-#endif
     }
 
     /* main IVAS handle */
diff --git a/lib_dec/ivas_ism_dec.c b/lib_dec/ivas_ism_dec.c
index 000b5f6ca558610e4b77dc4024517796ec1c8c0a..d89076863af61811128c043d213250c26d8dc4ca 100644
--- a/lib_dec/ivas_ism_dec.c
+++ b/lib_dec/ivas_ism_dec.c
@@ -60,11 +60,7 @@ static ivas_error ivas_ism_bitrate_switching_dec(
     int16_t tc_nchan_tc_new;
     int16_t tc_nchan_allocate_new;
     int16_t tc_granularity_new;
-#ifdef FIX_1330_JBM_MEMORY
     int16_t nchan_out_buff;
-#else
-    int16_t nchan_out_buff, nchan_out_buff_old;
-#endif
 
     nCPE_old = st_ivas->nCPE;
     nSCE_old = st_ivas->nSCE;
@@ -74,9 +70,6 @@ static ivas_error ivas_ism_bitrate_switching_dec(
     st_ivas->ism_mode = last_ism_mode;
     ivas_init_dec_get_num_cldfb_instances( st_ivas, &numCldfbAnalyses_old, &numCldfbSyntheses_old );
     st_ivas->ism_mode = ism_mode;
-#ifndef FIX_1330_JBM_MEMORY
-    nchan_out_buff_old = ivas_get_nchan_buffers_dec( st_ivas, -1, -1 );
-#endif
 
     if ( ( error = ivas_ism_config( st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->nchan_ism, NULL, 0, NULL, NULL, element_brate_tmp, NULL, NULL, 0 ) ) != IVAS_ERR_OK )
     {
@@ -291,17 +284,6 @@ static ivas_error ivas_ism_bitrate_switching_dec(
         return error;
     }
 
-#ifndef FIX_1330_JBM_MEMORY
-    /*-----------------------------------------------------------------*
-     * floating-point output audio buffers
-     *-----------------------------------------------------------------*/
-
-    nchan_out_buff = ivas_get_nchan_buffers_dec( st_ivas, -1, -1 );
-    if ( ( error = ivas_output_buff_dec( st_ivas->p_output_f, nchan_out_buff_old, nchan_out_buff ) ) != IVAS_ERR_OK )
-    {
-        return error;
-    }
-#endif
     /*-----------------------------------------------------------------*
      * JBM TC buffers
      *-----------------------------------------------------------------*/
@@ -343,7 +325,6 @@ static ivas_error ivas_ism_bitrate_switching_dec(
 
         mvs2s( st_ivas->hTcBuffer->subframe_nbslots, st_ivas->hSpatParamRendCom->subframe_nbslots, MAX_JBM_SUBFRAMES_5MS );
     }
-#ifdef FIX_1330_JBM_MEMORY
 
     /*-----------------------------------------------------------------*
      * floating-point output audio buffers
@@ -354,7 +335,6 @@ static ivas_error ivas_ism_bitrate_switching_dec(
     {
         return error;
     }
-#endif
 
     return IVAS_ERR_OK;
 }
diff --git a/lib_dec/ivas_ism_renderer.c b/lib_dec/ivas_ism_renderer.c
index 55a77e0ba8bf0c2db24fb5579614b90b093eeda3..11d797253aa423b253950e3707bf6404e9e97e93 100644
--- a/lib_dec/ivas_ism_renderer.c
+++ b/lib_dec/ivas_ism_renderer.c
@@ -193,25 +193,11 @@ void ivas_ism_render_sf(
         ism_md_subframe_update_jbm = st_ivas->hTcBuffer->nb_subframes - 2;
     }
 
-#ifndef FIX_1330_JBM_MEMORY
-    if ( st_ivas->hDecoderConfig->Opt_tsm )
+    for ( i = 0; i < num_objects; i++ )
     {
-        for ( i = 0; i < num_objects; i++ )
-        {
-            p_tc[i] = &st_ivas->hTcBuffer->tc[i][tc_offset];
-        }
+        mvr2r( &output_f[i][tc_offset], tc_local[i], n_samples_to_render );
+        p_tc[i] = tc_local[i];
     }
-    else
-    {
-#endif
-        for ( i = 0; i < num_objects; i++ )
-        {
-            mvr2r( &output_f[i][tc_offset], tc_local[i], n_samples_to_render );
-            p_tc[i] = tc_local[i];
-        }
-#ifndef FIX_1330_JBM_MEMORY
-    }
-#endif
 
     for ( i = 0; i < nchan_out_woLFE + st_ivas->hIntSetup.num_lfe; i++ )
     {
@@ -436,12 +422,7 @@ void ivas_omasa_separate_object_render_jbm(
     const uint16_t nSamplesRendered, /* i  : number of samples rendered                  */
     float input_f_in[][L_FRAME48k],  /* i  : separated object signal                     */
     float *output_f[],               /* o  : rendered time signal                        */
-#ifdef FIX_1330_JBM_MEMORY
     const int16_t subframes_rendered /* i  : number of subframes rendered                */
-#else
-    const int16_t subframes_rendered, /* i  : number of subframes rendered                */
-    const int16_t slots_rendered      /* i  : number of CLDFB slots rendered              */
-#endif
 )
 {
     VBAP_HANDLE hVBAPdata;
@@ -482,33 +463,15 @@ void ivas_omasa_separate_object_render_jbm(
         num_objects = st_ivas->nchan_ism;
     }
 
-#ifndef FIX_1330_JBM_MEMORY
-    offsetSamples = slots_rendered * hSpatParamRendCom->slot_size;
-
-#endif
     for ( j = 0; j < nchan_out_woLFE + num_lfe; j++ )
     {
         output_f_local[j] = output_f[j];
     }
 
-#ifndef FIX_1330_JBM_MEMORY
-    if ( st_ivas->hDecoderConfig->Opt_tsm )
-    {
-        for ( obj = 0; obj < num_objects; obj++ )
-        {
-            input_f[obj] = &st_ivas->hTcBuffer->tc[obj + 2][offsetSamples];
-        }
-    }
-    else
+    for ( obj = 0; obj < num_objects; obj++ )
     {
-#endif
-        for ( obj = 0; obj < num_objects; obj++ )
-        {
-            input_f[obj] = input_f_in[obj];
-        }
-#ifndef FIX_1330_JBM_MEMORY
+        input_f[obj] = input_f_in[obj];
     }
-#endif
 
     slots_to_render = nSamplesRendered / hSpatParamRendCom->slot_size;
     first_sf = subframes_rendered;
diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec.c
index 711d6a6e380d49cb8a7f5128c2953cbf8461206a..e30f5aebebdd90c9d04b763b2d29e55dd752505f 100644
--- a/lib_dec/ivas_jbm_dec.c
+++ b/lib_dec/ivas_jbm_dec.c
@@ -763,11 +763,7 @@ void ivas_jbm_dec_feed_tc_to_renderer(
     float tmp_buf[MAX_JBM_L_FRAME48k];
     float *p_data_f[FOA_CHANNELS + MAX_NUM_OBJECTS];
     int16_t n, n_render_timeslots, n_ch_cldfb;
-#ifdef FIX_1330_JBM_MEMORY
     int16_t ch, offset, len_offset;
-#else
-    int16_t ch;
-#endif
     DECODER_TC_BUFFER_HANDLE hTcBuffer;
 
     hTcBuffer = st_ivas->hTcBuffer;
@@ -785,7 +781,6 @@ void ivas_jbm_dec_feed_tc_to_renderer(
         n_ch_full_copy = min( hTcBuffer->nchan_transport_jbm, hTcBuffer->nchan_buffer_full );
         n_ch_res_copy = hTcBuffer->nchan_transport_jbm - hTcBuffer->nchan_buffer_full;
 
-#ifdef FIX_1330_JBM_MEMORY
         /* buffers are shared between 'hTcBuffer->tc[]' and 'p_output_f[]':
            in case of 'length(hTcBuffer->tc[]) < length(p_output_f[])', reset of TC buffers
            pointers is needed after ivas_buffer_interleaved_to_deinterleaved() */
@@ -800,7 +795,6 @@ void ivas_jbm_dec_feed_tc_to_renderer(
             }
         }
 
-#endif
         for ( ch = 0; ch < n_ch_full_copy; ch++ )
         {
             mvr2r( hTcBuffer->tc[ch], tmp_buf, nSamplesForRendering );
@@ -2106,9 +2100,7 @@ static ivas_error ivas_jbm_dec_tc_audio_allocate(
     if ( Opt_tsm )
     {
         n_samp_full = ( NS2SA( output_Fs, MAX_JBM_L_FRAME_NS ) );
-#ifdef FIX_1330_JBM_MEMORY
         n_samp_full = max( n_samp_full, L_FRAME48k ); /* buffers are shared between 'hTcBuffer->tc[]' and 'p_output_f[]': ensure minimal length */
-#endif
         n_samp_residual = hTcBuffer->n_samples_granularity - 1;
     }
     else
@@ -2168,10 +2160,8 @@ static ivas_error ivas_jbm_dec_tc_audio_allocate(
         }
     }
 
-#ifdef FIX_1330_JBM_MEMORY
     hTcBuffer->tc_buffer2 = NULL;
 
-#endif
     return IVAS_ERR_OK;
 }
 
@@ -2209,14 +2199,12 @@ static void ivas_jbm_dec_tc_audio_deallocate(
                 hTcBuffer->tc_buffer_old[ch_idx] = NULL;
             }
         }
-#ifdef FIX_1330_JBM_MEMORY
 
         if ( hTcBuffer->tc_buffer2 != NULL )
         {
             free( hTcBuffer->tc_buffer2 );
             hTcBuffer->tc_buffer2 = NULL;
         }
-#endif
     }
 
     return;
@@ -2413,11 +2401,7 @@ static void ivas_jbm_dec_tc_buffer_playout(
 
     for ( ch_idx = 0; ch_idx < st_ivas->hTcBuffer->nchan_transport_jbm; ch_idx++ )
     {
-#ifdef FIX_1330_JBM_MEMORY
         output[ch_idx] = st_ivas->hTcBuffer->tc[ch_idx] + st_ivas->hTcBuffer->n_samples_rendered;
-#else
-        mvr2r( st_ivas->hTcBuffer->tc[ch_idx] + st_ivas->hTcBuffer->n_samples_rendered, output[ch_idx], *nSamplesRendered );
-#endif
     }
 
     st_ivas->hTcBuffer->subframes_rendered = last_sf;
diff --git a/lib_dec/ivas_masa_dec.c b/lib_dec/ivas_masa_dec.c
index 5f4634c3836e01cb346f663b285579919395d073..f44f872abd1296a83c4987726eac0d78577c7cae 100644
--- a/lib_dec/ivas_masa_dec.c
+++ b/lib_dec/ivas_masa_dec.c
@@ -1320,11 +1320,7 @@ ivas_error ivas_masa_dec_reconfigure(
     Decoder_State **sts;
     int32_t ivas_total_brate, last_ivas_total_brate;
     int16_t numCldfbAnalyses_old, numCldfbSyntheses_old;
-#ifdef FIX_1330_JBM_MEMORY
     int16_t nchan_out_buff;
-#else
-    int16_t nchan_out_buff_old, nchan_out_buff;
-#endif
     ivas_error error;
     int16_t pos_idx;
     int32_t ism_total_brate;
@@ -1332,10 +1328,6 @@ ivas_error ivas_masa_dec_reconfigure(
     ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate;
     last_ivas_total_brate = st_ivas->hDecoderConfig->last_ivas_total_brate;
 
-#ifndef FIX_1330_JBM_MEMORY
-    nchan_out_buff_old = ivas_get_nchan_buffers_dec( st_ivas, -1, -1 );
-
-#endif
     /* Copy state to TC buffer if granularity matches and we are not in OMASA EXT rendering mode */
     if ( st_ivas->hSpatParamRendCom != NULL && st_ivas->hSpatParamRendCom->slot_size == st_ivas->hTcBuffer->n_samples_granularity && st_ivas->hDecoderConfig->output_config != IVAS_AUDIO_CONFIG_EXTERNAL )
     {
@@ -1573,11 +1565,7 @@ ivas_error ivas_masa_dec_reconfigure(
     if ( st_ivas->ivas_format == MASA_FORMAT && st_ivas->last_ivas_format == MASA_FORMAT ) /* note: switching with OMASA is addressed in ivas_omasa_dec_config() */
     {
         nchan_out_buff = ivas_get_nchan_buffers_dec( st_ivas, -1, -1 );
-#ifdef FIX_1330_JBM_MEMORY
         if ( ( error = ivas_output_buff_dec( st_ivas->p_output_f, nchan_out_buff, st_ivas->hDecoderConfig->Opt_tsm, st_ivas->hTcBuffer ) ) != IVAS_ERR_OK )
-#else
-        if ( ( error = ivas_output_buff_dec( st_ivas->p_output_f, nchan_out_buff_old, nchan_out_buff ) ) != IVAS_ERR_OK )
-#endif
         {
             return error;
         }
diff --git a/lib_dec/ivas_mct_dec.c b/lib_dec/ivas_mct_dec.c
index 2ea644dbd2abee742ddd2c43aa5da719557d0bf8..eaa094b68bbedb956823e0b04baa002be3e19a2f 100644
--- a/lib_dec/ivas_mct_dec.c
+++ b/lib_dec/ivas_mct_dec.c
@@ -732,17 +732,10 @@ static ivas_error ivas_mc_dec_reconfig(
     int16_t tc_nchan_tc_new;
     int16_t tc_nchan_allocate_new;
     int16_t tc_granularity_new;
-#ifdef FIX_1330_JBM_MEMORY
     int16_t nchan_out_buff;
-#else
-    int16_t nchan_out_buff_old, nchan_out_buff;
-#endif
 
     ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate;
     nchan_transport_old = st_ivas->nchan_transport;
-#ifndef FIX_1330_JBM_MEMORY
-    nchan_out_buff_old = ivas_get_nchan_buffers_dec( st_ivas, -1, -1 );
-#endif
     last_mc_mode = ivas_mc_mode_select( ivas_mc_map_output_config_to_mc_ls_setup( st_ivas->transport_config ), st_ivas->hDecoderConfig->last_ivas_total_brate ); /* NB: this assumes that LS config remains the same between frames */
 
     /* temporally set the current mc_mode back to the previous one to make sure the following call to
@@ -1393,11 +1386,7 @@ static ivas_error ivas_mc_dec_reconfig(
      *-----------------------------------------------------------------*/
 
     nchan_out_buff = ivas_get_nchan_buffers_dec( st_ivas, -1, -1 );
-#ifdef FIX_1330_JBM_MEMORY
     if ( ( error = ivas_output_buff_dec( st_ivas->p_output_f, nchan_out_buff, st_ivas->hDecoderConfig->Opt_tsm, st_ivas->hTcBuffer ) ) != IVAS_ERR_OK )
-#else
-    if ( ( error = ivas_output_buff_dec( st_ivas->p_output_f, nchan_out_buff_old, nchan_out_buff ) ) != IVAS_ERR_OK )
-#endif
     {
         return error;
     }
diff --git a/lib_dec/ivas_omasa_dec.c b/lib_dec/ivas_omasa_dec.c
index 628d6b4d2474718c6a7a8ec676215e6ff1dcfb93..279dfe6931b02269e831481f7b4341d9e3bd8b81 100644
--- a/lib_dec/ivas_omasa_dec.c
+++ b/lib_dec/ivas_omasa_dec.c
@@ -200,11 +200,7 @@ ivas_error ivas_omasa_dec_config(
     int32_t ivas_total_brate, ism_total_brate, cpe_brate;
     ISM_MODE ism_mode_old;
     IVAS_FORMAT ivas_format_orig;
-#ifdef FIX_1330_JBM_MEMORY
     int16_t nchan_out_buff;
-#else
-    int16_t nchan_out_buff, nchan_out_buff_old;
-#endif
     ivas_error error;
     RENDERER_TYPE old_renderer_type;
 
@@ -219,9 +215,6 @@ ivas_error ivas_omasa_dec_config(
     ivas_format_orig = st_ivas->ivas_format;
     st_ivas->ivas_format = st_ivas->last_ivas_format;
     ivas_init_dec_get_num_cldfb_instances( st_ivas, &numCldfbAnalyses_old, &numCldfbSyntheses_old );
-#ifndef FIX_1330_JBM_MEMORY
-    nchan_out_buff_old = ivas_get_nchan_buffers_dec( st_ivas, -1, -1 );
-#endif
     st_ivas->ivas_format = ivas_format_orig;
 
     nSCE_old = st_ivas->nSCE;
@@ -475,11 +468,7 @@ ivas_error ivas_omasa_dec_config(
          *-----------------------------------------------------------------*/
 
         nchan_out_buff = ivas_get_nchan_buffers_dec( st_ivas, -1, -1 );
-#ifdef FIX_1330_JBM_MEMORY
         if ( ( error = ivas_output_buff_dec( st_ivas->p_output_f, nchan_out_buff, st_ivas->hDecoderConfig->Opt_tsm, st_ivas->hTcBuffer ) ) != IVAS_ERR_OK )
-#else
-        if ( ( error = ivas_output_buff_dec( st_ivas->p_output_f, nchan_out_buff_old, nchan_out_buff ) ) != IVAS_ERR_OK )
-#endif
         {
             return error;
         }
@@ -682,84 +671,55 @@ void ivas_omasa_dirac_rend_jbm(
 )
 {
     int16_t subframes_rendered;
-#ifndef FIX_1330_JBM_MEMORY
-    int16_t slots_rendered;
-#endif
     int16_t n;
     float data_separated_objects[MAX_NUM_OBJECTS][L_FRAME48k];
 
-#ifndef FIX_1330_JBM_MEMORY
-    if ( !st_ivas->hDecoderConfig->Opt_tsm )
+    *nSamplesRendered = min( nSamplesAsked, st_ivas->hTcBuffer->n_samples_available );
+
+    if ( st_ivas->ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ || st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ )
     {
-#endif
-        *nSamplesRendered = min( nSamplesAsked, st_ivas->hTcBuffer->n_samples_available );
+        mvr2r( &output_f[CPE_CHANNELS][st_ivas->hTcBuffer->n_samples_rendered], data_separated_objects[0], *nSamplesRendered );
 
-        if ( st_ivas->ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ || st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ )
+        if ( !st_ivas->hDecoderConfig->Opt_tsm && st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ )
         {
-            mvr2r( &output_f[CPE_CHANNELS][st_ivas->hTcBuffer->n_samples_rendered], data_separated_objects[0], *nSamplesRendered );
-
-#ifdef FIX_1330_JBM_MEMORY
-            if ( !st_ivas->hDecoderConfig->Opt_tsm && st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ )
-#else
-        if ( st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ )
-#endif
+            /* Gain separated object, if edited */
+            for ( n = 0; n < st_ivas->nchan_ism; n++ )
             {
-                /* Gain separated object, if edited */
-                for ( n = 0; n < st_ivas->nchan_ism; n++ )
+                if ( st_ivas->hMasaIsmData->ism_gain_is_edited[n] && st_ivas->hMasaIsmData->idx_separated_ism == n )
                 {
-                    if ( st_ivas->hMasaIsmData->ism_gain_is_edited[n] && st_ivas->hMasaIsmData->idx_separated_ism == n )
-                    {
-                        v_multc( data_separated_objects[0], st_ivas->hMasaIsmData->gain_ism_edited[n], data_separated_objects[0], *nSamplesRendered );
-                    }
+                    v_multc( data_separated_objects[0], st_ivas->hMasaIsmData->gain_ism_edited[n], data_separated_objects[0], *nSamplesRendered );
                 }
             }
         }
-        else
+    }
+    else
+    {
+        for ( n = 0; n < st_ivas->nchan_ism; n++ )
         {
-            for ( n = 0; n < st_ivas->nchan_ism; n++ )
-            {
-                mvr2r( &output_f[n + CPE_CHANNELS][st_ivas->hTcBuffer->n_samples_rendered], data_separated_objects[n], *nSamplesRendered );
+            mvr2r( &output_f[n + CPE_CHANNELS][st_ivas->hTcBuffer->n_samples_rendered], data_separated_objects[n], *nSamplesRendered );
 
-                /* Gain discrete objects, if edited */
-#ifdef FIX_1330_JBM_MEMORY
-                if ( !st_ivas->hDecoderConfig->Opt_tsm && st_ivas->hMasaIsmData->ism_gain_is_edited[n] )
-#else
-            if ( st_ivas->hMasaIsmData->ism_gain_is_edited[n] )
-#endif
-                {
-                    v_multc( data_separated_objects[n], st_ivas->hMasaIsmData->gain_ism_edited[n], data_separated_objects[n], *nSamplesRendered );
-                }
+            /* Gain discrete objects, if edited */
+            if ( !st_ivas->hDecoderConfig->Opt_tsm && st_ivas->hMasaIsmData->ism_gain_is_edited[n] )
+            {
+                v_multc( data_separated_objects[n], st_ivas->hMasaIsmData->gain_ism_edited[n], data_separated_objects[n], *nSamplesRendered );
             }
+        }
 
-            /* Gain MASA part, if edited */
-#ifdef FIX_1330_JBM_MEMORY
-            if ( !st_ivas->hDecoderConfig->Opt_tsm && st_ivas->hMasaIsmData->masa_gain_is_edited )
-#else
-        if ( st_ivas->hMasaIsmData->masa_gain_is_edited )
-#endif
+        /* Gain MASA part, if edited */
+        if ( !st_ivas->hDecoderConfig->Opt_tsm && st_ivas->hMasaIsmData->masa_gain_is_edited )
+        {
+            for ( int16_t ch = 0; ch < 2; ch++ )
             {
-                for ( int16_t ch = 0; ch < 2; ch++ )
-                {
-                    v_multc( output_f[ch], st_ivas->hMasaIsmData->gain_masa_edited, output_f[ch], *nSamplesRendered );
-                }
+                v_multc( output_f[ch], st_ivas->hMasaIsmData->gain_masa_edited, output_f[ch], *nSamplesRendered );
             }
         }
-#ifndef FIX_1330_JBM_MEMORY
     }
-#endif
 
     subframes_rendered = st_ivas->hSpatParamRendCom->subframes_rendered;
-#ifndef FIX_1330_JBM_MEMORY
-    slots_rendered = st_ivas->hSpatParamRendCom->slots_rendered;
-#endif
 
     ivas_dirac_dec_render( st_ivas, nchan_transport, nSamplesAsked, nSamplesRendered, nSamplesAvailable, output_f );
 
-#ifdef FIX_1330_JBM_MEMORY
     ivas_omasa_separate_object_render_jbm( st_ivas, *nSamplesRendered, data_separated_objects, output_f, subframes_rendered );
-#else
-    ivas_omasa_separate_object_render_jbm( st_ivas, *nSamplesRendered, data_separated_objects, output_f, subframes_rendered, slots_rendered );
-#endif
 
     return;
 }
diff --git a/lib_dec/ivas_osba_dec.c b/lib_dec/ivas_osba_dec.c
index a3ff4aa5df1b7eeacfa5c474ae635a2d0ad857db..8f790bde916f0edd19d915d85d3694905b437287 100644
--- a/lib_dec/ivas_osba_dec.c
+++ b/lib_dec/ivas_osba_dec.c
@@ -258,70 +258,35 @@ ivas_error ivas_osba_render_sf(
 )
 {
     int16_t n;
-#ifdef FIX_1330_JBM_MEMORY
     float output_sba[MAX_OUTPUT_CHANNELS][L_FRAME48k];
     float *p_output_sba[MAX_OUTPUT_CHANNELS];
-#else
-    float output_ism[MAX_OUTPUT_CHANNELS][L_FRAME48k];
-    float *p_output_ism[MAX_OUTPUT_CHANNELS];
-#endif
     ivas_error error;
 
     for ( n = 0; n < MAX_OUTPUT_CHANNELS; n++ )
     {
-#ifdef FIX_1330_JBM_MEMORY
         p_output_sba[n] = output_sba[n];
-#else
-        p_output_ism[n] = &output_ism[n][0];
-#endif
-    }
-
-#ifndef FIX_1330_JBM_MEMORY
-    if ( !st_ivas->hDecoderConfig->Opt_tsm )
-    {
-        int16_t tc_offset;
-        tc_offset = st_ivas->hTcBuffer->n_samples_rendered;
-        for ( n = 0; n < st_ivas->nchan_ism; n++ )
-        {
-            mvr2r( &p_output[n][tc_offset], &output_ism[n][tc_offset], nSamplesAsked );
-        }
     }
-#endif
 
-#ifdef FIX_1330_JBM_MEMORY
     if ( ( error = ivas_sba_dec_render( st_ivas, nSamplesAsked, nSamplesRendered, nSamplesAvailableNext, p_output_sba ) ) != IVAS_ERR_OK )
-#else
-    if ( ( error = ivas_sba_dec_render( st_ivas, nSamplesAsked, nSamplesRendered, nSamplesAvailableNext, p_output ) ) != IVAS_ERR_OK )
-#endif
     {
         return error;
     }
 
     if ( st_ivas->renderer_type != RENDERER_BINAURAL_FASTCONV_ROOM )
     {
-#ifdef FIX_1330_JBM_MEMORY
         ivas_ism_render_sf( st_ivas, st_ivas->renderer_type, p_output, *nSamplesRendered );
-#else
-        ivas_ism_render_sf( st_ivas, st_ivas->renderer_type, p_output_ism, *nSamplesRendered );
-#endif
     }
 
     for ( n = 0; n < st_ivas->hDecoderConfig->nchan_out; n++ )
     {
         if ( st_ivas->renderer_type != RENDERER_BINAURAL_FASTCONV_ROOM )
         {
-#ifdef FIX_1330_JBM_MEMORY
             v_add( p_output[n], p_output_sba[n], p_output[n], *nSamplesRendered );
-#else
-            v_add( p_output[n], p_output_ism[n], p_output[n], *nSamplesRendered );
-#endif
         }
-#ifdef FIX_1330_JBM_MEMORY
         else
         {
             mvr2r( p_output_sba[n], p_output[n], *nSamplesRendered );
         }
-#endif
     }
 
     return IVAS_ERR_OK;
diff --git a/lib_dec/ivas_sba_dec.c b/lib_dec/ivas_sba_dec.c
index a11fb37d54e1495508fa719d06ea1b55f179efa4..4f4fb83f22e2dc5f6aa2a0ba74f58116507d12b8 100644
--- a/lib_dec/ivas_sba_dec.c
+++ b/lib_dec/ivas_sba_dec.c
@@ -111,12 +111,7 @@ ivas_error ivas_sba_dec_reconfigure(
     int32_t ivas_total_brate;
     int32_t last_ivas_total_brate;
     int16_t num_channels, num_md_sub_frames;
-#ifdef FIX_1330_JBM_MEMORY
     int16_t nchan_out_buff;
-#else
-    int16_t nchan_out_buff, nchan_out_buff_old;
-    int16_t sba_analysis_order_old_flush;
-#endif
     DECODER_CONFIG_HANDLE hDecoderConfig;
     ivas_error error;
     ISM_MODE ism_mode_old;
@@ -127,18 +122,12 @@ ivas_error ivas_sba_dec_reconfigure(
     hDecoderConfig = st_ivas->hDecoderConfig;
     ivas_total_brate = hDecoderConfig->ivas_total_brate;
     last_ivas_total_brate = st_ivas->last_active_ivas_total_brate;
-#ifndef FIX_1330_JBM_MEMORY
-    sba_analysis_order_old_flush = st_ivas->sba_analysis_order;
-#endif
 
     /*-----------------------------------------------------------------*
      * Set SBA high-level parameters
      * Save old SBA high-level parameters
      *-----------------------------------------------------------------*/
 
-#ifndef FIX_1330_JBM_MEMORY
-    nchan_out_buff_old = ivas_get_nchan_buffers_dec( st_ivas, sba_analysis_order_old_flush, last_ivas_total_brate );
-#endif
     ivas_init_dec_get_num_cldfb_instances( st_ivas, &numCldfbAnalyses_old, &numCldfbSyntheses_old );
     nchan_hp20_old = getNumChanSynthesis( st_ivas );
 
@@ -620,11 +609,7 @@ ivas_error ivas_sba_dec_reconfigure(
      *-----------------------------------------------------------------*/
 
     nchan_out_buff = ivas_get_nchan_buffers_dec( st_ivas, st_ivas->sba_analysis_order, st_ivas->hDecoderConfig->ivas_total_brate );
-#ifdef FIX_1330_JBM_MEMORY
     if ( ( error = ivas_output_buff_dec( st_ivas->p_output_f, nchan_out_buff, hDecoderConfig->Opt_tsm, st_ivas->hTcBuffer ) ) != IVAS_ERR_OK )
-#else
-    if ( ( error = ivas_output_buff_dec( st_ivas->p_output_f, nchan_out_buff_old, nchan_out_buff ) ) != IVAS_ERR_OK )
-#endif
     {
         return error;
     }
diff --git a/lib_dec/ivas_stat_dec.h b/lib_dec/ivas_stat_dec.h
index b93bb8bf562e147286c596a15a933ef7b10de749..0f0ad4cedba35a0529c345d40c95669a80fb8a85 100644
--- a/lib_dec/ivas_stat_dec.h
+++ b/lib_dec/ivas_stat_dec.h
@@ -964,10 +964,8 @@ typedef struct decoder_tc_buffer_structure
     int16_t num_slots;
     int16_t n_samples_discard; /* number of samples to discard from the beginning of the output */
 
-#ifdef FIX_1330_JBM_MEMORY
     float *tc_buffer2; /* non-scaled buffer of output audio - needed only when '*tc_buffer* is not long enough */
 
-#endif
 } DECODER_TC_BUFFER, *DECODER_TC_BUFFER_HANDLE;
 
 typedef struct jbm_metadata_structure
diff --git a/lib_rend/ivas_output_init.c b/lib_rend/ivas_output_init.c
index 460bf182a3d0446c4ee0a43fa28b93850209f470..01e1d77231ff06fc84f35a4ca20448a53e8b2729 100644
--- a/lib_rend/ivas_output_init.c
+++ b/lib_rend/ivas_output_init.c
@@ -368,18 +368,12 @@ int16_t ivas_get_nchan_buffers_dec(
  *-------------------------------------------------------------------*/
 
 ivas_error ivas_output_buff_dec(
-    float *p_output_f[], /* i/o: output audio buffers                       */
-#ifdef FIX_1330_JBM_MEMORY
+    float *p_output_f[],               /* i/o: output audio buffers                       */
     const int16_t nchan_out_buff,      /* i  : number of output channels                  */
     const int16_t Opt_tsm,             /* i  : TSM option flag                            */
     DECODER_TC_BUFFER_HANDLE hTcBuffer /* i  : TSM buffer handle                          */
-#else
-    const int16_t nchan_out_buff_old, /* i  : previous frame number of output channels   */
-    const int16_t nchan_out_buff      /* i  : number of output channels                  */
-#endif
 )
 {
-#ifdef FIX_1330_JBM_MEMORY
     int16_t ch, nchan_tc_jbm, nsamp_to_allocate, n_samp_full, offset;
 
     for ( ch = 0; ch < MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS; ch++ )
@@ -437,35 +431,6 @@ ivas_error ivas_output_buff_dec(
             offset += n_samp_full;
         }
     }
-#else
-    int16_t ch;
-
-    if ( nchan_out_buff > nchan_out_buff_old )
-    {
-        for ( ch = nchan_out_buff_old; ch < nchan_out_buff; ch++ )
-        {
-#ifdef DEBUGGING
-            if ( p_output_f[ch] != NULL )
-            {
-                return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Memory for floating-point output audio buffer is already allocated!\n" ) );
-            }
-#endif
-            /* note: these are intra-frame heap memories */
-            if ( ( p_output_f[ch] = (float *) malloc( ( 48000 / FRAMES_PER_SEC ) * sizeof( float ) ) ) == NULL )
-            {
-                return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for floating-point output audio buffer!\n" ) );
-            }
-        }
-    }
-    else
-    {
-        for ( ch = nchan_out_buff; ch < nchan_out_buff_old; ch++ )
-        {
-            free( p_output_f[ch] );
-            p_output_f[ch] = NULL;
-        }
-    }
-#endif
 
     return IVAS_ERR_OK;
 }
diff --git a/lib_rend/ivas_reverb.c b/lib_rend/ivas_reverb.c
index 3119f5fdf9a355a531929c9aaff3d8187c0dc8e8..c12fa8488b9e296dafe48d3be75d392b5e7f9b09 100644
--- a/lib_rend/ivas_reverb.c
+++ b/lib_rend/ivas_reverb.c
@@ -1924,23 +1924,17 @@ ivas_error ivas_binaural_reverb_init(
             energyModifier = ( adjustedRevTime - revTimes[bin] ) / adjustedRevTime;
 
             /* Adjust early and late energies, by moving late energy to early energy */
-#ifdef FIX_1371_EARLY_PART_INIT_FASTCONV
             if ( earlyEne != NULL )
             {
                 adjustedEarlyEne = earlyEne[bin] + revEne[bin] * energyModifier;
                 earlyEne[bin] = adjustedEarlyEne; /* Store already here */
             }
-#else
-            adjustedEarlyEne = earlyEne[bin] + revEne[bin] * energyModifier;
-#endif
+
             adjustedLateEne = revEne[bin] * ( 1.0f - energyModifier );
 
             /* Store adjusted room effect parameters to be used in reverb processing */
             revTimes[bin] = adjustedRevTime;
             revEne[bin] = adjustedLateEne;
-#ifndef FIX_1371_EARLY_PART_INIT_FASTCONV
-            earlyEne[bin] = adjustedEarlyEne;
-#endif
         }
     }
 
diff --git a/lib_util/rotation_file_reader.c b/lib_util/rotation_file_reader.c
index 6c62290b002e4c9a6aeb9d268c10a6aeb369b0fb..cbf36e42ba56ae54f35834971d6bcae38d81d100 100644
--- a/lib_util/rotation_file_reader.c
+++ b/lib_util/rotation_file_reader.c
@@ -174,14 +174,12 @@ ivas_error ExternalOrientationFileReading(
     }
 
     ( externalOrientationReader->frameCounter )++;
-#ifdef FIX_1370_EXTERNAL_ORIENTATION_CHECK
 
     /* Only Quaternion orientations are supported, raise an error if Euler angles are detected in the input */
     if ( w == -3.0f )
     {
         return IVAS_ERR_EXTERNAL_ORIENTATION_INVALID_FORMAT;
     }
-#endif
 
     pQuaternion->w = w;
     pQuaternion->x = x;