diff --git a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/PhysEngineToSceneConnector.cs b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/PhysEngineToSceneConnector.cs
index fbd69476d7..4550d97e69 100644
--- a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/PhysEngineToSceneConnector.cs
+++ b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/PhysEngineToSceneConnector.cs
@@ -90,9 +90,6 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
         private long m_messagesSent = 0;
         private long m_messagesReceived = 0;
 
-        //private QuarkSubsriptionInfo m_subscribedQuarks; 
-        
-
         private IConfig m_sysConfig;
 
         //members for load balancing purpose
@@ -121,9 +118,6 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
 
             SceneToPhysEngineSyncServer.logEnabled = m_sysConfig.GetBoolean("PhysLogEnabled", false);
             SceneToPhysEngineSyncServer.logDir = m_sysConfig.GetString("PhysLogDir", ".");
-
-            //assume we are connecting to the whole scene as one big quark
-            //m_subscribedQuarks = new QuarkSubsriptionInfo(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize);
         }
          
         // Start the RegionSyncPhysEngine client thread
@@ -172,19 +166,10 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
         {
             RegionSyncMessage msg = new RegionSyncMessage(RegionSyncMessage.MsgType.ActorStatus, Convert.ToString((int)ActorStatus.Sync));
             Send(msg);
-            // SendQuarkSubscription();
             Thread.Sleep(100);
             DoInitialSync();
         }
 
-
-        /*
-        public void SetQuarkSubscription(QuarkSubsriptionInfo quarks)
-        {
-            m_subscribedQuarks = quarks;
-        }
-         * */ 
-
         public void RegisterIdle()
         {
             EstablishConnection();
diff --git a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/PhysEngineToSceneConnectorModule.cs b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/PhysEngineToSceneConnectorModule.cs
index ea2082139a..3f585841f2 100644
--- a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/PhysEngineToSceneConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/PhysEngineToSceneConnectorModule.cs
@@ -298,18 +298,9 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
 
             Command cmdSyncStatus = new Command("status", CommandIntentions.COMMAND_HAZARDOUS, SyncStatus, "Displays synchronization status.");
 
-            //The following two commands are more for easier debugging purpose
-            //Command cmdSyncSetQuarks = new Command("quarkSpace", CommandIntentions.COMMAND_HAZARDOUS, SetQuarkList, "Set the set of quarks to subscribe to. For debugging purpose. Should be issued before \"sync start\"");
-            //cmdSyncSetQuarks.AddArgument("quarkSpace", "The (rectangle) space of quarks to subscribe, represented by x0_y0,x1_y1, the left-bottom and top-right corners of the rectangel space", "String");
-
-            //Command cmdSyncSetQuarkSize = new Command("quarksize", CommandIntentions.COMMAND_HAZARDOUS, SetQuarkSize, "Set the size of each quark. For debugging purpose. Should be issued before \"sync quarks\"");
-            //cmdSyncSetQuarkSize.AddArgument("quarksizeX", "The size on x axis of each quark", "Integer");
-            //cmdSyncSetQuarkSize.AddArgument("quarksizeY", "The size on y axis of each quark", "Integer");
-
             m_commander.RegisterCommand("start", cmdSyncStart);
             m_commander.RegisterCommand("stop", cmdSyncStop);
             m_commander.RegisterCommand("status", cmdSyncStatus);
-            //m_commander.RegisterCommand("quarkSpace", cmdSyncSetQuarks);
 
             lock (m_scene)
             {
@@ -361,13 +352,6 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
             }
         }
 
-        private void SetQuarkList(Object[] args)
-        {
-            m_subscriptionSpaceString = (string)args[0];
-
-            InitPhysEngineToSceneConnector(m_subscriptionSpaceString);
-        }
-
 
         private void InitPhysEngineToSceneConnector(string space)
         {
diff --git a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncMessage.cs b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncMessage.cs
index f4ab43d0d7..948bb28179 100644
--- a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncMessage.cs
+++ b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncMessage.cs
@@ -110,7 +110,6 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
             OnRezScript,
             OnScriptReset,
             OnUpdateScript,
-            QuarkSubscription,
             // Scene -> Script Engine
             NewObjectWithScript,
             SceneLocation,
@@ -124,14 +123,6 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
             LoadMigrationNotice,
             LoadBalanceResponse,
             LoadBalanceRejection,
-            //Overloaded script engine overloaded -> idle script engine
-            //MigratingQuarks,
-            MigrationSpace,
-            ScriptStateSyncStart,
-            ScriptStateSyncPerObject,
-            ScriptStateSyncEnd,
-            //Idle script engine overloaded -> overloaded script engine
-            ScriptStateSyncRequest,
             // Physics Engine -> Scene
             PhysTerseUpdate,
             PhysOutOfBounds,
diff --git a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SceneToPhysEngineSyncServer.cs b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SceneToPhysEngineSyncServer.cs
index 182a5bc634..8c27328962 100644
--- a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SceneToPhysEngineSyncServer.cs
+++ b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SceneToPhysEngineSyncServer.cs
@@ -131,7 +131,6 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
             // m_commander.RegisterCommand("start", cmdSyncStart);
             // m_commander.RegisterCommand("stop", cmdSyncStop);
             m_commander.RegisterCommand("status", cmdSyncStatus);
-            // m_commander.RegisterCommand("quarkSpace", cmdSyncSetQuarks);
 
             lock (m_scene)
             {
diff --git a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs
index 6f6b1c7bdf..88b1b0be29 100644
--- a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs
+++ b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs
@@ -745,9 +745,6 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
                 {
                     SceneObjectGroup sog = (SceneObjectGroup)e;
 
-                    //if (connector.IsPositionInSyncQuarks(sog.AbsolutePosition))
-                    //{
-
                     //SymmetricSyncMessage syncMsg = NewObjectMessageEncoder(sog);
                     OSDMap encodedSOG = SceneObjectEncoder(sog);
                     SymmetricSyncMessage syncMsg = new SymmetricSyncMessage(SymmetricSyncMessage.MsgType.NewObject, OSDParser.SerializeJsonString(encodedSOG));