--- a/src/cs/system/main/create_RVtasks.c	Fri May 15 04:01:28 2020 +0000
+++ b/src/cs/system/main/create_RVtasks.c	Fri May 15 04:25:10 2020 +0000
@@ -112,7 +112,7 @@
 
     rvt_register_id("TM", &etm_trace_user_id, etm_receive);
 
-#if (PSP_STANDALONE != 1)
+#if 0 //(PSP_STANDALONE != 1)
     tm_trace_user_id = etm_trace_user_id; // TML1 use the tm_trace_user_id
 #endif
 }
@@ -574,11 +574,13 @@
 #if (REMU==0) /* moved this to kpd start function.  rv_start function for REMU. rv_start is called from Application Initialize 
 context.  Since this is a blocking call, we cannot afford to block in Application_Initialization. */
 #ifndef _WINDOWS
+#if 0	/* FC FFS editor */
     // Perform switch ON processing.
     Switch_ON();
 #endif
+#endif
 
-#if (_GSM==1)
+#if 0 //(_GSM==1)
     BZ_KeyBeep_ON ();          // Audio feedback if ON/OFF pushed
 #endif // if (_GSM==1)
 
@@ -586,7 +588,7 @@
 #if (CHIPSET!=15) || (REMU==0)
     /* dump the Riviera memory state */
     rvf_delay (RVF_MS_TO_TICKS (300)) ;
-	rvf_dump_mem ();
+    rvf_dump_mem ();
     rvf_dump_pool();
     rvf_dump_tasks();
 #endif