diff --git a/lib_com/ivas_spar_com.c b/lib_com/ivas_spar_com.c
index fa462313d6beb05395520c7048e986171c8a669a..fc4941fe59493d7c8c575cfaf790c80b9f8c24c5 100644
--- a/lib_com/ivas_spar_com.c
+++ b/lib_com/ivas_spar_com.c
@@ -1002,18 +1002,6 @@ static void ivas_calc_post_pred_per_band(
             postpred_cov_re[i][j] = postpred_cov_re[j][i];
         }
     }
-#ifdef SPAR_HOA_DBG
-    /*fprintf(stderr, "\n\n Postpred cov: (band %d)\n", band_idx);
-    for (i = 0; i < num_ch; i++)
-    {
-        for (j = 0; j < num_ch; j++)
-        {
-            fprintf(stderr, "%f, ", postpred_cov_re[i][j]);
-        }
-        fprintf(stderr, "\n");
-    }
-    fprintf(stderr, "\n\n"); */
-#endif
 
     return;
 }
@@ -1646,35 +1634,8 @@ void ivas_compute_spar_params(
 #endif
     );
 
-#ifdef SPAR_HOA_DBG
-    /*fprintf(stderr, "\n\n Prediction Coefficients:\n");
-
-    for (i = 0; i < num_ch - 1; i++)
-    {
-        for (j = start_band; j < end_band; j++)
-        {
-            fprintf(stderr, "%f, ", pred_coeffs_re[i][j]);
-        }
-        fprintf(stderr, "\n");
-    }
-    fprintf(stderr, "\n\n"); */
-#endif
     ivas_create_fullr_dmx_mat( pred_coeffs_re, dm_fv_re, mixer_mat, num_ch, start_band, end_band, active_w, hSparCfg );
 
-#ifdef SPAR_HOA_DBG
-    /*fprintf(stderr, "\n\n 1st DMX matrix (band 0):\n");
-
-    for (i = 0; i < num_ch; i++)
-    {
-        for (j = 0; j < num_ch; j++)
-        {
-            fprintf(stderr, "%f, ", mixer_mat[i][j][0]);
-        }
-        fprintf(stderr, "\n");
-    }
-    fprintf(stderr, "\n\n");*/
-#endif
-
     ivas_get_Wscaling_factor( cov_real, pred_coeffs_re, mixer_mat, start_band, end_band, dtx_vad, num_ch,
                               hSparCfg->num_dmx_chans_per_band, bands_bw, active_w,
                               active_w_vlbr,
diff --git a/lib_dec/ivas_entropy_decoder.c b/lib_dec/ivas_entropy_decoder.c
index 2f8e9bc3bf5d31c0742fd91cd9d9e5eff04062ff..bf91f3e695eb22d40715f4f545b77211756fa2f1 100644
--- a/lib_dec/ivas_entropy_decoder.c
+++ b/lib_dec/ivas_entropy_decoder.c
@@ -356,38 +356,6 @@ void ivas_arith_decode_cmplx_cell_array(
 
             arith_decode_cell_array_diff( cell_dims_diff, st0, num_bands, pArith_re, pArith_re_diff, cell_arr_diff_out, cell_arr_diff );
 
-
-#ifdef SPAR_HOA_DBG
-            /*if ( 0 ) */ /*(pCell_dims[0].dim1 == 12) */
-                          /*{
-                              idx = 0;
-                              fprintf( stdout, "\n\n OLD/NEW: \n\n" );
-                              for ( i = 0; i < num_bands; i++ )
-                              {
-                                  len = ( cell_dims[i].dim1 * cell_dims[i].dim2 );
-                                  fprintf( stdout, "Non-diff Band %d: \n", i );
-              
-                                  for ( j = 0; j < len; j++ )
-                                  {
-                                      fprintf( stdout, ">>%d: %d \n", idx, cell_arr_no_diff[idx] );
-                                      idx++;
-                                  }
-                              }
-                              idx = 0;
-                              for ( i = 0; i < num_bands; i++ )
-                              {
-                                  len = ( cell_dims_diff[i].dim1 * cell_dims_diff[i].dim2 );
-                                  fprintf( stdout, "Diff Band %d: \n", i );
-              
-                                  for ( j = 0; j < len; j++ )
-                                  {
-                                      fprintf( stdout, ">>%d: %d\t %d\n", idx, cell_arr_diff[idx], cell_arr_diff_out[idx] );
-                                      idx++;
-                                  }
-                              }
-                          }*/
-#endif
-
             idx = 0;
             idx1 = 0;
             for ( i = 0; i < num_bands; i++ )
diff --git a/lib_dec/ivas_spar_md_dec.c b/lib_dec/ivas_spar_md_dec.c
index 1a9a87cddf3ef1be2b5095a29b69cb95ecc6ff5a..e280cf5858eff3ee7a84a66f147d397df7bcf203 100644
--- a/lib_dec/ivas_spar_md_dec.c
+++ b/lib_dec/ivas_spar_md_dec.c
@@ -867,143 +867,6 @@ void ivas_spar_md_dec_process(
     ivas_dec_mono_sba_handling( st_ivas, sba_order );
 #endif
 
-#if 0
-    {
-        char f_name[100];
-        int16_t num_bands = nB;
-        int16_t num_subframes = 1, num_block_groups = 1, num_elements = 1, byte_size = sizeof( float );
-        int16_t num_ch = ivas_sba_get_nchan_metadata( sba_order, st_ivas->hDecoderConfig->ivas_total_brate );
-        for ( b = 0; b < num_bands; b++ )
-        {
-            sprintf( f_name, "spar_band_pred_coeffs_dec.bin" );
-            ( b == 0 && frame == 0 ) ? dbgwrite( &num_bands, sizeof( num_bands ), 1, 1, f_name ) : false;
-            num_elements = num_ch - 1;
-            ( b == 0 && frame == 0 ) ? dbgwrite( &num_elements, sizeof( num_elements ), 1, 1, f_name ) : false;
-            ( b == 0 && frame == 0 ) ? dbgwrite( &num_subframes, sizeof( num_subframes ), 1, 1, f_name ) : false;
-            ( b == 0 && frame == 0 ) ? dbgwrite( &num_block_groups, sizeof( num_block_groups ), 1, 1, f_name ) : false;
-            ( b == 0 && frame == 0 ) ? dbgwrite( &byte_size, sizeof( byte_size ), 1, 1, f_name ) : false;
-            for ( j = 0; j < num_ch - 1; j++ )
-            {
-                dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[j], sizeof( float ), 1, 1, f_name );
-            }
-            sprintf( f_name, "spar_band_C_coeffs_dec.bin" );
-            ( b == 0 && frame == 0 ) ? dbgwrite( &num_bands, sizeof( num_bands ), 1, 1, f_name ) : false;
-            num_elements = ( hMdDec->spar_md_cfg.num_decorr_per_band[bw * b] - hMdDec->spar_md_cfg.num_dmx_chans_per_band[bw * b] ) * ( hMdDec->spar_md_cfg.num_dmx_chans_per_band[bw * b] - 1 );
-            ( b == 0 && frame == 0 ) ? dbgwrite( &num_elements, sizeof( num_elements ), 1, 1, f_name ) : false;
-            ( b == 0 && frame == 0 ) ? dbgwrite( &num_subframes, sizeof( num_subframes ), 1, 1, f_name ) : false;
-            ( b == 0 && frame == 0 ) ? dbgwrite( &num_block_groups, sizeof( num_block_groups ), 1, 1, f_name ) : false;
-            ( b == 0 && frame == 0 ) ? dbgwrite( &byte_size, sizeof( byte_size ), 1, 1, f_name ) : false;
-            for ( j = 0; j < ( hMdDec->spar_md_cfg.num_decorr_per_band[bw * b] - hMdDec->spar_md_cfg.num_dmx_chans_per_band[bw * b] ); j++ )
-            {
-                for ( k = 0; k < hMdDec->spar_md_cfg.num_dmx_chans_per_band[bw * b] - 1; k++ )
-                {
-                    dbgwrite( &hMdDec->spar_md.band_coeffs[b].C_re[j][k], sizeof( float ), 1, 1, f_name );
-                }
-            }
-            sprintf( f_name, "spar_band_P_coeffs_dec.bin" );
-            ( b == 0 && frame == 0 ) ? dbgwrite( &num_bands, sizeof( num_bands ), 1, 1, f_name ) : false;
-            num_elements = num_ch - 1;
-            ( b == 0 && frame == 0 ) ? dbgwrite( &num_elements, sizeof( num_elements ), 1, 1, f_name ) : false;
-            ( b == 0 && frame == 0 ) ? dbgwrite( &num_subframes, sizeof( num_subframes ), 1, 1, f_name ) : false;
-            ( b == 0 && frame == 0 ) ? dbgwrite( &num_block_groups, sizeof( num_block_groups ), 1, 1, f_name ) : false;
-            ( b == 0 && frame == 0 ) ? dbgwrite( &byte_size, sizeof( byte_size ), 1, 1, f_name ) : false;
-            for ( j = 0; j < num_ch - 1; j++ )
-            {
-                dbgwrite( &hMdDec->spar_md.band_coeffs[b].P_re[j], sizeof( float ), 1, 1, f_name );
-            }
-        }
-    }
-#endif
-#ifdef DEBUG_LBR_SBA
-    /* Dumping SPAR HOA Coefficients */
-    /*char f_name[100];
-    int16_t nbands = 12;
-    int16_t num_subframes = 1;
-    int16_t num_elements = 7;
-    int16_t num_block_group = 1;
-    int16_t byte_size = sizeof( float );
-
-    sprintf( f_name, "SBA_MD_values_dec_PR.bin" );
-    ( frame == 0 ) ? dbgwrite( &nbands, sizeof( nbands ), 1, 1, f_name ) : false;
-    ( frame == 0 ) ? dbgwrite( &num_elements, sizeof( num_elements ), 1, 1, f_name ) : false;
-    ( frame == 0 ) ? dbgwrite( &num_subframes, sizeof( num_subframes ), 1, 1, f_name ) : false;
-    ( frame == 0 ) ? dbgwrite( &num_block_group, sizeof( num_block_group ), 1, 1, f_name ) : false;
-    ( frame == 0 ) ? dbgwrite( &byte_size, sizeof( byte_size ), 1, 1, f_name ) : false;
-
-    for ( b = 0; b < nbands; b++ )
-    {
-        for ( int16_t sf = 0; sf < num_subframes; sf++ )
-        {
-            for ( int16_t bl = 0; bl < num_block_group; bl++ )
-            {
-                dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[0], byte_size, 1, 1, f_name );
-                dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[1], byte_size, 1, 1, f_name );
-                dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[2], byte_size, 1, 1, f_name );
-                dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[3], byte_size, 1, 1, f_name );
-                dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[4], byte_size, 1, 1, f_name );
-                dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[5], byte_size, 1, 1, f_name );
-                dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[6], byte_size, 1, 1, f_name );
-                // fprintf(stdout, "%f\t%f\t%f\t%d\t%d\n", dirac_md_kbps, spar_md_kbps, sba_md_kbps, qsi, code_strat );
-            }
-        }
-    }
-    nbands = 12; // 6 total, just looking at SPAR
-    num_subframes = 1;
-    num_elements = 12;
-    num_block_group = 1;
-    byte_size = sizeof( float );
-
-    sprintf( f_name, "SBA_MD_values_dec_C.bin" );
-    ( frame == 0 ) ? dbgwrite( &nbands, sizeof( nbands ), 1, 1, f_name ) : false;
-    ( frame == 0 ) ? dbgwrite( &num_elements, sizeof( num_elements ), 1, 1, f_name ) : false;
-    ( frame == 0 ) ? dbgwrite( &num_subframes, sizeof( num_subframes ), 1, 1, f_name ) : false;
-    ( frame == 0 ) ? dbgwrite( &num_block_group, sizeof( num_block_group ), 1, 1, f_name ) : false;
-    ( frame == 0 ) ? dbgwrite( &byte_size, sizeof( byte_size ), 1, 1, f_name ) : false;
-
-    for ( b = 0; b < nbands; b++ )
-    {
-        for ( int16_t sf = 0; sf < num_subframes; sf++ )
-        {
-            for ( int16_t bl = 0; bl < num_block_group; bl++ )
-            {
-                for ( int16_t p = 0; p < 4; p++ )
-                {
-                    for ( int16_t r = 0; r < 3; r++ )
-                    {
-                        dbgwrite( &hMdDec->spar_md.band_coeffs[b].C_re[p][r], byte_size, 1, 1, f_name );
-                    }
-                }
-            }
-        }
-    }
-    nbands = 12; // 6 total, just looking at SPAR
-    num_subframes = 1;
-    num_elements = 4;
-    num_block_group = 1;
-    byte_size = sizeof( float );
-
-    sprintf( f_name, "SBA_MD_values_dec_P.bin" );
-    ( frame == 0 ) ? dbgwrite( &nbands, sizeof( nbands ), 1, 1, f_name ) : false;
-    ( frame == 0 ) ? dbgwrite( &num_elements, sizeof( num_elements ), 1, 1, f_name ) : false;
-    ( frame == 0 ) ? dbgwrite( &num_subframes, sizeof( num_subframes ), 1, 1, f_name ) : false;
-    ( frame == 0 ) ? dbgwrite( &num_block_group, sizeof( num_block_group ), 1, 1, f_name ) : false;
-    ( frame == 0 ) ? dbgwrite( &byte_size, sizeof( byte_size ), 1, 1, f_name ) : false;
-
-    for ( b = 0; b < nbands; b++ )
-    {
-        for ( int16_t sf = 0; sf < num_subframes; sf++ )
-        {
-            for ( int16_t bl = 0; bl < num_block_group; bl++ )
-            {
-                dbgwrite( &hMdDec->spar_md.band_coeffs[b].P_re[0], byte_size, 1, 1, f_name );
-                dbgwrite( &hMdDec->spar_md.band_coeffs[b].P_re[1], byte_size, 1, 1, f_name );
-                dbgwrite( &hMdDec->spar_md.band_coeffs[b].P_re[2], byte_size, 1, 1, f_name );
-                dbgwrite( &hMdDec->spar_md.band_coeffs[b].P_re[3], byte_size, 1, 1, f_name );
-                // fprintf(stdout, "%f\t%f\t%f\t%d\t%d\n", dirac_md_kbps, spar_md_kbps, sba_md_kbps, qsi, code_strat );
-            }
-        }
-    }*/
-#endif
     /* SPAR to DirAC conversion */
     if ( hMdDec->spar_hoa_dirac2spar_md_flag == 1 )
     {
@@ -1054,96 +917,6 @@ void ivas_spar_md_dec_process(
         }
     }
 #endif
-#ifdef DEBUG_LBR_SBA
-    /* Dumping SPAR HOA Coefficients */
-    /*char f_name[100];
-    int16_t nbands = 12;
-    int16_t num_subframes = 1;
-    int16_t num_elements = 7;
-    int16_t num_block_group = 1;
-    int16_t byte_size = sizeof( float );
-
-    sprintf( f_name, "SBA_MD_values_dec_PR.bin" );
-    ( frame == 0 ) ? dbgwrite( &nbands, sizeof( nbands ), 1, 1, f_name ) : false;
-    ( frame == 0 ) ? dbgwrite( &num_elements, sizeof( num_elements ), 1, 1, f_name ) : false;
-    ( frame == 0 ) ? dbgwrite( &num_subframes, sizeof( num_subframes ), 1, 1, f_name ) : false;
-    ( frame == 0 ) ? dbgwrite( &num_block_group, sizeof( num_block_group ), 1, 1, f_name ) : false;
-    ( frame == 0 ) ? dbgwrite( &byte_size, sizeof( byte_size ), 1, 1, f_name ) : false;
-
-    for ( b = 0; b < nbands; b++ )
-    {
-        for ( int16_t sf = 0; sf < num_subframes; sf++ )
-        {
-            for ( int16_t bl = 0; bl < num_block_group; bl++ )
-            {
-                dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[0], byte_size, 1, 1, f_name );
-                dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[1], byte_size, 1, 1, f_name );
-                dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[2], byte_size, 1, 1, f_name );
-                dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[3], byte_size, 1, 1, f_name );
-                dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[4], byte_size, 1, 1, f_name );
-                dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[5], byte_size, 1, 1, f_name );
-                dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[6], byte_size, 1, 1, f_name );
-                // fprintf(stdout, "%f\t%f\t%f\t%d\t%d\n", dirac_md_kbps, spar_md_kbps, sba_md_kbps, qsi, code_strat );
-            }
-        }
-    }
-    nbands = 12; // 6 total, just looking at SPAR
-    num_subframes = 1;
-    num_elements = 12;
-    num_block_group = 1;
-    byte_size = sizeof( float );
-
-    sprintf( f_name, "SBA_MD_values_dec_C.bin" );
-    ( frame == 0 ) ? dbgwrite( &nbands, sizeof( nbands ), 1, 1, f_name ) : false;
-    ( frame == 0 ) ? dbgwrite( &num_elements, sizeof( num_elements ), 1, 1, f_name ) : false;
-    ( frame == 0 ) ? dbgwrite( &num_subframes, sizeof( num_subframes ), 1, 1, f_name ) : false;
-    ( frame == 0 ) ? dbgwrite( &num_block_group, sizeof( num_block_group ), 1, 1, f_name ) : false;
-    ( frame == 0 ) ? dbgwrite( &byte_size, sizeof( byte_size ), 1, 1, f_name ) : false;
-
-    for ( b = 0; b < nbands; b++ )
-    {
-        for ( int16_t sf = 0; sf < num_subframes; sf++ )
-        {
-            for ( int16_t bl = 0; bl < num_block_group; bl++ )
-            {
-                for ( int16_t p = 0; p < 4; p++ )
-                {
-                    for ( int16_t r = 0; r < 3; r++ )
-                    {
-                                                dbgwrite( &hMdDec->spar_md.band_coeffs[b].C_re[p][r], byte_size, 1, 1, f_name );
-                                        }
-                                }
-            }
-        }
-    }
-    nbands = 12; // 6 total, just looking at SPAR
-    num_subframes = 1;
-    num_elements = 4;
-    num_block_group = 1;
-    byte_size = sizeof( float );
-
-    sprintf( f_name, "SBA_MD_values_dec_P.bin" );
-    ( frame == 0 ) ? dbgwrite( &nbands, sizeof( nbands ), 1, 1, f_name ) : false;
-    ( frame == 0 ) ? dbgwrite( &num_elements, sizeof( num_elements ), 1, 1, f_name ) : false;
-    ( frame == 0 ) ? dbgwrite( &num_subframes, sizeof( num_subframes ), 1, 1, f_name ) : false;
-    ( frame == 0 ) ? dbgwrite( &num_block_group, sizeof( num_block_group ), 1, 1, f_name ) : false;
-    ( frame == 0 ) ? dbgwrite( &byte_size, sizeof( byte_size ), 1, 1, f_name ) : false;
-
-    for ( b = 0; b < nbands; b++ )
-    {
-        for ( int16_t sf = 0; sf < num_subframes; sf++ )
-        {
-            for ( int16_t bl = 0; bl < num_block_group; bl++ )
-            {
-                dbgwrite( &hMdDec->spar_md.band_coeffs[b].P_re[0], byte_size, 1, 1, f_name );
-                dbgwrite( &hMdDec->spar_md.band_coeffs[b].P_re[1], byte_size, 1, 1, f_name );
-                dbgwrite( &hMdDec->spar_md.band_coeffs[b].P_re[2], byte_size, 1, 1, f_name );
-                dbgwrite( &hMdDec->spar_md.band_coeffs[b].P_re[3], byte_size, 1, 1, f_name );
-                // fprintf(stdout, "%f\t%f\t%f\t%d\t%d\n", dirac_md_kbps, spar_md_kbps, sba_md_kbps, qsi, code_strat );
-            }
-        }
-    }*/
-#endif
 
     /* expand DirAC MD to all time slots */
     for ( i_ts = 1; i_ts < num_md_sub_frames; i_ts++ )
@@ -1273,9 +1046,6 @@ int16_t ivas_spar_chk_zero_coefs(
  * Smooth MD during no data frame during DTX
  *-----------------------------------------------------------------------------------------*/
 
-#ifdef SPAR_HOA_DBG
-/* NOTE: No changes here as DTX only operates below 160kbps */
-#endif
 void ivas_spar_smooth_md_dtx(
     ivas_spar_md_dec_state_t *hMdDec, /* i/o: SPAR MD decoder handle        */
     const int16_t num_bands_out,      /* i  : number of output bands        */
@@ -1521,20 +1291,6 @@ static void ivas_get_spar_matrices(
         }
     }
 
-#ifdef SPAR_HOA_DBG
-    /*for (b = 0; b < BANDS_12; b++)
-    {
-            for (i = 0; i < IVAS_SPAR_MAX_CH - 1; i++)
-            {
-                    hMdDec->spar_md.band_coeffs[b].pred_re[i] = (float)(i + 1)/10;
-                    for (j = 0; j < IVAS_SPAR_MAX_CH - 1; j++)
-                    {
-                            hMdDec->spar_md.band_coeffs[b].C_re[i][j] = (float)(i + j * 20 + 1)/10;
-                            hMdDec->spar_md.band_coeffs[b].P_re[i][j] = (float)(i + j * 20 + 1)/10;
-                    }
-            }
-    }*/
-#endif
     if ( bw == IVAS_RED_BAND_FACT )
     {
         num_bands = num_bands >> 1;
@@ -1698,28 +1454,7 @@ static void ivas_get_spar_matrices(
                         tmpC_re[j][k] = hMdDec->spar_md.band_coeffs[b + i_ts * IVAS_MAX_NUM_BANDS].C_re[j - dmx_ch][k - 1];
                     }
                 }
-#ifdef SPAR_HOA_DBG
-                /*fprintf(stdout, "C matrix1: %d x %d\n\n", numch_out, dmx_ch);
-                for (j = 0; j < numch_out; j++)
-                {
-                        for (k = 0; k < dmx_ch; k++)
-                        {
-                                fprintf(stdout, "%f, ", tmpC_re[j][k]);
-                        }
-                        fprintf(stdout, "\n");
 
-                }
-                fprintf(stdout, "Mixer Mat: %d x %d\n\n", numch_out, numch_out);
-                for ( j = 0; j < numch_out; j++)
-                {
-                        for (k = 0; k < numch_out; k++)
-                        {
-                                fprintf(stdout, "%f, ", hMdDec->mixer_mat[j][k][0][b]);
-                        }
-                        fprintf(stdout, "\n");
-
-                }*/
-#endif
                 for ( j = dmx_ch; j < numch_out; j++ )
                 {
                     for ( k = dmx_ch; k < numch_out; k++ )
@@ -1734,31 +1469,7 @@ static void ivas_get_spar_matrices(
                         }
                     }
                 }
-#ifdef SPAR_HOA_DBG
-                /*if (b == 0)
-                {
-                        fprintf(stdout, "tmp_P matrix: %d x %d\n\n", numch_out, dmx_ch);
-                        for (j = 0; j < numch_out; j++)
-                        {
-                                for (k = 0; k < numch_out; k++)
-                                {
-                                        fprintf(stdout, "%f, ", tmpP_re[j][k]);
-                                }
-                                fprintf(stdout, "\n");
-
-                        }
-                        fprintf(stdout, "Mixer Mat: %d x %d\n\n", numch_out, numch_out);
-                        for (j = 0; j < numch_out; j++)
-                        {
-                                for (k = 0; k < numch_out; k++)
-                                {
-                                        fprintf(stdout, "%f, ", hMdDec->mixer_mat[j][k][0][b]);
-                                }
-                                fprintf(stdout, "\n");
 
-                        }
-                }*/
-#endif
                 for ( j = 1; j < numch_out; j++ )
                 {
                     for ( k = dmx_ch; k < numch_out; k++ )
@@ -1782,48 +1493,11 @@ static void ivas_get_spar_matrices(
                         }
                     }
                 }
-#ifdef SPAR_HOA_DBG
-                /*fprintf(stdout, "C matrix1: %d x %d\n\n", numch_out, dmx_ch);
-                for (j = 0; j < numch_out; j++)
-                {
-                        for (k = 0; k < dmx_ch; k++)
-                        {
-                                fprintf(stdout, "%f, ", hMdDec->spar_coeffs.C_re[j][k][b]);
-                        }
-                        fprintf(stdout, "\n");
 
-                }*/
-#endif
                 hMdDec->spar_coeffs.C_re[0][0][( b * bw ) + i_ts * IVAS_MAX_NUM_BANDS] =
                     max( 0, hMdDec->spar_coeffs.C_re[0][0][( b * bw ) + i_ts * IVAS_MAX_NUM_BANDS] );
             }
         }
-#ifdef SPAR_HOA_DBG
-        /* for (b = 0; b < 1; b++)
-        {
-                fprintf(stdout, "C matrix: %d x %d band %d\n\n", numch_out, dmx_ch, b);
-                for (j = 0; j < numch_out; j++)
-                {
-                        for (k = 0; k < numch_out; k++)
-                        {
-                                fprintf(stdout, "%f, ", hMdDec->spar_coeffs.C_re[j][k][b]);
-                        }
-                        fprintf(stdout, "\n");
-
-                }
-                fprintf(stdout, "\nP matrix: %d x %d\n\n", numch_out, numch_out);
-
-                for (j = 0; j < numch_out; j++)
-                {
-                        for (k = 0; k < numch_out; k++)
-                        {
-                                fprintf(stdout, "%f, ", hMdDec->spar_coeffs.P_re[j][k][b]);
-                        }
-                        fprintf(stdout, "\n");
-
-                }
-        }*/
-#endif
 
         /* band mixing */
         if ( bw == IVAS_RED_BAND_FACT )
@@ -2124,9 +1798,6 @@ static void ivas_spar_dec_parse_md_bs(
 #endif
     strat = get_next_indice( st0, 3 );
 
-#ifdef SPAR_HOA_DBG
-    /*fprintf(stdout, "\n\n no_ec = %d, strat = %d\n", no_ec, strat);*/
-#endif
 #ifndef FIX_279_CODE_COVERAGE
     freq_diff = 0;
 #endif
@@ -2253,77 +1924,6 @@ static void ivas_spar_dec_parse_md_bs(
             hMdDec->valid_bands[*bands_bw * i + j] = hMdDec->valid_bands[*bands_bw * i];
         }
     }
-#ifdef SPAR_HOA_DBG
-    int16_t b;
-    b = 0;
-    /*if ( 0 )
-    {
-        for ( b = 0; b < *nB; b++ )
-        {
-            int16_t ndec = hMdDec->spar_md_cfg.num_decorr_per_band[( *bands_bw ) * b];
-            int16_t ndm = hMdDec->spar_md_cfg.num_dmx_chans_per_band[( *bands_bw ) * b];
-            fprintf( stdout, "\n\nMETADATA PR: band %d, qsi %d\n\n", b, qsi );
-            for ( i = 0; i < ndm + ndec - 1; i++ )
-            {
-                fprintf( stdout, "i: %d -- %f\t %d\t %d\n", i,
-                         hMdDec->spar_md.band_coeffs[b].pred_re[i],
-                         hMdDec->spar_md_prev.band_coeffs_idx[b].pred_index_re[i],
-                         hMdDec->spar_md.band_coeffs_idx[b].pred_index_re[i] );
-            }
-            fprintf( stdout, "\n\n METADATA C: band %d\n\n", b );
-            k = 0;
-            for ( i = 0; i < ndec; i++ )
-            {
-                for ( j = 0; j < ( ndm - 1 ); j++ )
-                {
-                    fprintf( stdout, "i: %d -- %f\t %d\t %d\n", i,
-                             hMdDec->spar_md.band_coeffs[b].C_re[i][j],
-                             hMdDec->spar_md_prev.band_coeffs_idx[b].drct_index_re[k],
-                             hMdDec->spar_md.band_coeffs_idx[b].drct_index_re[k] );
-                    k++;
-                }
-            }
-            fprintf( stdout, "\n\n METADATA Pd: band %d\n\n", b );
-            for ( i = 0; i < ndec; i++ )
-            {
-                fprintf( stdout, "i: %d -- %f\t %d\t %d\n", i,
-                         hMdDec->spar_md.band_coeffs[b].P_re[i][i],
-                         hMdDec->spar_md_prev.band_coeffs_idx[b].decd_index_re[i],
-                         hMdDec->spar_md.band_coeffs_idx[b].decd_index_re[i] );
-            }
-            fprintf( stdout, "\n\n" );
-            int16_t ndec = hMdDec->spar_md_cfg.num_decorr_per_band[( *bands_bw ) * b];
-            int16_t ndm = hMdDec->spar_md_cfg.num_dmx_chans_per_band[( *bands_bw ) * b];
-            fprintf( stdout, "\n\n Metadata PR (15x1), C(15x15), P(15x15): band %d\n", b );
-            for ( i = 0; i < ndm + ndec - 1; i++ )
-            {
-                fprintf( stdout, "i: %d -- %.2f\t|\t", i, hMdDec->spar_md.band_coeffs[b].pred_re[i] );
-                if ( i < ndec )
-                {
-                    if ( keep_planar[i] == 1 )
-                    {
-                        fprintf( stdout, ">>" );
-                    }
-                    else
-                    {
-                        fprintf( stdout, "  " );
-                    }
-                    for ( j = 0; j < ndm - 1; j++ )
-                    {
-                        fprintf( stdout, "%.2f\t", hMdDec->spar_md.band_coeffs[b].C_re[i][j] );
-                    }
-                    fprintf( stdout, "|\t" );
-                    for ( j = 0; j < ndec; j++ )
-                    {
-                        fprintf( stdout, "%.2f\t", hMdDec->spar_md.band_coeffs[b].P_re[i][j] );
-                    }
-                }
-                fprintf( stdout, "\n" );
-            }
-            fprintf( stdout, "\n" );
-        }
-    }*/
-#endif
 
     return;
 }
@@ -2537,9 +2137,6 @@ static void ivas_decode_arith_bs(
 #ifndef FIX_279_CODE_COVERAGE
     if ( freq_diff == 1 )
     {
-#ifdef SPAR_HOA_DBG
-        /* NOTE: This is currently unused code, and SPAR_HOA changes have not been made here. */
-#endif
         ivas_get_band_idx_from_differential( &hMdDec->spar_md, hMdDec->spar_md_cfg.quant_strat->PR.q_levels, 0, nB, PRED_COEFF );
         ivas_get_band_idx_from_differential( &hMdDec->spar_md, hMdDec->spar_md_cfg.quant_strat->C.q_levels, 0, nB, DRCT_COEFF );
         ivas_get_band_idx_from_differential( &hMdDec->spar_md, hMdDec->spar_md_cfg.quant_strat->P_r.q_levels, 1, nB, DECD_COEFF );
@@ -2556,9 +2153,6 @@ static void ivas_decode_arith_bs(
  *
  *-----------------------------------------------------------------------------------------*/
 
-#ifdef SPAR_HOA_DBG
-/* NOTE: No changes here as frequency differential coding is unused. */
-#endif
 static void ivas_get_band_idx_from_differential(
     ivas_spar_md_t *pSpar_md,
     const int16_t q_levels[2],
@@ -3012,9 +2606,6 @@ static void ivas_spar_dec_compute_ramp_down_post_matrix(
  * Unquantize SPAR MD DYX indices
  *-----------------------------------------------------------------------------------------*/
 
-#ifdef SPAR_HOA_DBG
-/* NOTE: No changes here as DTX only operates below 160kbps */
-#endif
 static void ivas_spar_unquant_dtx_indicies(
     ivas_spar_md_t *pSpar_md,
     const int16_t nB,
diff --git a/lib_enc/ivas_entropy_coder.c b/lib_enc/ivas_entropy_coder.c
index 4f45d0cc7e108fc410691acc9a078329889e9292..741338fbf206a540a913b657ef666aa0ff63b4e6 100644
--- a/lib_enc/ivas_entropy_coder.c
+++ b/lib_enc/ivas_entropy_coder.c
@@ -379,36 +379,6 @@ int16_t ivas_arith_encode_cmplx_cell_array(
             }
             total_len += len;
         }
-#ifdef SPAR_HOA_DBG
-        /*if ( 0 )*/ /*(pCell_dims[0].dim1 == 12)*/
-                     /*
-                     {
-                         idx = 0;
-                         fprintf( stdout, "\n\n OLD/NEW: \n\n" );
-                         for ( i = 0; i < nB; i++ )
-                         {
-                             len = ( cell_dim[i].dim1 * cell_dim[i].dim2 );
-                             fprintf( stdout, "Non-diff Band %d: \n", i );
-             
-                             for ( j = 0; j < len; j++ )
-                             {
-                                 fprintf( stdout, ">>%d: %d \n", idx, input[idx] );
-                                 idx++;
-                             }
-                         }
-                         idx = 0;
-                         for ( i = 0; i < nB; i++ )
-                         {
-                             len = ( cell_dim_diff[i].dim1 * cell_dim_diff[i].dim2 );
-                             fprintf( stdout, "Diff Band %d: \n", i );
-                             for ( j = 0; j < len; j++ )
-                             {
-                                 fprintf( stdout, ">>%d: %d\t %d\n", idx, input_old[idx], input_new[idx] );
-                                 idx++;
-                             }
-                         }
-                     }*/
-#endif
 
         arith_result = arith_encode_cell_array( cell_dim, hMetaData, nB, pArith_re, input, wc_strat_arith );
         if ( arith_result < 0 )
diff --git a/lib_enc/ivas_spar_encoder.c b/lib_enc/ivas_spar_encoder.c
index 2b09d00b42e9a614545c26c04d96660c949e0ae0..8bb75ffc9d13325df899b81b1456b330ff6e63a7 100644
--- a/lib_enc/ivas_spar_encoder.c
+++ b/lib_enc/ivas_spar_encoder.c
@@ -111,9 +111,7 @@ ivas_error ivas_spar_enc_open(
 
     nchan_transport = ivas_get_sba_num_TCs( hEncoderConfig->ivas_total_brate, sba_order_internal );
 
-    // bw = ivas_get_bw_idx_from_sample_rate(pCfg->input_Fs);
     table_idx = ivas_get_spar_table_idx( ivas_total_brate, sba_order_internal, SPAR_CONFIG_BW, NULL, NULL );
-    // ivas_set_bitrate_config(&hSpar->hMdEnc->spar_md_cfg, table_idx);
 
     /* MD handle */
     if ( ( error = ivas_spar_md_enc_open( &( hSpar->hMdEnc ), hEncoderConfig, sba_order_internal ) ) != IVAS_ERR_OK )
@@ -607,14 +605,8 @@ static ivas_error ivas_spar_enc_process(
 #endif
     int16_t nchan_fb_in;
 
-    /* ToDo: Commented for now*/
-    /*int16_t start_nb_bits;
-    int16_t total_md_bits, total_sba_bits;*/
     push_wmops( "ivas_spar_enc_process" );
 
-    /* ToDo: Commented for now*/
-    // start_nb_bits = hMetaData->nb_bits_tot;
-
     /*-----------------------------------------------------------------------------------------*
      * Initialization
      *-----------------------------------------------------------------------------------------*/
@@ -1095,20 +1087,6 @@ static ivas_error ivas_spar_enc_process(
     ivas_spar_dump_signal_wav( input_frame, p_pcm_tmp, NULL, nchan_transport, spar_foa_enc_wav[0], "ivas_pca_enc()" );
 #endif
 
-#ifdef SPAR_HOA_DBG
-    /*FILE *fp = fopen("int_enc_dmx.raw", "ab");
-    for (int16_t t = 0; t < 960; t++)
-    {
-        for (int16_t c = 0; c < hSpar->hFbMixer->filterbank_num_out_chans; c++)
-        {
-            for ( k = 0; k < 2; k++ )
-            {
-                fb_mixer_in_buf.ppMixer[i][j][k] = hSpar->hMdEnc->mixer_mat[i][j];
-            }
-        }
-    }
-    fclose( fp );*/
-#endif
     /*-----------------------------------------------------------------------------------------*
      * AGC
      *-----------------------------------------------------------------------------------------*/
diff --git a/lib_enc/ivas_spar_md_enc.c b/lib_enc/ivas_spar_md_enc.c
index 6b7da65f2cb571675d19fbd1d17b856176038804..c8486d3d260950b21eb8622bf75cb117352247f1 100644
--- a/lib_enc/ivas_spar_md_enc.c
+++ b/lib_enc/ivas_spar_md_enc.c
@@ -814,21 +814,6 @@ ivas_error ivas_spar_md_enc_process(
             {
                 if ( ndm != num_ch )
                 {
-#ifdef SPAR_HOA_DBG
-                    /* fprintf(stderr, "\n\n P coefficients: band %d\n", b);
-
-                    for (i = 0; i < ndec; i++)
-                    {
-                            for (j = 0; j < ndec; j++)
-                            {
-                                    fprintf(stderr, "%f, ", hMdEnc->spar_md.band_coeffs[b].P_re[i][j]);//, hMdEnc->spar_md.band_coeffs[b].P_im[i][j]);
-                            }
-                            fprintf(stderr, "\n");
-                    }
-                    fprintf(stderr, "\n\n"); */
-#endif
-
-
 #ifndef FIX_280_PLANAR_CP
                     if ( planarCP )
                     {
@@ -839,18 +824,6 @@ ivas_error ivas_spar_md_enc_process(
                                 hMdEnc->spar_md.band_coeffs[b].P_re[i] = 0.0f;
                             }
                         }
-#ifdef SPAR_HOA_DBG
-                        /*fprintf(stderr, "\n\n Planar P coefficients: band %d\n", b);
-                        for (i = 0; i < ndec; i++)
-                        {
-                                for (j = 0; j < ndec; j++)
-                                {
-                                        fprintf(stderr, "%f, ", hMdEnc->spar_md.band_coeffs[b].P_re[i][j]); //, hMdEnc->spar_md.band_coeffs[b].C_im[i][j]);
-                                }
-                                fprintf(stderr, "\n");
-                        }
-                        fprintf(stderr, "\n\n"); */
-#endif
                     }
 #endif
                     ivas_quant_p_per_band( &hMdEnc->spar_md.band_coeffs[b], &hMdEnc->spar_md.band_coeffs_idx[b], &hMdEnc->spar_md_cfg.quant_strat[qsi], num_ch );
@@ -995,33 +968,11 @@ ivas_error ivas_spar_md_enc_process(
                             }
                         }
                     }
-#ifdef SPAR_HOA_DBG
-                    /*fprintf(stderr, "\n\n Planar C coefficients: band %d\n", b);
-
-                    for (i = 0; i < num_ch - ndm; i++)
-                    {
-                            for (j = 0; j < ndm - 1; j++)
-                            {
-                                    fprintf(stderr, "%f, ", hMdEnc->spar_md.band_coeffs[b].C_re[i][j]); // , hMdEnc->spar_md.band_coeffs[band_idx].C_im[i][j]);
-                            }
-                            fprintf(stderr, "\n");
-                    }
-                    fprintf(stderr, "\n\n"); */
-#endif
                 }
 #endif
 
                 ivas_quant_c_per_band( &hMdEnc->spar_md.band_coeffs[b], &hMdEnc->spar_md.band_coeffs_idx[b],
                                        &hMdEnc->spar_md_cfg.quant_strat[qsi], ndec, ndm );
-#ifdef SPAR_HOA_DBG
-                /*fprintf(stderr, "\n\n quantised C indexes: band %d\n", b);
-
-                for (i = 0; i < ndec * (ndm-1); i++)
-                {
-                        fprintf(stderr, "%d, ", hMdEnc->spar_md.band_coeffs_idx[b].drct_index_re[i]);
-                }
-                fprintf(stderr, "\n\n");*/
-#endif
             }
         }
 
@@ -1797,12 +1748,6 @@ static int16_t ivas_get_arith_coded_bs(
         }
     }
 
-#ifdef SPAR_HOA_DBG
-    /*fprintf(stderr, "\n\n band_indexes:\n");
-    for (int16_t j = 1; j < drct_cell_dims[0].dim1 * drct_cell_dims[0].dim2; j++)
-            fprintf(stderr, "%d, ", hMdEnc->spar_md.band_coeffs_idx[0].drct_index_re[j]);
-    fprintf(stderr, "\n\n"); */
-#endif
     ivas_copy_band_coeffs_idx_to_arr( hMdEnc->spar_md.band_coeffs_idx, nB, symbol_arr_re, drct_cell_dims, DRCT_COEFF
 #ifndef FIX_280_PLANAR_CP
                                       ,
@@ -2222,15 +2167,6 @@ static void ivas_quant_c_per_band(
             k++;
         }
     }
-#ifdef SPAR_HOA_DBG
-    /*for (i = 0; i < ndec; i++)
-    {
-            for (j = 0; j < ndm - 1; j++)
-            {
-                    ppIdx_re[i][j] = 100;
-            }
-    }*/
-#endif
     ivas_quantise_real_values( C_re, pQs->C.q_levels[0], pQs->C.min, pQs->C.max, pBand_coeffs_idx->drct_index_re, C_re, ndec * ( ndm - 1 ) );
     k = 0;
     for ( i = 0; i < ndec; i++ )
@@ -2241,18 +2177,6 @@ static void ivas_quant_c_per_band(
             k++;
         }
     }
-#ifdef SPAR_HOA_DBG
-    /*fprintf(stderr, "\n\n Quantising the C coeffs: \n");
-    k = 0;
-    for (i = 0; i < ndec; i++)
-    {
-            for (j = 0; j < ndm - 1; j++)
-            {
-                    fprintf(stderr, "%d,%d: %f, %f, %d\n", i, j, pband_coeffs->C_re[i][j], pband_coeffs->C_quant_re[i][j], pBand_coeffs_idx->drct_index_re[k]);
-                    k++;
-            }
-    }*/
-#endif
 
     return;
 }
@@ -2270,14 +2194,6 @@ static void ivas_quant_p_per_band(
     ivas_quant_strat_t *pQs,
     const int16_t num_ch )
 {
-#ifdef SPAR_HOA_DBG
-    /*fprintf(stderr, "\n\n P_d:\n");
-    for (i = 0; i < dim; i++)
-    {
-            fprintf(stderr, "%f, ", P_re_diag[i]);
-    }
-    fprintf(stderr, "\n\n");*/
-#endif
     ivas_quantise_real_values( pband_coeffs->P_re, pQs->P_r.q_levels[0], pQs->P_r.min, pQs->P_r.max, pBand_coeffs_idx->decd_index_re, pband_coeffs->P_quant_re, num_ch - 1 );
 
     return;