diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec.c
index 20a6981221bc93deb02a1cec5e143af74eabda3e..1a916d7fdc875950eb7326fd037f3be421ecae04 100644
--- a/lib_dec/ivas_jbm_dec.c
+++ b/lib_dec/ivas_jbm_dec.c
@@ -2273,12 +2273,7 @@ ivas_error ivas_jbm_dec_tc_buffer_open(
     const int16_t n_samples_granularity     /* i  : granularity of the renderer/buffer  */
 )
 {
-
-#ifdef NONBE_FIX_1070_USAN_SEGFAULT_MC_TO_BIN_BTSW_HEADROT
-    int32_t nsamp_to_allocate;
-#else
     int16_t nsamp_to_allocate;
-#endif
     DECODER_TC_BUFFER_HANDLE hTcBuffer;
     int16_t nMaxSlotsPerSubframe;
     int16_t nchan_residual;
@@ -2353,15 +2348,13 @@ ivas_error ivas_jbm_dec_tc_buffer_open(
         {
             if ( st_ivas->hDecoderConfig->Opt_tsm )
             {
+                /* note: the maximum buffer length is for OSBA DISC mode with ISMs -> 15*(1920+239)=32385 samples */
                 if ( ( hTcBuffer->tc_buffer = (float *) malloc( nsamp_to_allocate * sizeof( float ) ) ) == NULL )
                 {
                     return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for JBM TC Buffer\n" ) );
                 }
-#ifdef NONBE_FIX_1070_USAN_SEGFAULT_MC_TO_BIN_BTSW_HEADROT
-                set_zero_l( hTcBuffer->tc_buffer, nsamp_to_allocate );
-#else
                 set_zero( hTcBuffer->tc_buffer, nsamp_to_allocate );
-#endif
+
                 offset = 0;
                 for ( ch_idx = 0; ch_idx < hTcBuffer->nchan_buffer_full; ch_idx++ )
                 {
@@ -2406,12 +2399,7 @@ ivas_error ivas_jbm_dec_tc_buffer_reconfigure(
     const int16_t n_samples_granularity     /* i  : new granularity of the renderer/buffer  */
 )
 {
-#ifdef NONBE_FIX_1070_USAN_SEGFAULT_MC_TO_BIN_BTSW_HEADROT
-    int32_t nsamp_to_allocate, offset;
-    int16_t n_samp_full, n_samp_residual, nchan_residual;
-#else
     int16_t nsamp_to_allocate, n_samp_full, n_samp_residual, offset, nchan_residual;
-#endif
     int16_t ch_idx;
     DECODER_TC_BUFFER_HANDLE hTcBuffer;
 
@@ -2498,11 +2486,8 @@ ivas_error ivas_jbm_dec_tc_buffer_reconfigure(
             {
                 return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for JBM TC Buffer\n" ) );
             }
-#ifdef NONBE_FIX_1070_USAN_SEGFAULT_MC_TO_BIN_BTSW_HEADROT
-            set_zero_l( hTcBuffer->tc_buffer, nsamp_to_allocate );
-#else
             set_zero( hTcBuffer->tc_buffer, nsamp_to_allocate );
-#endif
+
             offset = 0;
             for ( ch_idx = 0; ch_idx < hTcBuffer->nchan_buffer_full; ch_idx++ )
             {