diff --git a/lib_com/options.h b/lib_com/options.h
index 76297b41dc3045b6786e139eb35a966e83c8ac2d..743b69c8b871d8de4224c5207924f67b700c81d8 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -162,6 +162,7 @@
 /*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */
 #define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */
 #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 FIX_2371_REMOVE_UNUSED_ISAR_FCNS                /* Dolby: basop issue 2371: remove unused ISAR-related functions */      
 
 /* #################### End BE switches ################################## */
 
diff --git a/lib_isar/isar_PredDecoder.c b/lib_isar/isar_PredDecoder.c
index 24f266b100021dd8f89010d1432a0d69465339e3..7a87c1f3672953c539274c39466df0495d9818f5 100644
--- a/lib_isar/isar_PredDecoder.c
+++ b/lib_isar/isar_PredDecoder.c
@@ -342,7 +342,7 @@ int16_t ReadPredictors(
     return iBitsRead;
 }
 
-
+#ifndef FIX_2371_REMOVE_UNUSED_ISAR_FCNS
 /*-------------------------------------------------------------------*
  * Function SetDecodingPassed()
  *
@@ -363,7 +363,7 @@ void SetDecodingPassed(
 
     return;
 }
-
+#endif
 
 /*-------------------------------------------------------------------*
  * Function AnyDecodingUnresolved()
diff --git a/lib_isar/isar_RMSEnvGrouping.c b/lib_isar/isar_RMSEnvGrouping.c
index c40842d39ad639ea7dd7d6b03e7fd2dbf73bc616..346feb4d6a0a49077e0486094bc9c8577baf35b1 100644
--- a/lib_isar/isar_RMSEnvGrouping.c
+++ b/lib_isar/isar_RMSEnvGrouping.c
@@ -622,8 +622,8 @@ static void LimitRMSEnvelope(
 
         if ( iDelta > iRMSDeltaMax )
         {
-#ifdef DEBUG_VERBOSE
-            printf( "WARNING RMS envelope delta limited\n" );
+#ifdef DEBUGGING
+            printf( "Warning: RMS envelope delta limited!\n" );
 #endif
             piRMSEnvelope[iBand] += ( iDelta - iRMSDeltaMax );
         }
@@ -641,8 +641,8 @@ static void LimitRMSEnvelope(
 
         if ( iDelta < iRMSDeltaMin )
         {
-#ifdef DEBUG_VERBOSE
-            printf( "WARNING RMS envelope delta limited\n" );
+#ifdef DEBUGGING
+            printf( "Warning: RMS envelope delta limited!\n" );
 #endif
             piRMSEnvelope[iBand] += ( iRMSDeltaMin - iDelta );
         }
diff --git a/lib_isar/isar_lcld_decoder.c b/lib_isar/isar_lcld_decoder.c
index 148ee523eb9c7daed0d01f8a8c1ef00587e539da..a58fff9b8bd3f9416c1bc98be9d37ea6f8153ad3 100644
--- a/lib_isar/isar_lcld_decoder.c
+++ b/lib_isar/isar_lcld_decoder.c
@@ -1425,7 +1425,7 @@ static int32_t ReadMSInformation(
     }
     else
     {
-        printf( "ERROR UNSUPPORTED MS MODE\n" );
+        printf( "Error in ReadMSInformation() - unsupported MS mode information!\n" );
     }
 
     return iBitsRead;
diff --git a/lib_isar/isar_lcld_encoder.c b/lib_isar/isar_lcld_encoder.c
index 880a3c30fbdc2167b16851d704e916c9d94f0828..ca02818448d83a11696e3494781217c06ebd9e24 100644
--- a/lib_isar/isar_lcld_encoder.c
+++ b/lib_isar/isar_lcld_encoder.c
@@ -1621,7 +1621,7 @@ static int32_t WriteAllocInformation(
 
     if ( iAllocOffset < MIN_ALLOC_OFFSET || iAllocOffset > MAX_ALLOC_OFFSET )
     {
-        printf( "Serious error\n" );
+        printf( "Error in WriteAllocInformation() - iAllocOffset has incorrect value: %d!\n", iAllocOffset );
     }
 
     ISAR_SPLIT_REND_BITStream_write_int32( pBits, ( iAllocOffset - MIN_ALLOC_OFFSET ), ALLOC_OFFSET_BITS );
@@ -1849,10 +1849,9 @@ static int32_t ComputeAllocation(
 
         if ( *piAllocOffset <= MIN_ALLOC_OFFSET && iBitsUsed > iAvailableBits )
         {
-#ifdef DEBUG_VERBOSE
-            printf( "Frame can not be coded with the number of bits available\n" );
+#ifdef DEBUGGING
+            printf( "Error in ComputeAllocation() - frame can not be coded with the number of bits available!\n" );
 #endif
-            /* iLastError = ENC_ERROR_STREAM_FAILURE;*/
             return -1;
         }
         else if ( *piAllocOffset >= MAX_ALLOC_OFFSET && iBitsUsed < iAvailableBits )
diff --git a/lib_isar/isar_lcld_prot.h b/lib_isar/isar_lcld_prot.h
index 4296ffc7e372df5ef5ebf01d2f5610aa9c20a7dd..a61b9e68d4868fbc3d946310ac8eea033b7a198c 100644
--- a/lib_isar/isar_lcld_prot.h
+++ b/lib_isar/isar_lcld_prot.h
@@ -313,8 +313,10 @@ int16_t GetNumSubSets(
 int32_t **GetDecodingFailedPrevStatus(
     LCLDDecoder *psLCLDDecoder);
 
+#ifndef FIX_2371_REMOVE_UNUSED_ISAR_FCNS
 void SetDecodingPassed(
     PredictionDecoder *psPredictionDecoder);
+#endif
 
 void UpdateDecodingUnresolved(
     PredictionDecoder *psPredictionDecoder);
diff --git a/lib_isar/lib_isar_post_rend.c b/lib_isar/lib_isar_post_rend.c
index 276365592f49f04e146c912a8e57dda6b4095531..fa005a2deae6e6aea4d74f5b11b288c145ea0a4b 100644
--- a/lib_isar/lib_isar_post_rend.c
+++ b/lib_isar/lib_isar_post_rend.c
@@ -770,7 +770,6 @@ ivas_error ISAR_POST_REND_SetInputGain(
 
     if ( ( error = getInputById( hIvasRend, inputId, (void **) &inputBase ) ) != IVAS_ERR_OK )
     {
-        printf( "Hoo\n" );
         return error;
     }
 
@@ -1058,7 +1057,6 @@ ivas_error ISAR_POST_REND_FeedInputAudio(
 
     if ( ( error = getInputById( hIvasRend, inputId, (void **) &inputBase ) ) != IVAS_ERR_OK )
     {
-        printf( "Foo\n" );
         return error;
     }
 
@@ -1181,7 +1179,6 @@ ivas_error ISAR_POST_REND_FeedSplitBinauralBitstream(
 
     if ( ( error = getInputById( hIvasRend, inputId, (void **) &inputBase ) ) != IVAS_ERR_OK )
     {
-        printf( "Goo\n" );
         return error;
     }