diff --git a/src/java.rmi/share/classes/sun/rmi/log/LogInputStream.java b/src/java.rmi/share/classes/sun/rmi/log/LogInputStream.java
index d4176b63305ae..7853d47c0d7f4 100644
--- a/src/java.rmi/share/classes/sun/rmi/log/LogInputStream.java
+++ b/src/java.rmi/share/classes/sun/rmi/log/LogInputStream.java
@@ -124,12 +124,4 @@ public int available() throws IOException {
     public void close() {
         length = 0;
     }
-
-    /**
-     * Closes the stream when garbage is collected.
-     */
-    @SuppressWarnings("removal")
-    protected void finalize() throws IOException {
-        close();
-    }
 }
diff --git a/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/RegistryContext.java b/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/RegistryContext.java
index e5090cbaae10b..2f77c383bd697 100644
--- a/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/RegistryContext.java
+++ b/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/RegistryContext.java
@@ -100,11 +100,6 @@ public RegistryContext(String host, int port, Hashtable<?, ?> env)
         reference = ctx.reference;
     }
 
-    @SuppressWarnings("removal")
-    protected void finalize() {
-        close();
-    }
-
     public Object lookup(Name name) throws NamingException {
         if (name.isEmpty()) {
             return (new RegistryContext(this));
@@ -557,11 +552,6 @@ class BindingEnumeration implements NamingEnumeration<Binding> {
         nextName = 0;
     }
 
-    @SuppressWarnings("removal")
-    protected void finalize() {
-        ctx.close();
-    }
-
     public boolean hasMore() {
         if (nextName >= names.length) {
             ctx.close();
@@ -598,8 +588,7 @@ public Binding nextElement() {
         }
     }
 
-    @SuppressWarnings("deprecation")
     public void close () {
-        finalize();
+        ctx.close();
     }
 }