--- old/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java	2019-06-23 08:54:32.738701900 -0400
+++ new/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java	2019-06-23 08:54:30.773064100 -0400
@@ -64,7 +64,6 @@
     private static final ResourceBundle I18N = ResourceBundle.getBundle(
             "jdk.jpackage.internal.resources.MainResources");
 
-    private static final String IMAGE_PACKAGE_TYPE = "app-image";
     private static final String FA_EXTENSIONS = "extension";
     private static final String FA_CONTENT_TYPE = "mime-type";
     private static final String FA_DESCRIPTION = "description";
@@ -377,8 +376,7 @@
         }
 
         String getIdWithPrefix() {
-            String prefix = isMode() ? "" : "--";
-            return prefix + this.id;
+            return "--" + this.id;
         }
 
         String getShortIdWithPrefix() {
@@ -393,10 +391,6 @@
             }
         }
 
-        boolean isMode() {
-            return category == OptionCategories.MODE;
-        }
-
         OptionCategories getCategory() {
             return category;
         }
@@ -424,17 +418,12 @@
             context().pos++;
         }
 
-        private static void prevArg() {
-            context().pos--;
-        }
-
         private static boolean hasNextArg() {
             return context().pos < context().argList.size();
         }
     }
 
     enum OptionCategories {
-        MODE,
         MODULAR,
         PROPERTY,
         PLATFORM_MAC,
@@ -541,7 +530,7 @@
     private void validateArguments() throws PackagerException {
         String packageType = deployParams.getTargetFormat();
         String ptype = (packageType != null) ? packageType : "default";
-        boolean imageOnly = IMAGE_PACKAGE_TYPE.equals(packageType);
+        boolean imageOnly = (packageType == null);
         boolean hasAppImage = allOptions.contains(
                 CLIOptions.PREDEFINED_APP_IMAGE);
         boolean hasRuntime = allOptions.contains(
@@ -694,10 +683,6 @@
         deployParams.setClasspath();
     }
 
-    static boolean isCLIOption(String arg) {
-        return toCLIOption(arg) != null;
-    }
-
     static CLIOptions toCLIOption(String arg) {
         CLIOptions option;
         if ((option = argIds.get(arg)) == null) {