diff --git a/src/java.base/share/classes/sun/security/util/math/IntegerMontgomeryFieldModuloP.java b/src/java.base/share/classes/sun/security/util/math/IntegerMontgomeryFieldModuloP.java
index 2987674a32b..f875df8230b 100644
--- a/src/java.base/share/classes/sun/security/util/math/IntegerMontgomeryFieldModuloP.java
+++ b/src/java.base/share/classes/sun/security/util/math/IntegerMontgomeryFieldModuloP.java
@@ -25,8 +25,6 @@
 
 package sun.security.util.math;
 
-import java.math.BigInteger;
-
 /**
  * An interface for the field of integers modulo a prime number. An
  * implementation of this interface can be used to get properties of the
diff --git a/src/java.base/share/classes/sun/security/util/math/intpoly/IntegerPolynomial.java b/src/java.base/share/classes/sun/security/util/math/intpoly/IntegerPolynomial.java
index 05b4a71bebb..bb8d727ba98 100644
--- a/src/java.base/share/classes/sun/security/util/math/intpoly/IntegerPolynomial.java
+++ b/src/java.base/share/classes/sun/security/util/math/intpoly/IntegerPolynomial.java
@@ -824,7 +824,7 @@ public abstract sealed class IntegerPolynomial implements IntegerFieldModuloP
                 numAdds = 0;
             }
 
-            numAdds = IntegerPolynomial.this.square(limbs, limbs);;
+            numAdds = IntegerPolynomial.this.square(limbs, limbs);
             return this;
         }
 
diff --git a/src/java.base/share/classes/sun/security/util/math/intpoly/MontgomeryIntegerPolynomialP256.java b/src/java.base/share/classes/sun/security/util/math/intpoly/MontgomeryIntegerPolynomialP256.java
index d4c0348eb9d..3a84b5f5088 100644
--- a/src/java.base/share/classes/sun/security/util/math/intpoly/MontgomeryIntegerPolynomialP256.java
+++ b/src/java.base/share/classes/sun/security/util/math/intpoly/MontgomeryIntegerPolynomialP256.java
@@ -29,7 +29,6 @@ import sun.security.util.math.ImmutableIntegerModuloP;
 import sun.security.util.math.IntegerMontgomeryFieldModuloP;
 import sun.security.util.math.SmallValue;
 import sun.security.util.math.IntegerFieldModuloP;
-import java.lang.Math;
 import java.math.BigInteger;
 import jdk.internal.vm.annotation.IntrinsicCandidate;
 
@@ -110,7 +109,7 @@ public final class MontgomeryIntegerPolynomialP256 extends IntegerPolynomial
 
     @Override
     public SmallValue getSmallValue(int value) {
-        // Explicitely here as reminder that SmallValue stays in residue domain
+        // Explicitly here as reminder that SmallValue stays in residue domain
         // See multByInt below for how this is used
         return super.getSmallValue(value);
     }
@@ -557,4 +556,4 @@ public final class MontgomeryIntegerPolynomialP256 extends IntegerPolynomial
         limbs[i - 5] += (v << 4) & LIMB_MASK;
         limbs[i - 4] += v >> 48;
     }
-}
\ No newline at end of file
+}
diff --git a/test/jdk/com/sun/security/ec/ECOperationsKATTest.java b/test/jdk/com/sun/security/ec/ECOperationsKATTest.java
index 3c98b5f63cd..c86326ffccd 100644
--- a/test/jdk/com/sun/security/ec/ECOperationsKATTest.java
+++ b/test/jdk/com/sun/security/ec/ECOperationsKATTest.java
@@ -250,4 +250,4 @@ int main(){
   BN_CTX_free(ctx);
   return 0;
 }
- */
\ No newline at end of file
+ */
diff --git a/test/jdk/com/sun/security/util/math/intpoly/IntegerPolynomialTest.java b/test/jdk/com/sun/security/util/math/intpoly/IntegerPolynomialTest.java
index 237c0408c58..809731e8c19 100644
--- a/test/jdk/com/sun/security/util/math/intpoly/IntegerPolynomialTest.java
+++ b/test/jdk/com/sun/security/util/math/intpoly/IntegerPolynomialTest.java
@@ -92,4 +92,4 @@ public class IntegerPolynomialTest {
     }
 }
 
-//make test TEST="test/jdk/com/sun/security/util/math/intpoly/IntegerPolynomialTest.java"
\ No newline at end of file
+//make test TEST="test/jdk/com/sun/security/util/math/intpoly/IntegerPolynomialTest.java"
diff --git a/test/jdk/com/sun/security/util/math/intpoly/MontgomeryPolynomialFuzzTest.java b/test/jdk/com/sun/security/util/math/intpoly/MontgomeryPolynomialFuzzTest.java
index da5aa33d831..8c76a312f53 100644
--- a/test/jdk/com/sun/security/util/math/intpoly/MontgomeryPolynomialFuzzTest.java
+++ b/test/jdk/com/sun/security/util/math/intpoly/MontgomeryPolynomialFuzzTest.java
@@ -97,4 +97,4 @@ public class MontgomeryPolynomialFuzzTest {
     }
 }
 
-//make test TEST="test/jdk/com/sun/security/util/math/intpoly/MontgomeryPolynomialFuzzTest.java"
\ No newline at end of file
+//make test TEST="test/jdk/com/sun/security/util/math/intpoly/MontgomeryPolynomialFuzzTest.java"