diff --git a/samples/server-generator/scalatra/output/src/main/scala/apis/PetApi.scala b/samples/server-generator/scalatra/output/src/main/scala/apis/PetApi.scala
index cb5d08273dc..9e80b08ca35 100644
--- a/samples/server-generator/scalatra/output/src/main/scala/apis/PetApi.scala
+++ b/samples/server-generator/scalatra/output/src/main/scala/apis/PetApi.scala
@@ -18,16 +18,7 @@ class PetApi (implicit val swagger: Swagger) extends ScalatraServlet
 
   protected val applicationDescription: String = "PetApi"
   override protected val applicationName: Option[String] = Some("pet")
-/*
-  def swaggerToModel(cls: Class[_]) = {
-    val docObj = ApiPropertiesReader.read(cls)
-    val name = docObj.getName
-    val fields = for (field <- docObj.getFields.asScala.filter(d => d.paramType != null))
-      yield (field.name -> ModelField(field.name, field.notes, DataType(field.paramType)))
 
-    Model(name, name, fields.toMap)
-  }
-*/
   before() {
     contentType = formats("json")
     response.headers += ("Access-Control-Allow-Origin" -> "*")
diff --git a/samples/server-generator/scalatra/output/src/main/scala/apis/StoreApi.scala b/samples/server-generator/scalatra/output/src/main/scala/apis/StoreApi.scala
index c2a829ed1fe..8ee1e8d2b05 100644
--- a/samples/server-generator/scalatra/output/src/main/scala/apis/StoreApi.scala
+++ b/samples/server-generator/scalatra/output/src/main/scala/apis/StoreApi.scala
@@ -18,16 +18,7 @@ class StoreApi (implicit val swagger: Swagger) extends ScalatraServlet
 
   protected val applicationDescription: String = "StoreApi"
   override protected val applicationName: Option[String] = Some("store")
-/*
-  def swaggerToModel(cls: Class[_]) = {
-    val docObj = ApiPropertiesReader.read(cls)
-    val name = docObj.getName
-    val fields = for (field <- docObj.getFields.asScala.filter(d => d.paramType != null))
-      yield (field.name -> ModelField(field.name, field.notes, DataType(field.paramType)))
 
-    Model(name, name, fields.toMap)
-  }
-*/
   before() {
     contentType = formats("json")
     response.headers += ("Access-Control-Allow-Origin" -> "*")
diff --git a/samples/server-generator/scalatra/output/src/main/scala/apis/UserApi.scala b/samples/server-generator/scalatra/output/src/main/scala/apis/UserApi.scala
index e3fa55ad0f9..c498e18dab5 100644
--- a/samples/server-generator/scalatra/output/src/main/scala/apis/UserApi.scala
+++ b/samples/server-generator/scalatra/output/src/main/scala/apis/UserApi.scala
@@ -18,16 +18,7 @@ class UserApi (implicit val swagger: Swagger) extends ScalatraServlet
 
   protected val applicationDescription: String = "UserApi"
   override protected val applicationName: Option[String] = Some("user")
-/*
-  def swaggerToModel(cls: Class[_]) = {
-    val docObj = ApiPropertiesReader.read(cls)
-    val name = docObj.getName
-    val fields = for (field <- docObj.getFields.asScala.filter(d => d.paramType != null))
-      yield (field.name -> ModelField(field.name, field.notes, DataType(field.paramType)))
 
-    Model(name, name, fields.toMap)
-  }
-*/
   before() {
     contentType = formats("json")
     response.headers += ("Access-Control-Allow-Origin" -> "*")
diff --git a/samples/server-generator/scalatra/templates/api.mustache b/samples/server-generator/scalatra/templates/api.mustache
index 037bdbe2c17..22647a12036 100644
--- a/samples/server-generator/scalatra/templates/api.mustache
+++ b/samples/server-generator/scalatra/templates/api.mustache
@@ -19,16 +19,7 @@ class {{className}} (implicit val swagger: Swagger) extends ScalatraServlet
 
   protected val applicationDescription: String = "{{className}}"
   override protected val applicationName: Option[String] = Some("{{baseName}}")
-/*
-  def swaggerToModel(cls: Class[_]) = {
-    val docObj = ApiPropertiesReader.read(cls)
-    val name = docObj.getName
-    val fields = for (field <- docObj.getFields.asScala.filter(d => d.paramType != null))
-      yield (field.name -> ModelField(field.name, field.notes, DataType(field.paramType)))
 
-    Model(name, name, fields.toMap)
-  }
-*/
   before() {
     contentType = formats("json")
     response.headers += ("Access-Control-Allow-Origin" -> "*")