--- a/sysstatemgmt/ssmcmdlists/data/noncriticalswpcmdlists.rss	Tue May 25 14:04:18 2010 +0300
+++ b/sysstatemgmt/ssmcmdlists/data/noncriticalswpcmdlists.rss	Wed Jun 09 11:04:22 2010 +0300
@@ -99,19 +99,15 @@
         // prio 0x7EEF
         r_cmd_activitymonitor8,
         // prio 0x7EEE
-        r_cmd_autosync,
-        // prio 0x7EED
-        r_cmd_activitymonitor9,
-        // prio 0x7EEC
-        r_cmd_mylocationsengine
+        r_cmd_autosync
 #ifdef FF_ATT_ADDRESS_BK
         //prio 0x7EEA
-        ,r_cmd_activitymonitor10,
+        ,r_cmd_activitymonitor9,
         //prio 0x7EE9
         r_cmd_aab
 #endif
 		// prio 0x7EE8
-		,r_cmd_activitymonitor11,
+		,r_cmd_activitymonitor10,
 		// prio 0x7EE7
 		r_cmd_calendar //CR:MMUN-82ZHAD
     	};
@@ -256,24 +252,9 @@
 // r_cmd_activitymonitor9
 // ---------------------------------------------------------------------------
 //
+#ifdef FF_ATT_ADDRESS_BK
 RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor9
     {
-    priority = 0x7EED;
-    severity = ECmdCriticalSeverity;
-    execution_behaviour = ESsmWaitForSignal;
-    dllname = "ssmactivitycmd.dll";
-    ordinal = 1; // SsmActivityCmdNewL
-    retries = 2;
-    dll_data = r_dlldata_activitymonitor_timeout;
-    }
-	
-// ---------------------------------------------------------------------------
-// r_cmd_activitymonitor10
-// ---------------------------------------------------------------------------
-//
-#ifdef FF_ATT_ADDRESS_BK
-RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor10
-    {
     priority = 0x7EEA;
     severity = ECmdCriticalSeverity;
     execution_behaviour = ESsmWaitForSignal;
@@ -285,10 +266,10 @@
 #endif
 
 // ---------------------------------------------------------------------------
-// r_cmd_activitymonitor11
+// r_cmd_activitymonitor10
 // ---------------------------------------------------------------------------
 //
-RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor11
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor10
     {
     priority = 0x7EE8;
     severity = ECmdCriticalSeverity;
@@ -364,17 +345,6 @@
     }
 
 // ---------------------------------------------------------------------------
-// r_cmd_mylocationsengine
-// ---------------------------------------------------------------------------
-//	
-RESOURCE SSM_START_PROCESS_INFO r_cmd_mylocationsengine
-    {
-    priority = 0x7EEC;
-    name = "z:\\sys\\bin\\mylocationsengine.exe";
-    execution_behaviour = ESsmFireAndForget;
-    }
-
-// ---------------------------------------------------------------------------
 // r_cmd_pbk2
 // ---------------------------------------------------------------------------
 //