diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 2007727752..d1c8ad9aa1 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -648,7 +648,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             {
                 // Make sure that we see any exception caused by the asynchronous operation.
                 m_log.Error(
-                    string.Format("[LLCLIENTVIEW]: Caught exception while processing {0} {1} STACK: {2}", packetObject.Pack, e.ToString(),e.StackTrace), e);
+                    string.Format("[LLCLIENTVIEW]: Caught exception while processing {0} {1}", packetObject.Pack, e.ToString()), e);
             }      
         }
 
diff --git a/OpenSim/Region/Framework/Scenes/Components/ComponentState.cs b/OpenSim/Region/Framework/Scenes/Components/ComponentState.cs
index bb9832df03..3377d668ed 100644
--- a/OpenSim/Region/Framework/Scenes/Components/ComponentState.cs
+++ b/OpenSim/Region/Framework/Scenes/Components/ComponentState.cs
@@ -5,7 +5,7 @@ using System.Runtime.Serialization;
 namespace OpenSim.Region.Framework.Scenes.Components
 {
     [Serializable]
-    public class ComponentState : IComponentState
+    public class ComponentState
     {
         private readonly Dictionary<string,Object> m_stateData = new Dictionary<string,object>();
 
diff --git a/OpenSim/Region/Framework/Scenes/Components/IComponentState.cs b/OpenSim/Region/Framework/Scenes/Components/IComponentState.cs
deleted file mode 100644
index f7cafb70af..0000000000
--- a/OpenSim/Region/Framework/Scenes/Components/IComponentState.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace OpenSim.Region.Framework.Scenes.Components
-{
-    public interface IComponentState
-    {
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="name"></param>
-        /// <param name="data">A serializable type</param>
-        void Set<T>(string name, T data);
-
-        T Get<T>(string name);
-
-        bool TryGet<T>(string name, out T data);
-
-        string Serialise();
-    }
-}
diff --git a/OpenSim/Region/OptionalModules/World/TestComponent/TestComponent.cs b/OpenSim/Region/OptionalModules/World/TestComponent/TestComponent.cs
index 1f6b971712..1e4ee531aa 100644
--- a/OpenSim/Region/OptionalModules/World/TestComponent/TestComponent.cs
+++ b/OpenSim/Region/OptionalModules/World/TestComponent/TestComponent.cs
@@ -18,14 +18,6 @@ namespace OpenSim.Region.OptionalModules.World.TestComponent
 
         #region Implementation of IComponent
 
-        /// <summary>
-        /// Components MUST have a parameterless constructor
-        /// </summary>
-        public TestComponent()
-        {
-            
-        }
-
         public TestComponent(ComponentState state)
         {
             m_log.Info("Its alive!");