diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java
index 9ae038069..3af06bf2c 100644
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java
@@ -650,13 +650,13 @@ public class PhoneNumberUtil {
         // We assume that the first-group symbol will never be _before_ the national prefix.
         candidateNationalPrefixRule =
             candidateNationalPrefixRule.substring(0, candidateNationalPrefixRule.indexOf("$1"));
-        candidateNationalPrefixRule = util.normalizeDigitsOnly(candidateNationalPrefixRule);
+        candidateNationalPrefixRule = normalizeDigitsOnly(candidateNationalPrefixRule);
         if (candidateNationalPrefixRule.length() == 0) {
           // National Prefix not needed for this number.
           return true;
         }
         // Normalize the remainder.
-        String rawInputCopy = util.normalizeDigitsOnly(number.getRawInput());
+        String rawInputCopy = normalizeDigitsOnly(number.getRawInput());
         StringBuilder rawInput = new StringBuilder(rawInputCopy);
         // Check if we found a national prefix and/or carrier code at the start of the raw input,
         // and return the result.
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumberUtil.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumberUtil.java
index 2a23d7cc0..c67fa36be 100644
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumberUtil.java
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumberUtil.java
@@ -17,7 +17,6 @@
 package com.google.i18n.phonenumbers;
 
 import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata;
-import com.google.i18n.phonenumbers.Phonemetadata.PhoneNumberDesc;
 
 import java.util.regex.Pattern;
 
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java
index 1e2ef4525..1e2e8fe30 100644
--- a/java/libphonenumber/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java
@@ -16,8 +16,6 @@
 
 package com.google.i18n.phonenumbers;
 
-import junit.framework.TestCase;
-
 /**
  * Unit tests for AsYouTypeFormatter.java
  *
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberMatcherTest.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberMatcherTest.java
index 30a8faba9..626d65a47 100644
--- a/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberMatcherTest.java
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberMatcherTest.java
@@ -19,8 +19,6 @@ package com.google.i18n.phonenumbers;
 import com.google.i18n.phonenumbers.PhoneNumberUtil.Leniency;
 import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
 
-import junit.framework.TestCase;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java
index fd151689a..7c5837b2c 100644
--- a/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java
@@ -23,8 +23,6 @@ import com.google.i18n.phonenumbers.Phonemetadata.PhoneNumberDesc;
 import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
 import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber.CountryCodeSource;
 
-import junit.framework.TestCase;
-
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberUtilTest.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberUtilTest.java
index c6d2c7481..682e87260 100644
--- a/java/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberUtilTest.java
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberUtilTest.java
@@ -16,10 +16,6 @@
 
 package com.google.i18n.phonenumbers;
 
-import junit.framework.TestCase;
-
-import java.io.InputStream;
-
 /**
  * Unit tests for ShortNumberUtil.java
  *
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/TestMetadataTestCase.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/TestMetadataTestCase.java
index 457712570..17131b4c8 100644
--- a/java/libphonenumber/test/com/google/i18n/phonenumbers/TestMetadataTestCase.java
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/TestMetadataTestCase.java
@@ -18,9 +18,6 @@ package com.google.i18n.phonenumbers;
 
 import junit.framework.TestCase;
 
-import java.io.IOException;
-import java.io.InputStream;
-
 /**
  * Root class for PhoneNumberUtil tests that depend on the test metadata file.
  * <p>