diff --git a/lib_dec/ivas_dirac_dec.c b/lib_dec/ivas_dirac_dec.c
index 29d8cdb855f2eafbba4f51c8c8b4563b91dc21d0..c807ee688106267aa66bab2c39c3783a7627d034 100644
--- a/lib_dec/ivas_dirac_dec.c
+++ b/lib_dec/ivas_dirac_dec.c
@@ -1579,7 +1579,7 @@ void ivas_dirac_dec_render(
     uint16_t slot_size, n_samples_sf, ch, nchan_intern;
     SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom;
     float *output_f_local[MAX_OUTPUT_CHANNELS];
-    float output_f_local_buff[MAX_OUTPUT_CHANNELS][L_FRAME48k]; // VE2SB: TBV
+    float output_f_local_buff[MAX_OUTPUT_CHANNELS][L_FRAME48k];
 
     hSpatParamRendCom = st_ivas->hSpatParamRendCom;
 
diff --git a/lib_dec/ivas_osba_dec.c b/lib_dec/ivas_osba_dec.c
index 37ddcd37d29b235a163628b5b70395e57bf6e0a5..d42f9aa422a26e7a4db4b58af43463b128e5ef89 100644
--- a/lib_dec/ivas_osba_dec.c
+++ b/lib_dec/ivas_osba_dec.c
@@ -134,7 +134,7 @@ ivas_error ivas_osba_dirac_td_binaural_jbm(
 {
     int16_t n;
     ivas_error error;
-    float output_separated_objects[BINAURAL_CHANNELS][L_FRAME48k]; // VE2SB: TBV
+    float output_separated_objects[BINAURAL_CHANNELS][L_FRAME48k];
     float *p_sepobj[BINAURAL_CHANNELS];
     int16_t channel_offset;
 #ifdef SPLIT_REND_WITH_HEAD_ROT
diff --git a/lib_dec/ivas_sba_rendering_internal.c b/lib_dec/ivas_sba_rendering_internal.c
index 68cbc71d740ad6d9cb3acdb402f1b4ad3f75f635..e42fde58d8965d21eaa95c614787ff2dfc08c814 100644
--- a/lib_dec/ivas_sba_rendering_internal.c
+++ b/lib_dec/ivas_sba_rendering_internal.c
@@ -358,7 +358,7 @@ void ivas_ism2sba_sf(
 {
     int16_t i, j, k;
     float g1, *g2, *tc, *out, gain, prev_gain;
-    float buffer_tmp[HOA3_CHANNELS][L_FRAME48k]; // VE2SB: TBV
+    float buffer_tmp[HOA3_CHANNELS][L_FRAME48k];
     int16_t sba_num_chans;
 
     assert( ( sba_order <= 3 ) && "Only order up to 3 is supported!" );
diff --git a/lib_dec/ivas_stat_dec.h b/lib_dec/ivas_stat_dec.h
index 38efc5012624139cd748882b0a54b38dacf4eecd..c4b8b1147b6e9f9462f7c7b4ef130ddce912195f 100644
--- a/lib_dec/ivas_stat_dec.h
+++ b/lib_dec/ivas_stat_dec.h
@@ -958,16 +958,16 @@ typedef struct ivas_masa_ism_data_structure
 
 typedef struct decoder_tc_buffer_structure
 {
-    float *tc_buffer;                                                                                                                /* the buffer itself                                                        */
-    float *tc[MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS]; /* pointers into the buffer to the beginning of each tc                     */ // VE2SB: TBV
-    TC_BUFFER_MODE tc_buffer_mode;                                                                                                   /* mode of the buffer (no buffering, render buffering, out buffering)       */
-    int16_t nchan_transport_jbm;                                                                                                     /* number of TCs after TC decoding                                          */
-    int16_t nchan_transport_internal;                                                                                                /* total number of TC buffer channels, can include e.g. TD decorr data      */
-    int16_t nchan_buffer_full;                                                                                                       /* number of channels to be fully buffered                                  */
-    int16_t n_samples_available;                                                                                                     /* samples still available for rendering in the current frame               */
-    int16_t n_samples_buffered;                                                                                                      /* full number of samples in the buffer (including spill to next frame)     */
-    int16_t n_samples_rendered;                                                                                                      /* samples already rendered in the current frame                            */
-    int16_t n_samples_granularity;                                                                                                   /* render granularity                                                       */
+    float *tc_buffer;                                 /* the buffer itself                                                        */
+    float *tc[MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS]; /* pointers into the buffer to the beginning of each tc                     */
+    TC_BUFFER_MODE tc_buffer_mode;                    /* mode of the buffer (no buffering, render buffering, out buffering)       */
+    int16_t nchan_transport_jbm;                      /* number of TCs after TC decoding                                          */
+    int16_t nchan_transport_internal;                 /* total number of TC buffer channels, can include e.g. TD decorr data      */
+    int16_t nchan_buffer_full;                        /* number of channels to be fully buffered                                  */
+    int16_t n_samples_available;                      /* samples still available for rendering in the current frame               */
+    int16_t n_samples_buffered;                       /* full number of samples in the buffer (including spill to next frame)     */
+    int16_t n_samples_rendered;                       /* samples already rendered in the current frame                            */
+    int16_t n_samples_granularity;                    /* render granularity                                                       */
     int16_t n_samples_flushed;
     int16_t subframe_nbslots[MAX_JBM_SUBFRAMES_5MS];
     int16_t nb_subframes;