diff --git a/akka-stream/src/main/boilerplate/akka/stream/javadsl/GraphCreate.scala.template b/akka-stream/src/main/boilerplate/akka/stream/javadsl/GraphCreate.scala.template
index 6fef120904..2cb712eedf 100644
--- a/akka-stream/src/main/boilerplate/akka/stream/javadsl/GraphCreate.scala.template
+++ b/akka-stream/src/main/boilerplate/akka/stream/javadsl/GraphCreate.scala.template
@@ -5,7 +5,7 @@
 package akka.stream.javadsl
 
 import akka.stream.scaladsl
-import akka.stream.{ Inlet, Shape, Graph }
+import akka.stream.{ Shape, Graph }
 import akka.japi.function
 import akka.NotUsed
 
@@ -39,6 +39,6 @@ private[stream] abstract class GraphCreate {
   def create1[[#S1 <: Shape#], S <: Shape, [#M1#], M]([#g1: Graph[S1, M1]#], combineMat: function.Function1[[#M1#], M],
       block: function.Function2[GraphDSL.Builder[M], [#S1#], S]): Graph[S, M] =
     scaladsl.GraphDSL.create([#g1#])(combineMat.apply) { b => ([#s1#]) => block.apply(b.asJava, [#s1#]) }#
-  
+
   ]
 }
diff --git a/akka-stream/src/main/boilerplate/akka/stream/scaladsl/GraphApply.scala.template b/akka-stream/src/main/boilerplate/akka/stream/scaladsl/GraphApply.scala.template
index 87b6b933be..ffee4337d4 100644
--- a/akka-stream/src/main/boilerplate/akka/stream/scaladsl/GraphApply.scala.template
+++ b/akka-stream/src/main/boilerplate/akka/stream/scaladsl/GraphApply.scala.template
@@ -5,8 +5,7 @@
 package akka.stream.scaladsl
 
 import akka.NotUsed
-import akka.stream.impl.TraversalBuilder
-import akka.stream.{ Graph, Attributes, Shape }
+import akka.stream.{ Graph, Shape }
 
 trait GraphApply {
   /**
diff --git a/akka-stream/src/main/boilerplate/akka/stream/scaladsl/UnzipWithApply.scala.template b/akka-stream/src/main/boilerplate/akka/stream/scaladsl/UnzipWithApply.scala.template
index faabcca63b..59b5548958 100644
--- a/akka-stream/src/main/boilerplate/akka/stream/scaladsl/UnzipWithApply.scala.template
+++ b/akka-stream/src/main/boilerplate/akka/stream/scaladsl/UnzipWithApply.scala.template
@@ -5,11 +5,9 @@
 package akka.stream.scaladsl
 
 import akka.stream._
-import akka.stream.impl.StreamLayout
 import akka.stream.stage._
 
 object UnzipWithApply {
-  import scala.language.implicitConversions
 
   abstract trait UnzipWithCreator[In, Out, T] {
     def create(unzipper: Function1[In, Out]): T
diff --git a/akka-stream/src/main/boilerplate/akka/stream/scaladsl/ZipLatestWithApply.scala.template b/akka-stream/src/main/boilerplate/akka/stream/scaladsl/ZipLatestWithApply.scala.template
index 0cb7a2fedc..35a0af15ad 100644
--- a/akka-stream/src/main/boilerplate/akka/stream/scaladsl/ZipLatestWithApply.scala.template
+++ b/akka-stream/src/main/boilerplate/akka/stream/scaladsl/ZipLatestWithApply.scala.template
@@ -5,7 +5,6 @@
 package akka.stream.scaladsl
 
 import akka.stream._
-import akka.stream.impl.StreamLayout
 import akka.stream.stage.{ GraphStage, GraphStageLogic, InHandler, OutHandler }
 
 trait ZipLatestWithApply {
diff --git a/akka-stream/src/main/boilerplate/akka/stream/scaladsl/ZipWithApply.scala.template b/akka-stream/src/main/boilerplate/akka/stream/scaladsl/ZipWithApply.scala.template
index 08486cdd5e..ac8d77082f 100644
--- a/akka-stream/src/main/boilerplate/akka/stream/scaladsl/ZipWithApply.scala.template
+++ b/akka-stream/src/main/boilerplate/akka/stream/scaladsl/ZipWithApply.scala.template
@@ -5,7 +5,6 @@
 package akka.stream.scaladsl
 
 import akka.stream._
-import akka.stream.impl.StreamLayout
 import akka.stream.stage._
 
 trait ZipWithApply {