diff --git a/src/java.base/share/classes/sun/security/ssl/SSLContextImpl.java b/src/java.base/share/classes/sun/security/ssl/SSLContextImpl.java
index 82e896170f0cf..6ffdfeda18def 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLContextImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLContextImpl.java
@@ -32,7 +32,6 @@
 import java.util.*;
 import java.util.concurrent.locks.ReentrantLock;
 import javax.net.ssl.*;
-import jdk.internal.access.SharedSecrets;
 import sun.security.action.GetPropertyAction;
 import sun.security.provider.certpath.AlgorithmChecker;
 import sun.security.validator.Validator;
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/FIPSKeyImporter.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/FIPSKeyImporter.java
index 8cfa2734d4ec5..d3f0bffb821b0 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/FIPSKeyImporter.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/FIPSKeyImporter.java
@@ -72,9 +72,6 @@ final class FIPSKeyImporter {
     private static volatile Provider sunECProvider = null;
     private static final ReentrantLock sunECProviderLock = new ReentrantLock();
 
-    private static volatile KeyFactory DHKF = null;
-    private static final ReentrantLock DHKFLock = new ReentrantLock();
-
     static Long importKey(SunPKCS11 sunPKCS11, long hSession, CK_ATTRIBUTE[] attributes)
             throws PKCS11Exception {
         long keyID = -1;
@@ -319,8 +316,7 @@ private static void exportPrivateKey(
                     CKA_PRIVATE_EXPONENT, CKA_PRIME_1, CKA_PRIME_2,
                     CKA_EXPONENT_1, CKA_EXPONENT_2, CKA_COEFFICIENT);
             RSAPrivateKey rsaPKey = RSAPrivateCrtKeyImpl.newKey(
-                    RSAUtil.KeyType.RSA, "PKCS#8", plainExportedKey
-            );
+                    RSAUtil.KeyType.RSA, "PKCS#8", plainExportedKey);
             CK_ATTRIBUTE attr;
             if ((attr = sensitiveAttrs.get(CKA_PRIVATE_EXPONENT)) != null) {
                 attr.pValue = rsaPKey.getPrivateExponent().toByteArray();