1 files changed, 2 insertions, 40 deletions
diff --git a/src/mscorlib/src/System/Runtime/Remoting/ObjectHandle.cs b/src/mscorlib/src/System/Runtime/Remoting/ObjectHandle.cs
index d10df9d57b..5555670498 100644
--- a/src/mscorlib/src/System/Runtime/Remoting/ObjectHandle.cs
+++ b/src/mscorlib/src/System/Runtime/Remoting/ObjectHandle.cs
@@ -14,23 +14,14 @@
 ** 
 ===========================================================*/
 
-namespace System.Runtime.Remoting{
-
+namespace System.Runtime.Remoting
+{
     using System;
-    using System.Security.Permissions;
     using System.Runtime.InteropServices;
-    using System.Runtime.Remoting;
-#if FEATURE_REMOTING
-    using System.Runtime.Remoting.Activation;
-    using System.Runtime.Remoting.Lifetime;
-#endif
 
     [ClassInterface(ClassInterfaceType.AutoDual)]
     [System.Runtime.InteropServices.ComVisible(true)]
     public class ObjectHandle: 
-#if FEATURE_REMOTING
-        MarshalByRefObject, 
-#endif
         IObjectHandle 
     {
         private Object WrappedObject;
@@ -48,34 +39,5 @@ namespace System.Runtime.Remoting{
         {
             return WrappedObject;
         }
-
-        // ObjectHandle has a finite lifetime. For now the default
-        // lifetime is being used, this can be changed in this method to
-        // specify a custom lifetime.
-#if FEATURE_REMOTING
-        [System.Security.SecurityCritical]  // auto-generated_required
-        public override Object InitializeLifetimeService()
-        {
-            BCLDebug.Trace("REMOTE", "ObjectHandle.InitializeLifetimeService");
-
-            //
-            // If the wrapped object has implemented InitializeLifetimeService to return null,
-            // we don't want to go to the base class (which will result in a lease being
-            // requested from the MarshalByRefObject, which starts up the LeaseManager,
-            // which starts up the ThreadPool, adding three threads to the process.
-            // We check if the wrapped object is a MarshalByRef object, and call InitializeLifetimeServices on it
-            // and if it returns null, we return null. Otherwise we fall back to the old behavior.
-            //
-
-            MarshalByRefObject mbr = WrappedObject as MarshalByRefObject;
-            if (mbr != null) {
-                Object o = mbr.InitializeLifetimeService();
-                if (o == null)
-                    return null;
-            }
-            ILease lease = (ILease)base.InitializeLifetimeService();
-            return lease;
-        }
-#endif // FEATURE_REMOTING
     }
 }