--- a/chipsetsw/layer1/cfile/l1_trace.c	Sat May 21 06:29:39 2016 +0000
+++ b/chipsetsw/layer1/cfile/l1_trace.c	Sun Jun 05 16:53:19 2016 +0000
@@ -117,7 +117,10 @@
   #include "timer2.h"
 #endif
 
+#if 0	/* FreeCalypso: LoCosto junk removed */
 unsigned int x,y,fer_sacch ,dl_good_norep;
+#endif
+
 extern UWORD16 toa_tab[4];
 
 #if (TRACE_TYPE == 1) || (TRACE_TYPE == 4)  || (TRACE_TYPE == 7)
@@ -151,7 +154,9 @@
     extern T_TRACE_INFO_STRUCT trace_info;
   void l1_trace_configuration(T_RVT_BUFFER trace_msg, UINT16 trace_msg_size);
   void l1_send_trace_version();
-  void l1_trace_full_dsp_buffer( void );
+  #if 0	/* FreeCalypso TCS211 reconstruction */
+    void l1_trace_full_dsp_buffer( void );
+  #endif
 
   #if L1_BINARY_TRACE
     #define L1_send_trace_cpy(s,length)    rvt_send_trace_cpy       ((T_RVT_BUFFER) s, trace_info.l1_trace_user_id, (T_RVT_MSG_LG)length, RVT_BINARY_FORMAT)
@@ -7309,6 +7314,7 @@
 /* Parameters :                                          */
 /* Return     :                                          */
 
+#if 0	/* FreeCalypso: function not present in TCS211 */
 void Trace_L1S_CPU_load()
 {
   #define TIMER_RESET_VALUE (0xFFFF)
@@ -7331,6 +7337,7 @@
   if (((l1s.actual_time.fn%1326) == 0) && (max_cpu_flag == 0))
     max_cpu = 0;
 } /* end of Trace_L1S_CPU_load() */
+#endif
 
 #if 0	/* FreeCalypso: feature not present in our chipset */
 /********** DSP CPU load measurement *************/
@@ -8506,7 +8513,8 @@
 #endif
 
 
-#if (((TRACE_TYPE==1) || (TRACE_TYPE == 4)))
+/* FreeCalypso: the following function appears to be a LoCosto addition */
+#if 0 //(((TRACE_TYPE==1) || (TRACE_TYPE == 4)))
   UWORD16 reentry = 0;
 
   void l1_trace_full_dsp_buffer( void )