diff --git a/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnector.java b/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnector.java
index 251bc6ffb40..626c921f2da 100644
--- a/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnector.java
+++ b/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnector.java
@@ -185,7 +185,7 @@ public class RMIConnector implements JMXConnector, Serializable, JMXAddressable
      * syntaxes, for example:</p>
      *
      * <pre>
-     * service:jmx:iiop://<em>[host[:port]]</em>/stub/<em>encoded-stub</em>
+     * service:jmx:myprotocolname://<em>[host[:port]]</em>/stub/<em>encoded-stub</em>
      * </pre>
      *
      * @param url the address of the RMI connector server.
diff --git a/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIIIOPServerImpl.java b/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIIIOPServerImpl.java
deleted file mode 100644
index 00b25b71d9e..00000000000
--- a/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIIIOPServerImpl.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javax.management.remote.rmi;
-
-import java.io.IOException;
-import java.rmi.Remote;
-import java.util.Map;
-import javax.security.auth.Subject;
-
-/**
- * <p>An {@link RMIServerImpl} that is exported through IIOP and that
- * creates client connections as RMI objects exported through IIOP.
- * User code does not usually reference this class directly.</p>
- *
- * @see RMIServerImpl
- *
- * @since 1.5
- * @deprecated This transport is no longer supported.
- */
-@Deprecated
-public class RMIIIOPServerImpl extends RMIServerImpl {
-    /**
-     * Throws {@linkplain UnsupportedOperationException}
-     *
-     * @param env the environment containing attributes for the new
-     * <code>RMIServerImpl</code>.  Can be null, which is equivalent
-     * to an empty Map.
-     *
-     * @throws IOException if the RMI object cannot be created.
-     */
-    public RMIIIOPServerImpl(Map<String,?> env)
-            throws IOException {
-        super(env);
-
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    protected void export() throws IOException {
-        throw new UnsupportedOperationException("Method not supported. JMX RMI-IIOP is deprecated");
-    }
-
-    @Override
-    protected String getProtocol() {
-        return "iiop";
-    }
-
-    @Override
-    public Remote toStub() throws IOException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    protected RMIConnection makeClient(String connectionId, Subject subject)
-            throws IOException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    protected void closeClient(RMIConnection client) throws IOException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    protected void closeServer() throws IOException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    RMIConnection doNewClient(final Object credentials) throws IOException {
-        throw new UnsupportedOperationException();
-    }
-}