diff --git a/lib_com/options.h b/lib_com/options.h
index bd63e5c623c3cca65612a4cc580faa1498c5a301..4a272cf24e4e578fc4823a28586a3b0ca871cb86 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -110,7 +110,7 @@
 #define FIX_1483_PEAQ_VQ_ENC_MSAN_ERROR                 /* Eri: When no PVQ bands are selected in peaq_vq_enc, the number of bands is not initialized. */
 #define FIX_1480_CLANG18_MSAN_UNINIT_VARIABLE           /* Eri: Initializes a variables in HQ decoder. It is not used, but is passed uninitialized to a function which is caught by clang-18 */
 #define FIX_1449_RENDERER_FRAME_SIZE_UNCLEAR_IN_ISAR    /* Dolby: Fix for issue 1449: renderer frame size unclear in ISAR */
-#define FIX_1872_REMOVE_UNUSED_PSNOISEGEN_ISAR              /* Dolby: Remove unused psNoiseGen from ISAR */
+#define FIX_1872_REMOVE_UNUSED_PSNOISEGEN_ISAR          /* Dolby: Remove unused psNoiseGen from ISAR */
 #define FIX_1478_UNINIT_ON_BFI                          /* VA: Fix issue 1478 where a vector is partly un-initialized during bfi */
 #define FIX_1487_ACCESS_OF_UNINIT_VAL_FROM_ARR_ISM_DTX  /* FhG/VA: init nb_bits_metadata to zero */
 #define FIX_1486_INIT_OUTPUT_POINTERS                   /* FhG: always initialize pointers in renderer flush */
@@ -123,6 +123,7 @@
 #define CLEANUP_HQ_CORE                                 /* VA: basop issue 2300: Remove unused code in core-coder: HQ core */
 #define REMOVE_UNUSED_CODE_IVAS_DEC                     /* VA: remove unused code in ivas_jbm_dec_tc_fx() */
 #define FIX_2294_CLANG_18_WARNINGS_ENC                  /* VA: Fix some encoder clang-18 warnings, desc. in 2294 */
+#define REMOVE_CAM_FROM_IVAS                            /* VA: basop issue 210: remove obsoelte CAM code from IVAS */
 
 /* #################### End BE switches ################################## */
 
diff --git a/lib_enc/decision_matrix_enc_fx.c b/lib_enc/decision_matrix_enc_fx.c
index 086b6e86aedcdb5772da37fd780e00be60f03e7a..f73a524ceb1275b35170f17beccdac71766dfd9e 100644
--- a/lib_enc/decision_matrix_enc_fx.c
+++ b/lib_enc/decision_matrix_enc_fx.c
@@ -752,13 +752,15 @@ void signalling_enc_fx(
 }
 
 /*---------------------------------------------------------------------*
- * signalling_enc_rf()
+ * signaling_enc_rf()
  *
  * write channel-aware signalling information into the bitstream
  *---------------------------------------------------------------------*/
+
 void signaling_enc_rf_fx(
     Encoder_State *st /* i  : encoder state structure   */
 )
+#ifndef REMOVE_CAM_FROM_IVAS
 {
     Word16 i;
     Word16 sfr;
@@ -833,6 +835,7 @@ void signaling_enc_rf_fx(
 void signalling_enc_rf_fx(
     Encoder_State *st /* i  : encoder state structure   */
 )
+#endif
 {
     Word16 i;
     Word16 sfr;
diff --git a/lib_enc/enc_prm_fx.c b/lib_enc/enc_prm_fx.c
index 6a861b8aff23a5fe0ad63888449f9b3eccfb3a97..d0b050ac09eac4996497270964a3e7853e4fef56 100644
--- a/lib_enc/enc_prm_fx.c
+++ b/lib_enc/enc_prm_fx.c
@@ -93,13 +93,14 @@ static void enc_prm_hm_ivas_fx(
     }
 }
 
+
 /*-----------------------------------------------------------------*
- * Function  enc_prm_rf_fx()                                          *
+ * Function  enc_prm_rf_fx()                                       *
  * ~~~~~~~~~~~~~~~~~~~~~~                                          *
  *                                                                 *
  * encode RF parameters for ACELP and TCX partial copy             *
  *-----------------------------------------------------------------*/
-
+#ifndef REMOVE_CAM_FROM_IVAS
 void enc_prm_rf_ivas_fx(
     Encoder_State *st,
     const Word16 rf_frame_type, /* Q0 */
@@ -271,6 +272,8 @@ void enc_prm_rf_ivas_fx(
     /* write RF frame type last in the bitstream */
     push_next_indice( hBstr, rf_frame_type, 3 );
 }
+#endif
+
 void enc_prm_rf_fx(
     Encoder_State *st,
     const Word16 rf_frame_type, /* Q0 */
diff --git a/lib_enc/evs_enc_fx.c b/lib_enc/evs_enc_fx.c
index 416c2f4e974134a63139b6f4cb74cd4dc16b3a02..34336ef797e9914b4520f7f7c0a509f393789f96 100644
--- a/lib_enc/evs_enc_fx.c
+++ b/lib_enc/evs_enc_fx.c
@@ -531,7 +531,15 @@ ivas_error evs_enc_fx(
      * Channel-aware mode - write signaling information into the bitstream
      *---------------------------------------------------------------------*/
 
+#ifdef REMOVE_CAM_FROM_IVAS
+    signaling_enc_rf_fx( st );
+
+    /*---------------------------------------------------------------------*
+     * Updates
+     *---------------------------------------------------------------------*/
+#else
     signalling_enc_rf_fx( st );
+#endif
 
     updt_enc_common_fx( st, Etot, Q_new );
 
diff --git a/lib_enc/ivas_core_enc_fx.c b/lib_enc/ivas_core_enc_fx.c
index 528cd5f7c21e2236b647fd76c9c3812f14602028..4c9b00d46a615e889d4546332c6e5fa716cc7580 100644
--- a/lib_enc/ivas_core_enc_fx.c
+++ b/lib_enc/ivas_core_enc_fx.c
@@ -834,12 +834,13 @@ ivas_error ivas_core_enc_fx(
         st->q_inp = q_inp[1];
         move16();
 
+#ifndef REMOVE_CAM_FROM_IVAS
         /*---------------------------------------------------------------------*
          * Channel-aware mode - write signaling information into the bitstream
          *---------------------------------------------------------------------*/
 
         signaling_enc_rf_fx( st );
-
+#endif
         /*---------------------------------------------------------------------*
          * Common updates
          *---------------------------------------------------------------------*/
diff --git a/lib_enc/prot_fx_enc.h b/lib_enc/prot_fx_enc.h
index 2897237845648311b26e590bf7bedca68a01aab2..06630ab571acc7531eb97d36008b121e4c445239 100644
--- a/lib_enc/prot_fx_enc.h
+++ b/lib_enc/prot_fx_enc.h
@@ -2788,11 +2788,12 @@ void enc_prm_rf_fx(
     const Word16 rf_frame_type,
     const Word16 fec_offset );
 
+#ifndef REMOVE_CAM_FROM_IVAS
 void enc_prm_rf_ivas_fx(
     Encoder_State *st,
     const Word16 rf_frame_type,
     const Word16 fec_offset );
-
+#endif
 void E_ACELP_pulsesign(
     const Word16 cn[] /*Q_xn*/,
     Word16 dn[] /*Qdn*/,
@@ -2989,10 +2990,11 @@ void signaling_enc_rf_fx(
     Encoder_State *st /* i  : encoder state structure   */
 );
 
+#ifndef REMOVE_CAM_FROM_IVAS
 void signalling_enc_rf_fx(
     Encoder_State *st /* i  : encoder state structure                   */
 );
-
+#endif
 void IGFEncResetTCX10BitCounter_fx(
     const IGF_ENC_INSTANCE_HANDLE hInstance /**< in:     | instance handle of IGF Encoder */
 );