diff --git a/modules/swagger-codegen/src/main/resources/scalatra/licenseInfo.mustache b/modules/swagger-codegen/src/main/resources/scalatra/licenseInfo.mustache
index bbd8742e52a..adabafe0728 100644
--- a/modules/swagger-codegen/src/main/resources/scalatra/licenseInfo.mustache
+++ b/modules/swagger-codegen/src/main/resources/scalatra/licenseInfo.mustache
@@ -7,5 +7,4 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
  */
diff --git a/samples/server/petstore/scalatra/src/main/scala/JettyMain.scala b/samples/server/petstore/scalatra/src/main/scala/JettyMain.scala
index 757a745ad10..3c7b68f90a6 100644
--- a/samples/server/petstore/scalatra/src/main/scala/JettyMain.scala
+++ b/samples/server/petstore/scalatra/src/main/scala/JettyMain.scala
@@ -7,7 +7,6 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
  */
 
 import org.eclipse.jetty.server._
diff --git a/samples/server/petstore/scalatra/src/main/scala/ScalatraBootstrap.scala b/samples/server/petstore/scalatra/src/main/scala/ScalatraBootstrap.scala
index 7171a0e2a31..0fc9bf289b6 100644
--- a/samples/server/petstore/scalatra/src/main/scala/ScalatraBootstrap.scala
+++ b/samples/server/petstore/scalatra/src/main/scala/ScalatraBootstrap.scala
@@ -7,7 +7,6 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
  */
 
 
diff --git a/samples/server/petstore/scalatra/src/main/scala/ServletApp.scala b/samples/server/petstore/scalatra/src/main/scala/ServletApp.scala
index a48bb76a74e..47234828ab9 100644
--- a/samples/server/petstore/scalatra/src/main/scala/ServletApp.scala
+++ b/samples/server/petstore/scalatra/src/main/scala/ServletApp.scala
@@ -7,7 +7,6 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
  */
 
 
diff --git a/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/api/PetApi.scala b/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/api/PetApi.scala
index 9b2f3da7185..482a00f5bfe 100644
--- a/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/api/PetApi.scala
+++ b/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/api/PetApi.scala
@@ -7,7 +7,6 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
  */
 
 
diff --git a/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/api/StoreApi.scala b/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/api/StoreApi.scala
index e515a8ded49..eb6256bbaf3 100644
--- a/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/api/StoreApi.scala
+++ b/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/api/StoreApi.scala
@@ -7,7 +7,6 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
  */
 
 
diff --git a/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/api/UserApi.scala b/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/api/UserApi.scala
index 31de254933e..3b34708598d 100644
--- a/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/api/UserApi.scala
+++ b/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/api/UserApi.scala
@@ -7,7 +7,6 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
  */
 
 
diff --git a/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/model/ApiResponse.scala b/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/model/ApiResponse.scala
index f47a2cbf8e6..0e619dbef83 100644
--- a/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/model/ApiResponse.scala
+++ b/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/model/ApiResponse.scala
@@ -7,7 +7,6 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
  */
 
 package io.swagger.server.model
diff --git a/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/model/Category.scala b/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/model/Category.scala
index 7d092fa7109..e70c9720c06 100644
--- a/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/model/Category.scala
+++ b/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/model/Category.scala
@@ -7,7 +7,6 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
  */
 
 package io.swagger.server.model
diff --git a/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/model/Order.scala b/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/model/Order.scala
index 13eaeb08609..7a6b72afcbf 100644
--- a/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/model/Order.scala
+++ b/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/model/Order.scala
@@ -7,7 +7,6 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
  */
 
 package io.swagger.server.model
diff --git a/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/model/Pet.scala b/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/model/Pet.scala
index 4a658da88fc..c433411df89 100644
--- a/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/model/Pet.scala
+++ b/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/model/Pet.scala
@@ -7,7 +7,6 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
  */
 
 package io.swagger.server.model
diff --git a/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/model/Tag.scala b/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/model/Tag.scala
index f91b9ca4878..cc22d336a79 100644
--- a/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/model/Tag.scala
+++ b/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/model/Tag.scala
@@ -7,7 +7,6 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
  */
 
 package io.swagger.server.model
diff --git a/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/model/User.scala b/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/model/User.scala
index 1065c5492b5..5989838c8dd 100644
--- a/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/model/User.scala
+++ b/samples/server/petstore/scalatra/src/main/scala/io/swagger/server/model/User.scala
@@ -7,7 +7,6 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
  */
 
 package io.swagger.server.model