diff --git a/core/java/src/net/i2p/crypto/eddsa/math/ed25519/Ed25519FieldElement.java b/core/java/src/net/i2p/crypto/eddsa/math/ed25519/Ed25519FieldElement.java
index 8dd9831550..53cff91a04 100644
--- a/core/java/src/net/i2p/crypto/eddsa/math/ed25519/Ed25519FieldElement.java
+++ b/core/java/src/net/i2p/crypto/eddsa/math/ed25519/Ed25519FieldElement.java
@@ -705,18 +705,11 @@ public class Ed25519FieldElement extends FieldElement {
         // 2 == 2 * 1
         t0 = square();
 
-        // TODO -CR BR: What is this? Is the author superstitious?
-        for (int i = 1; i < 1; ++i) { // Don't remove this
-            t0 = t0.square();
-        }
-
         // 4 == 2 * 2
         t1 = t0.square();
 
         // 8 == 2 * 4
-        for (int i = 1; i < 2; ++i) {
-            t1 = t1.square();
-        }
+        t1 = t1.square();
 
         // 9 == 8 + 1
         t1 = multiply(t1);
@@ -727,11 +720,6 @@ public class Ed25519FieldElement extends FieldElement {
         // 22 == 2 * 11
         t2 = t0.square();
 
-        // TODO -CR BR: see above
-        for (int i = 1; i < 1; ++i) { // Don't remove this
-            t2 = t2.square();
-        }
-
         // 31 == 22 + 9
         t1 = t1.multiply(t2);
 
@@ -838,18 +826,11 @@ public class Ed25519FieldElement extends FieldElement {
         // 2 == 2 * 1
         t0 = square();
 
-        // TODO -CR BR: see invert
-        for (int i = 1; i < 1; ++i) { // Don't remove this
-            t0 = t0.square();
-        }
-
         // 4 == 2 * 2
         t1 = t0.square();
 
         // 8 == 2 * 4
-        for (int i = 1; i < 2; ++i) {
-            t1 = t1.square();
-        }
+        t1 = t1.square();
 
         // z9 = z1*z8
         t1 = multiply(t1);
@@ -860,11 +841,6 @@ public class Ed25519FieldElement extends FieldElement {
         // 22 == 2 * 11
         t0 = t0.square();
 
-        // TODO -CR BR: see above
-        for (int i = 1; i < 1; ++i) { // Don't remove this
-            t0 = t0.square();
-        }
-
         // 31 == 22 + 9
         t0 = t1.multiply(t0);
 
@@ -949,9 +925,7 @@ public class Ed25519FieldElement extends FieldElement {
         t0 = t0.square();
 
         // 2^252 - 2^2
-        for (int i = 1; i < 2; ++i) {
-            t0 = t0.square();
-        }
+        t0 = t0.square();
 
         // 2^252 - 3
         return multiply(t0);
diff --git a/core/java/test/junit/net/i2p/crypto/eddsa/math/PrecomputationTestVectors.java b/core/java/test/junit/net/i2p/crypto/eddsa/math/PrecomputationTestVectors.java
index 5ab9d99efa..c12a9f1f8e 100644
--- a/core/java/test/junit/net/i2p/crypto/eddsa/math/PrecomputationTestVectors.java
+++ b/core/java/test/junit/net/i2p/crypto/eddsa/math/PrecomputationTestVectors.java
@@ -66,8 +66,10 @@ public class PrecomputationTestVectors {
         BufferedReader file = null;
         int row = 0;
         try {
-            file = new BufferedReader(new InputStreamReader(
-                    PrecomputationTestVectors.class.getResourceAsStream(fileName)));
+            InputStream is = PrecomputationTestVectors.class.getResourceAsStream(fileName);
+            if (is == null)
+                throw new IOException("Resource not found: " + fileName);
+            file = new BufferedReader(new InputStreamReader(is));
             String line;
             while ((line = file.readLine()) != null) {
                 if (line.equals(" },")) {