diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_375 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_375
deleted file mode 100644
index b7d8cacda..000000000
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_375 and /dev/null differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_63 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_63
deleted file mode 100644
index e6f03ad18..000000000
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_63 and /dev/null differ
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_HU b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_HU
deleted file mode 100644
index 8e7a77b18..000000000
Binary files a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_HU and /dev/null differ
diff --git a/tools/java/java-build/src/com/google/i18n/phonenumbers/BuildMetadataProtoFromXml.java b/tools/java/java-build/src/com/google/i18n/phonenumbers/BuildMetadataProtoFromXml.java
index 8e4fc3b59..282827106 100644
--- a/tools/java/java-build/src/com/google/i18n/phonenumbers/BuildMetadataProtoFromXml.java
+++ b/tools/java/java-build/src/com/google/i18n/phonenumbers/BuildMetadataProtoFromXml.java
@@ -172,6 +172,7 @@ public class BuildMetadataProtoFromXml extends Command {
         metadataCollection.writeExternal(out);
         out.close();
       } else {
+        deleteAllFilesForPrefix(filePrefix);
         for (PhoneMetadata metadata : metadataCollection.getMetadataList()) {
           String regionCode = metadata.getId();
           // For non-geographical country calling codes (e.g. +800), or for alternate formats, use the
@@ -186,6 +187,7 @@ public class BuildMetadataProtoFromXml extends Command {
           outMetadataCollection.writeExternal(out);
           out.close();
         }
+        System.out.println("Generated " + metadataCollection.getMetadataCount() + " new files");
       }
 
       Map<Integer, List<String>> countryCodeToRegionCodeMap =
@@ -197,10 +199,26 @@ public class BuildMetadataProtoFromXml extends Command {
       e.printStackTrace();
       return false;
     }
-    System.out.println("Metadata code successfully generated.");
+    System.out.println("Metadata code successfully created.");
     return true;
   }
 
+  private void deleteAllFilesForPrefix(String filePrefix) {
+    File[] allFiles = new File(filePrefix).getParentFile().listFiles();
+    if (allFiles == null) {
+      allFiles = new File[0];
+    }
+    int counter = 0;
+    for (File file: allFiles) {
+      if (file.getAbsolutePath().contains(filePrefix)) {
+        if (file.delete()) {
+          counter++;
+        }
+      }
+    }
+    System.out.println("Deleted " + counter + " old files");
+  }
+
   private static final String MAP_COMMENT =
       "  // A mapping from a country code to the region codes which denote the\n" +
       "  // country/region represented by that country code. In the case of multiple\n" +