diff --git a/src/java.base/share/classes/java/io/BufferedInputStream.java b/src/java.base/share/classes/java/io/BufferedInputStream.java
index d4531d27db1..cfc2a3d2c75 100644
--- a/src/java.base/share/classes/java/io/BufferedInputStream.java
+++ b/src/java.base/share/classes/java/io/BufferedInputStream.java
@@ -61,7 +61,7 @@ public class BufferedInputStream extends FilterInputStream {
 
     /**
      * As this class is used early during bootstrap, it's motivated to use
-     * Unsafe.compareAndSetObject instead of AtomicReferenceFieldUpdater
+     * Unsafe.compareAndSetReference instead of AtomicReferenceFieldUpdater
      * (or VarHandles) to reduce dependencies and improve startup time.
      */
     private static final Unsafe U = Unsafe.getUnsafe();
diff --git a/src/java.base/share/classes/jdk/internal/misc/Unsafe.java b/src/java.base/share/classes/jdk/internal/misc/Unsafe.java
index 0b7d83a6c0b..eab07313da2 100644
--- a/src/java.base/share/classes/jdk/internal/misc/Unsafe.java
+++ b/src/java.base/share/classes/jdk/internal/misc/Unsafe.java
@@ -3861,91 +3861,4 @@ public final class Unsafe {
             cleaner.clean();
         }
     }
-
-    // The following deprecated methods are used by JSR 166.
-
-    @Deprecated(since="12", forRemoval=true)
-    public final Object getObject(Object o, long offset) {
-        return getReference(o, offset);
-    }
-    @Deprecated(since="12", forRemoval=true)
-    public final Object getObjectVolatile(Object o, long offset) {
-        return getReferenceVolatile(o, offset);
-    }
-    @Deprecated(since="12", forRemoval=true)
-    public final Object getObjectAcquire(Object o, long offset) {
-        return getReferenceAcquire(o, offset);
-    }
-    @Deprecated(since="12", forRemoval=true)
-    public final Object getObjectOpaque(Object o, long offset) {
-        return getReferenceOpaque(o, offset);
-    }
-
-
-    @Deprecated(since="12", forRemoval=true)
-    public final void putObject(Object o, long offset, Object x) {
-        putReference(o, offset, x);
-    }
-    @Deprecated(since="12", forRemoval=true)
-    public final void putObjectVolatile(Object o, long offset, Object x) {
-        putReferenceVolatile(o, offset, x);
-    }
-    @Deprecated(since="12", forRemoval=true)
-    public final void putObjectOpaque(Object o, long offset, Object x) {
-        putReferenceOpaque(o, offset, x);
-    }
-    @Deprecated(since="12", forRemoval=true)
-    public final void putObjectRelease(Object o, long offset, Object x) {
-        putReferenceRelease(o, offset, x);
-    }
-
-
-    @Deprecated(since="12", forRemoval=true)
-    public final Object getAndSetObject(Object o, long offset, Object newValue) {
-        return getAndSetReference(o, offset, newValue);
-    }
-    @Deprecated(since="12", forRemoval=true)
-    public final Object getAndSetObjectAcquire(Object o, long offset, Object newValue) {
-        return getAndSetReferenceAcquire(o, offset, newValue);
-    }
-    @Deprecated(since="12", forRemoval=true)
-    public final Object getAndSetObjectRelease(Object o, long offset, Object newValue) {
-        return getAndSetReferenceRelease(o, offset, newValue);
-    }
-
-
-    @Deprecated(since="12", forRemoval=true)
-    public final boolean compareAndSetObject(Object o, long offset, Object expected, Object x) {
-        return compareAndSetReference(o, offset, expected, x);
-    }
-    @Deprecated(since="12", forRemoval=true)
-    public final Object compareAndExchangeObject(Object o, long offset, Object expected, Object x) {
-        return compareAndExchangeReference(o, offset, expected, x);
-    }
-    @Deprecated(since="12", forRemoval=true)
-    public final Object compareAndExchangeObjectAcquire(Object o, long offset, Object expected, Object x) {
-        return compareAndExchangeReferenceAcquire(o, offset, expected, x);
-    }
-    @Deprecated(since="12", forRemoval=true)
-    public final Object compareAndExchangeObjectRelease(Object o, long offset, Object expected, Object x) {
-        return compareAndExchangeReferenceRelease(o, offset, expected, x);
-    }
-
-
-    @Deprecated(since="12", forRemoval=true)
-    public final boolean weakCompareAndSetObject(Object o, long offset, Object expected, Object x) {
-        return weakCompareAndSetReference(o, offset, expected, x);
-    }
-    @Deprecated(since="12", forRemoval=true)
-    public final boolean weakCompareAndSetObjectAcquire(Object o, long offset, Object expected, Object x) {
-        return weakCompareAndSetReferenceAcquire(o, offset, expected, x);
-    }
-    @Deprecated(since="12", forRemoval=true)
-    public final boolean weakCompareAndSetObjectPlain(Object o, long offset, Object expected, Object x) {
-        return weakCompareAndSetReferencePlain(o, offset, expected, x);
-    }
-    @Deprecated(since="12", forRemoval=true)
-    public final boolean weakCompareAndSetObjectRelease(Object o, long offset, Object expected, Object x) {
-        return weakCompareAndSetReferenceRelease(o, offset, expected, x);
-    }
 }
diff --git a/test/hotspot/jtreg/compiler/stable/TestUnstableStable.java b/test/hotspot/jtreg/compiler/stable/TestUnstableStable.java
index 140933daa34..8327c5ecd2c 100644
--- a/test/hotspot/jtreg/compiler/stable/TestUnstableStable.java
+++ b/test/hotspot/jtreg/compiler/stable/TestUnstableStable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, 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
@@ -89,9 +89,9 @@ public class TestUnstableStable {
                 stableArray1[0][0] = null;
                 stableArray1[0][0] = 42;
                 stableArray1[0][0] = 43;
-                U.putObject(TestUnstableStable.class, FIELD_OFFSET, null);
-                U.putObject(TestUnstableStable.class, FIELD_OFFSET, 42);
-                U.putObject(TestUnstableStable.class, FIELD_OFFSET, 43);
+                U.putReference(TestUnstableStable.class, FIELD_OFFSET, null);
+                U.putReference(TestUnstableStable.class, FIELD_OFFSET, 42);
+                U.putReference(TestUnstableStable.class, FIELD_OFFSET, 43);
             }
         }
     }
diff --git a/test/hotspot/jtreg/gc/shenandoah/compiler/TestUnsafeLoadStoreMergedHeapStableTests.java b/test/hotspot/jtreg/gc/shenandoah/compiler/TestUnsafeLoadStoreMergedHeapStableTests.java
index e7f9c777ef8..77af9963830 100644
--- a/test/hotspot/jtreg/gc/shenandoah/compiler/TestUnsafeLoadStoreMergedHeapStableTests.java
+++ b/test/hotspot/jtreg/gc/shenandoah/compiler/TestUnsafeLoadStoreMergedHeapStableTests.java
@@ -55,7 +55,7 @@ public class TestUnsafeLoadStoreMergedHeapStableTests {
 
     static Object testHelper(boolean flag, Object o, long offset, Object x) {
         if (flag) {
-            return UNSAFE.getAndSetObject(o, offset, x);
+            return UNSAFE.getAndSetReference(o, offset, x);
         }
         return null;
     }
@@ -68,7 +68,7 @@ public class TestUnsafeLoadStoreMergedHeapStableTests {
     }
 
     static Object test2(Object o, long offset) {
-        return UNSAFE.getAndSetObject(o, offset, field);
+        return UNSAFE.getAndSetReference(o, offset, field);
     }
 
     static public void main(String[] args) {