diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
index 01ac045c38dc..c5be6d4563a8 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
@@ -702,25 +702,30 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
         }
         objs.put("models", models);
 
-        List<Map<String, String>> imports = new ArrayList<Map<String, String>>();
+        Set<String> importSet = new TreeSet<String>();
         for (String nextImport : allImports) {
-            Map<String, String> im = new LinkedHashMap<String, String>();
+            Map<String, String> im = new HashMap<String, String>();
             String mapping = config.importMapping().get(nextImport);
             if (mapping == null) {
                 mapping = config.toModelImport(nextImport);
             }
             if (mapping != null && !config.defaultIncludes().contains(mapping)) {
-                im.put("import", mapping);
-                imports.add(im);
+                importSet.add(mapping);
             }
             // add instantiation types
             mapping = config.instantiationTypes().get(nextImport);
             if (mapping != null && !config.defaultIncludes().contains(mapping)) {
-                im.put("import", mapping);
-                imports.add(im);
+                importSet.add(mapping);
             }
         }
 
+        List<Map<String, String>> imports = new ArrayList<Map<String, String>>();
+        for(String s: importSet) {
+            Map<String, String> item = new HashMap<String, String>();
+            item.put("import", s);
+            imports.add(item);
+        }
+
         objs.put("imports", imports);
         config.postProcessModels(objs);
 
diff --git a/modules/swagger-codegen/src/main/resources/Java/model.mustache b/modules/swagger-codegen/src/main/resources/Java/model.mustache
index 2f3d4780a333..005d63991daf 100644
--- a/modules/swagger-codegen/src/main/resources/Java/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/model.mustache
@@ -1,14 +1,10 @@
 package {{package}};
 
-import {{invokerPackage}}.StringUtil;
 {{#imports}}import {{import}};
 {{/imports}}
 
-{{#serializableModel}}
-import java.io.Serializable;{{/serializableModel}}
-
+{{#serializableModel}}import java.io.Serializable;{{/serializableModel}}
 {{#models}}
-
 {{#model}}{{#description}}
 /**
  * {{description}}
diff --git a/modules/swagger-codegen/src/main/resources/Java/pojo.mustache b/modules/swagger-codegen/src/main/resources/Java/pojo.mustache
index 6d65b5a888da..eea33d346d4d 100644
--- a/modules/swagger-codegen/src/main/resources/Java/pojo.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/pojo.mustache
@@ -1,4 +1,4 @@
-@ApiModel(description = "{{{description}}}")
+{{#description}}@ApiModel(description = "{{{description}}}"){{/description}}
 {{>generatedAnnotation}}
 public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
   {{#vars}}{{#isEnum}}
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/model.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/model.mustache
index 2f3d4780a333..005d63991daf 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/model.mustache
@@ -1,14 +1,10 @@
 package {{package}};
 
-import {{invokerPackage}}.StringUtil;
 {{#imports}}import {{import}};
 {{/imports}}
 
-{{#serializableModel}}
-import java.io.Serializable;{{/serializableModel}}
-
+{{#serializableModel}}import java.io.Serializable;{{/serializableModel}}
 {{#models}}
-
 {{#model}}{{#description}}
 /**
  * {{description}}
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/pojo.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/pojo.mustache
index 6d65b5a888da..eea33d346d4d 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/pojo.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/jersey1_18/pojo.mustache
@@ -1,4 +1,4 @@
-@ApiModel(description = "{{{description}}}")
+{{#description}}@ApiModel(description = "{{{description}}}"){{/description}}
 {{>generatedAnnotation}}
 public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
   {{#vars}}{{#isEnum}}