diff --git a/OpenSim/Framework/Servers/GetAssetStreamHandler.cs b/OpenSim/Framework/Servers/GetAssetStreamHandler.cs
index ffd7ef482e..d7fb72b9c6 100644
--- a/OpenSim/Framework/Servers/GetAssetStreamHandler.cs
+++ b/OpenSim/Framework/Servers/GetAssetStreamHandler.cs
@@ -86,10 +86,10 @@ namespace OpenSim.Framework.Servers
                 AssetBase asset = m_assetProvider.FetchAsset(assetID);
                 if (asset != null)
                 {
-                    if (asset.ContainsReferences && false)
-                    {                       
-                        asset.Data = ProcessOutgoingAssetData(asset.Data);
-                    }
+//                    if (asset.ContainsReferences)
+//                    {                       
+//                        asset.Data = ProcessOutgoingAssetData(asset.Data);
+//                    }
 
                     XmlSerializer xs = new XmlSerializer(typeof(AssetBase));
                     MemoryStream ms = new MemoryStream();
@@ -136,24 +136,24 @@ namespace OpenSim.Framework.Servers
             {
                 string result = String.Empty;
 
-                string key = m.Groups[1].Captures[0].Value;
-
-                string value = m.Groups[2].Captures[0].Value;
-
-                Guid userUri;
-
-                switch (key)
-                {
-                    case "creator_id":
-                        userUri = new Guid(value);
-                        //         result = "creator_url " + userService(userService, userUri);
-                        break;
-
-                    case "owner_id":
-                        userUri = new Guid(value);
-                        //       result = "owner_url " + ResolveUserUri(userService, userUri);
-                        break;
-                }
+//                string key = m.Groups[1].Captures[0].Value;
+//
+//                string value = m.Groups[2].Captures[0].Value;
+//
+//                Guid userUri;
+//
+//                switch (key)
+//                {
+//                    case "creator_id":
+//                        userUri = new Guid(value);
+//                        //         result = "creator_url " + userService(userService, userUri);
+//                        break;
+//
+//                    case "owner_id":
+//                        userUri = new Guid(value);
+//                        //       result = "owner_url " + ResolveUserUri(userService, userUri);
+//                        break;
+//                }
 
                 return result;
             });
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 7ddbfbf920..73406283ea 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -309,7 +309,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         private MuteListRequest handlerMuteListRequest;
 
-        private AvatarInterestUpdate handlerAvatarInterestUpdate;
+        //private AvatarInterestUpdate handlerAvatarInterestUpdate;
 
         private readonly IGroupsModule m_GroupsModule;
 
@@ -1107,7 +1107,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         public event MuteListRequest OnMuteListRequest;
 
-        public event AvatarInterestUpdate OnAvatarInterestUpdate;
+        //public event AvatarInterestUpdate OnAvatarInterestUpdate;
 
         public void ActivateGesture(UUID assetId, UUID gestureId)
         {
@@ -9111,11 +9111,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                                 Utils.BytesToString(avatarNotesUpdate.Data.Notes));
                     break;
 
-                case PacketType.AvatarInterestsUpdate:
-                    AvatarInterestsUpdatePacket avatarInterestUpdate =
-                            (AvatarInterestsUpdatePacket)Pack;
-
-                    break;
+//                case PacketType.AvatarInterestsUpdate:
+//                    AvatarInterestsUpdatePacket avatarInterestUpdate =
+//                            (AvatarInterestsUpdatePacket)Pack;
+//
+//                    break;
 
                 default:
                     m_log.Warn("[CLIENT]: unhandled packet " + Pack);
diff --git a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
index 05ae5a9c04..20c7dc1633 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
@@ -154,7 +154,7 @@ namespace OpenSim.Region.Communications.Hypergrid
         /// <returns>null if the request fails</returns>
         public override UserProfileData GetUserProfile(UUID avatarID)
         {
-            string url = string.Empty;
+            //string url = string.Empty;
             // Unfortunately we can't query for foreigners here,
             // because we'll end up in an infinite loop...
             //if ((m_localUserServices != null) && (!IsForeignUser(avatarID, out url)))
diff --git a/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs b/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs
index cdde893ab0..0fb6ebe37a 100644
--- a/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.XmlRpcRouterModule
 {
     public class XmlRpcRouter : IRegionModule, IXmlRpcRouter
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         
         public void Initialise(Scene scene, IConfigSource config)
         {
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 4b9affc0c3..20bfc2fd7e 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -770,7 +770,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 if (part != null)
                     part.RemoveScriptEvents(itemID);
 
-                bool objectRemoved = false;
+//                bool objectRemoved = false;
 
                 lock (m_PrimObjects)
                 {
@@ -785,7 +785,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                         if (m_PrimObjects[localID].Count == 0)
                         {
                             m_PrimObjects.Remove(localID);
-                            objectRemoved = true;
+//                            objectRemoved = true;
                         }
                     }
                 }