1 files changed, 30 insertions, 28 deletions

diff --git a/src/mscorlib/src/System/DuplicateWaitObjectException.cs b/src/mscorlib/src/System/DuplicateWaitObjectException.cs
index d358d964c2..da29e2ad76 100644
--- a/src/mscorlib/src/System/DuplicateWaitObjectException.cs
+++ b/src/mscorlib/src/System/DuplicateWaitObjectException.cs
@@ -11,53 +11,55 @@
 **
 =============================================================================*/
 
-namespace System {
-    
-    using System;
-    using System.Runtime.Remoting;
-    using System.Runtime.Serialization;
+using System.Runtime.Serialization;
 
+namespace System
+{
     // The DuplicateWaitObjectException is thrown when an object 
     // appears more than once in the list of objects to WaitAll or WaitAny.
     // 
-    [System.Runtime.InteropServices.ComVisible(true)]
     [Serializable]
-    public class DuplicateWaitObjectException : ArgumentException {
+    public class DuplicateWaitObjectException : ArgumentException
+    {
+        private static volatile String s_duplicateWaitObjectMessage = null;
 
-        private static volatile String _duplicateWaitObjectMessage = null;
-
-        private static String DuplicateWaitObjectMessage {
-            get {
-                if (_duplicateWaitObjectMessage == null)
-                    _duplicateWaitObjectMessage = Environment.GetResourceString("Arg_DuplicateWaitObjectException");
-                return _duplicateWaitObjectMessage;
+        private static String DuplicateWaitObjectMessage
+        {
+            get
+            {
+                if (s_duplicateWaitObjectMessage == null)
+                    s_duplicateWaitObjectMessage = SR.Arg_DuplicateWaitObjectException;
+                return s_duplicateWaitObjectMessage;
             }
         }
 
         // Creates a new DuplicateWaitObjectException with its message 
         // string set to a default message.
-        public DuplicateWaitObjectException() 
-            : base(DuplicateWaitObjectMessage) {
-            SetErrorCode(__HResults.COR_E_DUPLICATEWAITOBJECT);
+        public DuplicateWaitObjectException()
+            : base(DuplicateWaitObjectMessage)
+        {
+            HResult = __HResults.COR_E_DUPLICATEWAITOBJECT;
         }
 
-        public DuplicateWaitObjectException(String parameterName) 
-            : base(DuplicateWaitObjectMessage, parameterName) {
-            SetErrorCode(__HResults.COR_E_DUPLICATEWAITOBJECT);
+        public DuplicateWaitObjectException(String parameterName)
+            : base(DuplicateWaitObjectMessage, parameterName)
+        {
+            HResult = __HResults.COR_E_DUPLICATEWAITOBJECT;
         }
 
-        public DuplicateWaitObjectException(String parameterName, String message) 
-            : base(message, parameterName) {
-            SetErrorCode(__HResults.COR_E_DUPLICATEWAITOBJECT);
+        public DuplicateWaitObjectException(String parameterName, String message)
+            : base(message, parameterName)
+        {
+            HResult = __HResults.COR_E_DUPLICATEWAITOBJECT;
         }
 
-        public DuplicateWaitObjectException(String message, Exception innerException) 
-            : base(message, innerException) {
-            SetErrorCode(__HResults.COR_E_DUPLICATEWAITOBJECT);
+        public DuplicateWaitObjectException(String message, Exception innerException)
+            : base(message, innerException)
+        {
+            HResult = __HResults.COR_E_DUPLICATEWAITOBJECT;
         }
 
         // This constructor is required for serialization
-        protected DuplicateWaitObjectException(SerializationInfo info, StreamingContext context) : base (info, context) {
-        }
+        protected DuplicateWaitObjectException(SerializationInfo info, StreamingContext context) : base(info, context) { }
     }
 }