diff --git a/lib_com/bitstream.c b/lib_com/bitstream.c
index a85a6f3992aa59f0ab675322f658811ce0111fea..6975167457ef63852e0b89e36b858597ae7db6d1 100644
--- a/lib_com/bitstream.c
+++ b/lib_com/bitstream.c
@@ -576,182 +576,6 @@ int16_t get_ivas_max_num_indices(
     return 2450;
 }
 
-/*-----------------------------------------------------------------------*
- * get_core_max_num_indices()
- *
- * Get the maximum allowed number of indices in the core coder
- *-----------------------------------------------------------------------*/
-
-/*! r: maximum number of indices */
-int16_t get_core_max_num_indices(
-    const int16_t core,       /* i  : core                      */
-    const int32_t total_brate /* i  : total bitrate             */
-)
-{
-
-    /* set the maximum number of indices in the core coder */
-    if ( core == ACELP_CORE || core == AMR_WB_CORE )
-    {
-        if ( total_brate <= 9600 )
-        {
-            return 60;
-        }
-        else if ( total_brate <= IVAS_13k2 )
-        {
-            return 70;
-        }
-        else if ( total_brate <= IVAS_16k4 )
-        {
-            return 80;
-        }
-        else if ( total_brate <= IVAS_24k4 )
-        {
-            return 100;
-        }
-        else if ( total_brate <= IVAS_32k )
-        {
-            return 180;
-        }
-        else if ( total_brate <= IVAS_48k )
-        {
-            return 340;
-        }
-        else if ( total_brate <= IVAS_80k )
-        {
-            return 450;
-        }
-        else if ( total_brate <= IVAS_96k )
-        {
-            return 500;
-        }
-        else if ( total_brate <= IVAS_128k )
-        {
-            return 550;
-        }
-        else if ( total_brate <= IVAS_160k )
-        {
-            return 600;
-        }
-        else if ( total_brate <= IVAS_192k )
-        {
-            return 650;
-        }
-        else if ( total_brate <= IVAS_256k )
-        {
-            return 700;
-        }
-        else
-        {
-            return 800;
-        }
-    }
-    else if ( core == TCX_20_CORE || core == TCX_10_CORE )
-    {
-        if ( total_brate <= 9600 )
-        {
-            return 100;
-        }
-        else if ( total_brate <= IVAS_13k2 )
-        {
-            return 150;
-        }
-        else if ( total_brate <= IVAS_16k4 )
-        {
-            return 200;
-        }
-        else if ( total_brate <= IVAS_24k4 )
-        {
-            return 310;
-        }
-        else if ( total_brate <= IVAS_32k )
-        {
-            return 330;
-        }
-        else if ( total_brate <= IVAS_48k )
-        {
-            return 340;
-        }
-        else if ( total_brate <= IVAS_80k )
-        {
-            return 380;
-        }
-        else if ( total_brate <= IVAS_96k )
-        {
-            return 400;
-        }
-        else if ( total_brate <= IVAS_128k )
-        {
-            return 460;
-        }
-        else if ( total_brate <= IVAS_160k )
-        {
-            return 470;
-        }
-        else if ( total_brate <= IVAS_192k )
-        {
-            return 570;
-        }
-        else if ( total_brate <= IVAS_256k )
-        {
-            return 680;
-        }
-        else
-        {
-            return 800;
-        }
-    }
-    else if ( core == HQ_CORE )
-    {
-        if ( total_brate <= 9600 )
-        {
-            return 100;
-        }
-        else if ( total_brate <= IVAS_16k4 )
-        {
-            return 200;
-        }
-        else if ( total_brate <= IVAS_24k4 )
-        {
-            return 240;
-        }
-        else if ( total_brate <= IVAS_32k )
-        {
-            return 300;
-        }
-        else if ( total_brate <= IVAS_48k )
-        {
-            return 380;
-        }
-        else if ( total_brate <= IVAS_96k )
-        {
-            return 400;
-        }
-        else if ( total_brate <= IVAS_128k )
-        {
-            return 450;
-        }
-        else if ( total_brate <= IVAS_160k )
-        {
-            return 550;
-        }
-        else if ( total_brate <= IVAS_192k )
-        {
-            return 600;
-        }
-        else if ( total_brate <= IVAS_256k )
-        {
-            return 700;
-        }
-        else
-        {
-            return 800;
-        }
-    }
-    else
-    {
-        return 50;
-    }
-}
 
 /*-----------------------------------------------------------------------*
  * get_BWE_max_num_indices()
diff --git a/lib_com/ivas_dirac_com.c b/lib_com/ivas_dirac_com.c
index 7852e8e0fb4422aa8ee065c95a0c9fdda6de5b26..605635b6348c3e3b6a865f615cbd623db740f004 100644
--- a/lib_com/ivas_dirac_com.c
+++ b/lib_com/ivas_dirac_com.c
@@ -325,7 +325,7 @@ void ivas_dirac_config_bands(
 }
 
 /*-------------------------------------------------------------------*
- * ivas_sba_get_max_md_bits()
+ * ivas_get_dirac_sba_max_md_bits()
  *
  * Return maximum SBA DirAC metadata bit-budget and nominal bit-budget
  *-------------------------------------------------------------------*/
diff --git a/lib_com/ivas_prot.h b/lib_com/ivas_prot.h
index e392436ba7a53ccc379d6ff56afd8c6a336a3daa..997798f60113bd35734e1bd2ede5cd23db76a7ed 100755
--- a/lib_com/ivas_prot.h
+++ b/lib_com/ivas_prot.h
@@ -5381,6 +5381,7 @@ ivas_error ivas_allocate_binaural_hrtf(
     const int16_t allocate_init_flag                            /* i  : Memory allocation flag                          */
 );
 
+#ifdef DEBUGGING
 void ivas_binaural_cldfb(
     Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                                  */
     float *output_f[]                                           /* i/o: synthesized core-coder transport channels/DirAC output  */
@@ -5392,6 +5393,7 @@ void ivas_binaural_cldfb_sf(
     const int16_t slot_size,                                    /* i  : JBM slot size                                           */
     float *output_f[]                                           /* i/o: synthesized core-coder transport channels/DirAC output  */
 );
+#endif
 
 void ivas_binRenderer(
     BINAURAL_RENDERER_HANDLE hBinRenderer, /* i/o: binaural renderer handle    */
diff --git a/lib_com/prot.h b/lib_com/prot.h
index 263f4cfe0eac3cda878ba55930f9f5f3e897a7f4..454100d590b1cd18c377c2acf6bf0b396cdf9a6d 100644
--- a/lib_com/prot.h
+++ b/lib_com/prot.h
@@ -521,12 +521,6 @@ int16_t get_ivas_max_num_indices(
     const int32_t ivas_total_brate /* i  : IVAS total bitrate           */
 );
 
-/*! r: maximum number of indices */
-int16_t get_core_max_num_indices(
-    const int16_t core,       /* i  : core                      */
-    const int32_t total_brate /* i  : total bitrate             */
-);
-
 /*! r: maximum number of indices */
 int16_t get_BWE_max_num_indices(
     const int32_t extl_brate /* i  : extensiona layer bitrate  */
diff --git a/lib_dec/ivas_binRenderer_internal.c b/lib_dec/ivas_binRenderer_internal.c
index 3966eae0cfa397d9bcb8c4fc2f0c7aab4f26a2cd..902afa22dfa518db1f9b2ab6301fb3d12ad79e84 100644
--- a/lib_dec/ivas_binRenderer_internal.c
+++ b/lib_dec/ivas_binRenderer_internal.c
@@ -1568,6 +1568,7 @@ void ivas_binaural_add_LFE(
 }
 
 
+#ifdef DEBUGGING
 /*-------------------------------------------------------------------------*
  * ivas_binaural_cldfb()
  *
@@ -1881,6 +1882,7 @@ void ivas_binaural_cldfb_sf(
 
     return;
 }
+#endif
 
 
 /*-------------------------------------------------------------------------
diff --git a/lib_util/bitstream_reader.c b/lib_util/bitstream_reader.c
index 999332e863dcb9584e557ba3375a91b541a398f7..2e88746c035759f530bb75f7940ae84990ff4de3 100644
--- a/lib_util/bitstream_reader.c
+++ b/lib_util/bitstream_reader.c
@@ -263,6 +263,7 @@ cleanup:
     return error;
 }
 
+#ifdef DEBUGGING
 ivas_error BS_Reader_Rewind( BS_READER_HANDLE hBsReader )
 {
     if ( hBsReader == NULL )
@@ -277,6 +278,7 @@ ivas_error BS_Reader_Rewind( BS_READER_HANDLE hBsReader )
 
     return hBsReader->rewind( hBsReader->hFormatReader );
 }
+#endif
 
 ivas_error BS_Reader_ReadFrame_short( BS_READER_HANDLE hBsReader, uint16_t *serial, int16_t *num_bits, int16_t *bfi )
 {
diff --git a/lib_util/bitstream_reader.h b/lib_util/bitstream_reader.h
index 2accbbd242670d69f612780ce4b46018a5b05e72..374c19d436d9db0f48a599a3acc78ab5e23489ae 100644
--- a/lib_util/bitstream_reader.h
+++ b/lib_util/bitstream_reader.h
@@ -58,7 +58,9 @@ typedef struct BS_Reader *BS_READER_HANDLE;
 
 ivas_error BS_Reader_Open_filename( BS_READER_HANDLE *phBsReader, const char *filename, BS_READER_FORMAT format );
 
+#ifdef DEBUGGING
 ivas_error BS_Reader_Rewind( BS_READER_HANDLE hBsReader );
+#endif
 
 ivas_error BS_Reader_ReadFrame_short( BS_READER_HANDLE hBsReader, uint16_t *serial, int16_t *num_bits, int16_t *bfi );