From 601b67c8e775835ad5769df11b51965d4bd25180 Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Tue, 16 Dec 2014 15:07:41 +0100
Subject: [PATCH] !str #16455 Remove unused fanout settings

---
 .../akka/stream/testkit/TwoStreamsSetup.scala |  1 -
 .../akka/stream/extra/FlowTimedSpec.scala     |  1 -
 .../test/scala/akka/stream/io/TcpHelper.scala |  1 -
 .../akka/stream/scaladsl/FlowBufferSpec.scala |  1 -
 .../stream/scaladsl/FlowConcatAllSpec.scala   |  1 -
 .../stream/scaladsl/FlowConflateSpec.scala    |  1 -
 .../akka/stream/scaladsl/FlowDropSpec.scala   |  3 +--
 .../akka/stream/scaladsl/FlowExpandSpec.scala |  1 -
 .../akka/stream/scaladsl/FlowFilterSpec.scala |  2 --
 .../stream/scaladsl/FlowGroupBySpec.scala     |  1 -
 .../stream/scaladsl/FlowGroupedSpec.scala     |  3 +--
 .../stream/scaladsl/FlowIteratorSpec.scala    |  1 -
 .../akka/stream/scaladsl/FlowJoinSpec.scala   |  1 -
 .../stream/scaladsl/FlowMapConcatSpec.scala   |  1 -
 .../akka/stream/scaladsl/FlowMapSpec.scala    |  1 -
 .../stream/scaladsl/FlowOnCompleteSpec.scala  |  3 +--
 .../scaladsl/FlowPrefixAndTailSpec.scala      |  1 -
 .../akka/stream/scaladsl/FlowScanSpec.scala   |  1 -
 .../scala/akka/stream/scaladsl/FlowSpec.scala |  1 -
 .../stream/scaladsl/FlowSplitWhenSpec.scala   |  1 -
 .../akka/stream/scaladsl/FlowStageSpec.scala  |  1 -
 .../akka/stream/scaladsl/FlowTakeSpec.scala   |  3 +--
 .../akka/stream/scaladsl/FutureSinkSpec.scala |  1 -
 .../stream/scaladsl/GraphBalanceSpec.scala    |  1 -
 .../stream/scaladsl/GraphBroadcastSpec.scala  |  1 -
 .../akka/stream/scaladsl/GraphFlowSpec.scala  |  1 -
 .../scaladsl/GraphOpsIntegrationSpec.scala    |  1 -
 .../akka/stream/scaladsl/GraphUnzipSpec.scala |  1 -
 .../ImplicitFlowMaterializerSpec.scala        |  3 +--
 .../stream/scaladsl/SubscriberSinkSpec.scala  |  1 -
 .../SubstreamSubscriptionTimeoutSpec.scala    |  1 -
 akka-stream/src/main/resources/reference.conf |  5 -----
 .../scala/akka/stream/FlowMaterializer.scala  | 21 ++++---------------
 .../stream/javadsl/OperationAttributes.scala  |  7 -------
 .../stream/scaladsl/OperationAttributes.scala |  7 -------
 35 files changed, 9 insertions(+), 73 deletions(-)

diff --git a/akka-stream-testkit/src/test/scala/akka/stream/testkit/TwoStreamsSetup.scala b/akka-stream-testkit/src/test/scala/akka/stream/testkit/TwoStreamsSetup.scala
index f950ce414a..f2d4619f26 100644
--- a/akka-stream-testkit/src/test/scala/akka/stream/testkit/TwoStreamsSetup.scala
+++ b/akka-stream-testkit/src/test/scala/akka/stream/testkit/TwoStreamsSetup.scala
@@ -11,7 +11,6 @@ abstract class TwoStreamsSetup extends AkkaSpec {
 
   val settings = MaterializerSettings(system)
     .withInputBuffer(initialSize = 2, maxSize = 2)
-    .withFanOutBuffer(initialSize = 2, maxSize = 2)
 
   implicit val materializer = FlowMaterializer(settings)
 
diff --git a/akka-stream-tests/src/test/scala/akka/stream/extra/FlowTimedSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/extra/FlowTimedSpec.scala
index a9a8b411ad..796b1617bf 100644
--- a/akka-stream-tests/src/test/scala/akka/stream/extra/FlowTimedSpec.scala
+++ b/akka-stream-tests/src/test/scala/akka/stream/extra/FlowTimedSpec.scala
@@ -16,7 +16,6 @@ class FlowTimedSpec extends AkkaSpec with ScriptedTest {
 
   val settings = MaterializerSettings(system)
     .withInputBuffer(initialSize = 2, maxSize = 16)
-    .withFanOutBuffer(initialSize = 1, maxSize = 16)
 
   implicit val materializer = FlowMaterializer(settings)
 
diff --git a/akka-stream-tests/src/test/scala/akka/stream/io/TcpHelper.scala b/akka-stream-tests/src/test/scala/akka/stream/io/TcpHelper.scala
index e8856efc42..1d97f43837 100644
--- a/akka-stream-tests/src/test/scala/akka/stream/io/TcpHelper.scala
+++ b/akka-stream-tests/src/test/scala/akka/stream/io/TcpHelper.scala
@@ -118,7 +118,6 @@ trait TcpHelper { this: TestKitBase ⇒
 
   val settings = MaterializerSettings(system)
     .withInputBuffer(initialSize = 4, maxSize = 4)
-    .withFanOutBuffer(initialSize = 2, maxSize = 2)
 
   implicit val materializer = FlowMaterializer(settings)
 
diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowBufferSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowBufferSpec.scala
index e9db3ed95a..33ca652d67 100644
--- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowBufferSpec.scala
+++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowBufferSpec.scala
@@ -17,7 +17,6 @@ class FlowBufferSpec extends AkkaSpec {
 
   val settings = MaterializerSettings(system)
     .withInputBuffer(initialSize = 1, maxSize = 1)
-    .withFanOutBuffer(initialSize = 1, maxSize = 1)
 
   implicit val materializer = FlowMaterializer(settings)
 
diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowConcatAllSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowConcatAllSpec.scala
index edd87f1e5a..db2f634c93 100644
--- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowConcatAllSpec.scala
+++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowConcatAllSpec.scala
@@ -14,7 +14,6 @@ class FlowConcatAllSpec extends AkkaSpec {
 
   val settings = MaterializerSettings(system)
     .withInputBuffer(initialSize = 2, maxSize = 2)
-    .withFanOutBuffer(initialSize = 2, maxSize = 2)
 
   implicit val materializer = FlowMaterializer(settings)
 
diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowConflateSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowConflateSpec.scala
index ae012f6724..484be8ab1f 100644
--- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowConflateSpec.scala
+++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowConflateSpec.scala
@@ -13,7 +13,6 @@ class FlowConflateSpec extends AkkaSpec {
 
   val settings = MaterializerSettings(system)
     .withInputBuffer(initialSize = 2, maxSize = 2)
-    .withFanOutBuffer(initialSize = 2, maxSize = 2)
 
   implicit val materializer = FlowMaterializer(settings)
 
diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDropSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDropSpec.scala
index 1dc1b1ce57..6c2122daa2 100644
--- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDropSpec.scala
+++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDropSpec.scala
@@ -15,7 +15,6 @@ class FlowDropSpec extends AkkaSpec with ScriptedTest {
 
   val settings = MaterializerSettings(system)
     .withInputBuffer(initialSize = 2, maxSize = 16)
-    .withFanOutBuffer(initialSize = 1, maxSize = 16)
 
   implicit val materializer = FlowMaterializer(settings)
 
@@ -41,4 +40,4 @@ class FlowDropSpec extends AkkaSpec with ScriptedTest {
 
   }
 
-}
\ No newline at end of file
+}
diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowExpandSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowExpandSpec.scala
index 3eb7bf64b8..fb7dde14e9 100644
--- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowExpandSpec.scala
+++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowExpandSpec.scala
@@ -16,7 +16,6 @@ class FlowExpandSpec extends AkkaSpec {
 
   val settings = MaterializerSettings(system)
     .withInputBuffer(initialSize = 2, maxSize = 2)
-    .withFanOutBuffer(initialSize = 2, maxSize = 2)
 
   implicit val materializer = FlowMaterializer(settings)
 
diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFilterSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFilterSpec.scala
index 2ccd933e64..bc7dc515c4 100644
--- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFilterSpec.scala
+++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFilterSpec.scala
@@ -14,7 +14,6 @@ class FlowFilterSpec extends AkkaSpec with ScriptedTest {
 
   val settings = MaterializerSettings(system)
     .withInputBuffer(initialSize = 2, maxSize = 16)
-    .withFanOutBuffer(initialSize = 1, maxSize = 16)
 
   "A Filter" must {
 
@@ -26,7 +25,6 @@ class FlowFilterSpec extends AkkaSpec with ScriptedTest {
     "not blow up with high request counts" in {
       val settings = MaterializerSettings(system)
         .withInputBuffer(initialSize = 1, maxSize = 1)
-        .withFanOutBuffer(initialSize = 1, maxSize = 1)
       implicit val materializer = FlowMaterializer(settings)
 
       val probe = StreamTestKit.SubscriberProbe[Int]()
diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupBySpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupBySpec.scala
index 90115b17f4..d5c9c59999 100644
--- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupBySpec.scala
+++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupBySpec.scala
@@ -15,7 +15,6 @@ class FlowGroupBySpec extends AkkaSpec {
 
   val settings = MaterializerSettings(system)
     .withInputBuffer(initialSize = 2, maxSize = 2)
-    .withFanOutBuffer(initialSize = 2, maxSize = 2)
 
   implicit val materializer = FlowMaterializer(settings)
 
diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupedSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupedSpec.scala
index 4ae9575b2f..8c087d42a2 100644
--- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupedSpec.scala
+++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupedSpec.scala
@@ -14,7 +14,6 @@ class FlowGroupedSpec extends AkkaSpec with ScriptedTest {
 
   val settings = MaterializerSettings(system)
     .withInputBuffer(initialSize = 2, maxSize = 16)
-    .withFanOutBuffer(initialSize = 1, maxSize = 16)
 
   "A Grouped" must {
 
@@ -35,4 +34,4 @@ class FlowGroupedSpec extends AkkaSpec with ScriptedTest {
 
   }
 
-}
\ No newline at end of file
+}
diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIteratorSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIteratorSpec.scala
index 804195d9e9..69294a127e 100644
--- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIteratorSpec.scala
+++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIteratorSpec.scala
@@ -30,7 +30,6 @@ abstract class AbstractFlowIteratorSpec extends AkkaSpec {
 
   val settings = MaterializerSettings(system)
     .withInputBuffer(initialSize = 2, maxSize = 2)
-    .withFanOutBuffer(initialSize = 4, maxSize = 4)
 
   implicit val materializer = FlowMaterializer(settings)
 
diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowJoinSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowJoinSpec.scala
index da42647053..d740f40c3d 100644
--- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowJoinSpec.scala
+++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowJoinSpec.scala
@@ -13,7 +13,6 @@ class FlowJoinSpec extends AkkaSpec(ConfigFactory.parseString("akka.loglevel=INF
 
   val settings = MaterializerSettings(system)
     .withInputBuffer(initialSize = 2, maxSize = 16)
-    .withFanOutBuffer(initialSize = 1, maxSize = 16)
 
   implicit val mat = FlowMaterializer(settings)
 
diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapConcatSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapConcatSpec.scala
index 5d0bbf59eb..f55b14ae27 100644
--- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapConcatSpec.scala
+++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapConcatSpec.scala
@@ -14,7 +14,6 @@ class FlowMapConcatSpec extends AkkaSpec with ScriptedTest {
 
   val settings = MaterializerSettings(system)
     .withInputBuffer(initialSize = 2, maxSize = 16)
-    .withFanOutBuffer(initialSize = 1, maxSize = 16)
 
   "A MapConcat" must {
 
diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapSpec.scala
index bcdf64b00a..70410c5563 100644
--- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapSpec.scala
+++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapSpec.scala
@@ -14,7 +14,6 @@ class FlowMapSpec extends AkkaSpec with ScriptedTest {
 
   val settings = MaterializerSettings(system)
     .withInputBuffer(initialSize = 2, maxSize = 16)
-    .withFanOutBuffer(initialSize = 1, maxSize = 16)
 
   implicit val materializer = FlowMaterializer(settings)
 
diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowOnCompleteSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowOnCompleteSpec.scala
index 8807f85824..1782de54ab 100644
--- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowOnCompleteSpec.scala
+++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowOnCompleteSpec.scala
@@ -18,7 +18,6 @@ class FlowOnCompleteSpec extends AkkaSpec with ScriptedTest {
 
   val settings = MaterializerSettings(system)
     .withInputBuffer(initialSize = 2, maxSize = 16)
-    .withFanOutBuffer(initialSize = 1, maxSize = 16)
 
   implicit val materializer = FlowMaterializer(settings)
 
@@ -82,4 +81,4 @@ class FlowOnCompleteSpec extends AkkaSpec with ScriptedTest {
 
   }
 
-}
\ No newline at end of file
+}
diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowPrefixAndTailSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowPrefixAndTailSpec.scala
index c68ba442cd..503a074ac9 100644
--- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowPrefixAndTailSpec.scala
+++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowPrefixAndTailSpec.scala
@@ -17,7 +17,6 @@ class FlowPrefixAndTailSpec extends AkkaSpec {
 
   val settings = MaterializerSettings(system)
     .withInputBuffer(initialSize = 2, maxSize = 2)
-    .withFanOutBuffer(initialSize = 2, maxSize = 2)
 
   implicit val materializer = FlowMaterializer(settings)
 
diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowScanSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowScanSpec.scala
index 51c5f2ead5..0429c61efc 100644
--- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowScanSpec.scala
+++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowScanSpec.scala
@@ -17,7 +17,6 @@ class FlowScanSpec extends AkkaSpec {
 
   val settings = MaterializerSettings(system)
     .withInputBuffer(initialSize = 2, maxSize = 16)
-    .withFanOutBuffer(initialSize = 1, maxSize = 16)
 
   implicit val materializer = FlowMaterializer(settings)
 
diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSpec.scala
index 473379a84b..cd36a1c474 100644
--- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSpec.scala
+++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSpec.scala
@@ -103,7 +103,6 @@ class FlowSpec extends AkkaSpec(ConfigFactory.parseString("akka.actor.debug.rece
 
   val settings = MaterializerSettings(system)
     .withInputBuffer(initialSize = 2, maxSize = 16)
-    .withFanOutBuffer(initialSize = 1, maxSize = 16)
 
   implicit val mat = FlowMaterializer(settings)
 
diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSplitWhenSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSplitWhenSpec.scala
index 8b2e348e6d..d21ba4642a 100644
--- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSplitWhenSpec.scala
+++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSplitWhenSpec.scala
@@ -15,7 +15,6 @@ class FlowSplitWhenSpec extends AkkaSpec {
 
   val settings = MaterializerSettings(system)
     .withInputBuffer(initialSize = 2, maxSize = 2)
-    .withFanOutBuffer(initialSize = 2, maxSize = 2)
 
   implicit val materializer = FlowMaterializer(settings)
 
diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowStageSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowStageSpec.scala
index d05f45e68c..f6e6a35bca 100644
--- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowStageSpec.scala
+++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowStageSpec.scala
@@ -17,7 +17,6 @@ class FlowStageSpec extends AkkaSpec(ConfigFactory.parseString("akka.actor.debug
 
   val settings = MaterializerSettings(system)
     .withInputBuffer(initialSize = 2, maxSize = 2)
-    .withFanOutBuffer(initialSize = 2, maxSize = 2)
 
   implicit val materializer = FlowMaterializer(settings)
 
diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTakeSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTakeSpec.scala
index 24f415ce40..16ca928fc8 100644
--- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTakeSpec.scala
+++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTakeSpec.scala
@@ -18,7 +18,6 @@ class FlowTakeSpec extends AkkaSpec with ScriptedTest {
 
   val settings = MaterializerSettings(system)
     .withInputBuffer(initialSize = 2, maxSize = 16)
-    .withFanOutBuffer(initialSize = 1, maxSize = 16)
 
   implicit val materializer = FlowMaterializer(settings)
 
@@ -43,4 +42,4 @@ class FlowTakeSpec extends AkkaSpec with ScriptedTest {
 
   }
 
-}
\ No newline at end of file
+}
diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FutureSinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FutureSinkSpec.scala
index 116d41fdc3..b51192d48b 100644
--- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FutureSinkSpec.scala
+++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FutureSinkSpec.scala
@@ -17,7 +17,6 @@ class HeadSinkSpec extends AkkaSpec with ScriptedTest {
 
   val settings = MaterializerSettings(system)
     .withInputBuffer(initialSize = 2, maxSize = 16)
-    .withFanOutBuffer(initialSize = 1, maxSize = 16)
 
   implicit val materializer = FlowMaterializer(settings)
 
diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphBalanceSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphBalanceSpec.scala
index 049063b36e..c5630e85ef 100644
--- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphBalanceSpec.scala
+++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphBalanceSpec.scala
@@ -13,7 +13,6 @@ class GraphBalanceSpec extends AkkaSpec {
 
   val settings = MaterializerSettings(system)
     .withInputBuffer(initialSize = 2, maxSize = 16)
-    .withFanOutBuffer(initialSize = 1, maxSize = 16)
 
   implicit val materializer = FlowMaterializer(settings)
 
diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphBroadcastSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphBroadcastSpec.scala
index 8ce1b8ad9e..02ea1c52db 100644
--- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphBroadcastSpec.scala
+++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphBroadcastSpec.scala
@@ -12,7 +12,6 @@ class GraphBroadcastSpec extends AkkaSpec {
 
   val settings = MaterializerSettings(system)
     .withInputBuffer(initialSize = 2, maxSize = 16)
-    .withFanOutBuffer(initialSize = 1, maxSize = 16)
 
   implicit val materializer = FlowMaterializer(settings)
 
diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphFlowSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphFlowSpec.scala
index aff4a9be41..458514a0a9 100644
--- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphFlowSpec.scala
+++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphFlowSpec.scala
@@ -37,7 +37,6 @@ class GraphFlowSpec extends AkkaSpec {
 
   val settings = MaterializerSettings(system)
     .withInputBuffer(initialSize = 2, maxSize = 16)
-    .withFanOutBuffer(initialSize = 1, maxSize = 16)
 
   implicit val materializer = FlowMaterializer(settings)
 
diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphOpsIntegrationSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphOpsIntegrationSpec.scala
index fecf7f59fa..da64750ce8 100644
--- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphOpsIntegrationSpec.scala
+++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphOpsIntegrationSpec.scala
@@ -57,7 +57,6 @@ class GraphOpsIntegrationSpec extends AkkaSpec {
 
   val settings = MaterializerSettings(system)
     .withInputBuffer(initialSize = 2, maxSize = 16)
-    .withFanOutBuffer(initialSize = 1, maxSize = 16)
 
   implicit val materializer = FlowMaterializer(settings)
 
diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphUnzipSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphUnzipSpec.scala
index 2c5f632f6a..27d344bd36 100644
--- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphUnzipSpec.scala
+++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphUnzipSpec.scala
@@ -11,7 +11,6 @@ class GraphUnzipSpec extends AkkaSpec {
 
   val settings = MaterializerSettings(system)
     .withInputBuffer(initialSize = 2, maxSize = 16)
-    .withFanOutBuffer(initialSize = 1, maxSize = 16)
 
   implicit val materializer = FlowMaterializer(settings)
 
diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ImplicitFlowMaterializerSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ImplicitFlowMaterializerSpec.scala
index 512db80211..504c8b790d 100644
--- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ImplicitFlowMaterializerSpec.scala
+++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ImplicitFlowMaterializerSpec.scala
@@ -14,7 +14,6 @@ object ImplicitFlowMaterializerSpec {
 
     override def flowMaterializerSettings = MaterializerSettings(context.system)
       .withInputBuffer(initialSize = 2, maxSize = 16)
-      .withFanOutBuffer(initialSize = 1, maxSize = 16)
 
     val flow = Source(input).map(_.toUpperCase())
 
@@ -38,4 +37,4 @@ class ImplicitFlowMaterializerSpec extends AkkaSpec with ImplicitSender {
       expectMsg("ABC")
     }
   }
-}
\ No newline at end of file
+}
diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SubscriberSinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SubscriberSinkSpec.scala
index 74638edc42..f746293a58 100644
--- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SubscriberSinkSpec.scala
+++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SubscriberSinkSpec.scala
@@ -12,7 +12,6 @@ class SubscriberSinkSpec extends AkkaSpec {
 
   val settings = MaterializerSettings(system)
     .withInputBuffer(initialSize = 2, maxSize = 16)
-    .withFanOutBuffer(initialSize = 1, maxSize = 16)
 
   implicit val materializer = FlowMaterializer(settings)
 
diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SubstreamSubscriptionTimeoutSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SubstreamSubscriptionTimeoutSpec.scala
index 390d2fc05c..1f671d3599 100644
--- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SubstreamSubscriptionTimeoutSpec.scala
+++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SubstreamSubscriptionTimeoutSpec.scala
@@ -32,7 +32,6 @@ class SubstreamSubscriptionTimeoutSpec(conf: String) extends AkkaSpec(conf) {
 
   val settings = MaterializerSettings(system)
     .withInputBuffer(initialSize = 2, maxSize = 2)
-    .withFanOutBuffer(initialSize = 2, maxSize = 2)
 
   implicit val dispatcher = system.dispatcher
   implicit val materializer = FlowMaterializer(settings)
diff --git a/akka-stream/src/main/resources/reference.conf b/akka-stream/src/main/resources/reference.conf
index 7a17eaa3fb..aed47eb5c4 100644
--- a/akka-stream/src/main/resources/reference.conf
+++ b/akka-stream/src/main/resources/reference.conf
@@ -13,11 +13,6 @@ akka {
       # Maximum size of buffers used in stream elements
       max-input-buffer-size = 16
 
-      # Initial size of fan-out buffers used in stream elements
-      initial-fan-out-buffer-size = 4
-      # Maximum size of fan-out buffers used in stream elements
-      max-fan-out-buffer-size = 16
-
       # Fully qualified config path which holds the dispatcher configuration
       # to be used by FlowMaterialiser when creating Actors.
       # When this value is left empty, the default-dispatcher will be used.
diff --git a/akka-stream/src/main/scala/akka/stream/FlowMaterializer.scala b/akka-stream/src/main/scala/akka/stream/FlowMaterializer.scala
index 66c8d52fc7..dafe5a8427 100644
--- a/akka-stream/src/main/scala/akka/stream/FlowMaterializer.scala
+++ b/akka-stream/src/main/scala/akka/stream/FlowMaterializer.scala
@@ -166,7 +166,7 @@ object MaterializerSettings {
    * Create [[MaterializerSettings]].
    *
    * You can refine the configuration based settings using [[MaterializerSettings#withInputBuffer]],
-   * [[MaterializerSettings#withFanOutBuffer]], [[MaterializerSettings#withDispatcher]]
+   * [[MaterializerSettings#withDispatcher]]
    */
   def apply(system: ActorSystem): MaterializerSettings =
     apply(system.settings.config.getConfig("akka.stream.materializer"))
@@ -175,14 +175,12 @@ object MaterializerSettings {
    * Create [[MaterializerSettings]].
    *
    * You can refine the configuration based settings using [[MaterializerSettings#withInputBuffer]],
-   * [[MaterializerSettings#withFanOutBuffer]], [[MaterializerSettings#withDispatcher]]
+   * [[MaterializerSettings#withDispatcher]]
    */
   def apply(config: Config): MaterializerSettings =
     MaterializerSettings(
       config.getInt("initial-input-buffer-size"),
       config.getInt("max-input-buffer-size"),
-      config.getInt("initial-fan-out-buffer-size"),
-      config.getInt("max-fan-out-buffer-size"),
       config.getString("dispatcher"),
       StreamSubscriptionTimeoutSettings(config),
       config.getString("file-io-dispatcher"))
@@ -191,7 +189,7 @@ object MaterializerSettings {
    * Java API
    *
    * You can refine the configuration based settings using [[MaterializerSettings#withInputBuffer]],
-   * [[MaterializerSettings#withFanOutBuffer]], [[MaterializerSettings#withDispatcher]]
+   * [[MaterializerSettings#withDispatcher]]
    */
   def create(system: ActorSystem): MaterializerSettings =
     apply(system)
@@ -200,7 +198,7 @@ object MaterializerSettings {
    * Java API
    *
    * You can refine the configuration based settings using [[MaterializerSettings#withInputBuffer]],
-   * [[MaterializerSettings#withFanOutBuffer]], [[MaterializerSettings#withDispatcher]]
+   * [[MaterializerSettings#withDispatcher]]
    */
   def create(config: Config): MaterializerSettings =
     apply(config)
@@ -221,8 +219,6 @@ class MaterializationException(msg: String, cause: Throwable = null) extends Run
 final case class MaterializerSettings(
   initialInputBufferSize: Int,
   maxInputBufferSize: Int,
-  initialFanOutBufferSize: Int,
-  maxFanOutBufferSize: Int,
   dispatcher: String,
   subscriptionTimeoutSettings: StreamSubscriptionTimeoutSettings,
   fileIODispatcher: String) { // FIXME Why does this exist?!
@@ -233,18 +229,9 @@ final case class MaterializerSettings(
   require(isPowerOfTwo(maxInputBufferSize), "maxInputBufferSize must be a power of two")
   require(initialInputBufferSize <= maxInputBufferSize, s"initialInputBufferSize($initialInputBufferSize) must be <= maxInputBufferSize($maxInputBufferSize)")
 
-  require(initialFanOutBufferSize > 0, "initialFanOutBufferSize must be > 0")
-
-  require(maxFanOutBufferSize > 0, "maxFanOutBufferSize must be > 0")
-  require(isPowerOfTwo(maxFanOutBufferSize), "maxFanOutBufferSize must be a power of two")
-  require(initialFanOutBufferSize <= maxFanOutBufferSize, s"initialFanOutBufferSize($initialFanOutBufferSize) must be <= maxFanOutBufferSize($maxFanOutBufferSize)")
-
   def withInputBuffer(initialSize: Int, maxSize: Int): MaterializerSettings =
     copy(initialInputBufferSize = initialSize, maxInputBufferSize = maxSize)
 
-  def withFanOutBuffer(initialSize: Int, maxSize: Int): MaterializerSettings =
-    copy(initialFanOutBufferSize = initialSize, maxFanOutBufferSize = maxSize)
-
   def withDispatcher(dispatcher: String): MaterializerSettings =
     copy(dispatcher = dispatcher)
 
diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/OperationAttributes.scala b/akka-stream/src/main/scala/akka/stream/javadsl/OperationAttributes.scala
index 5d135802ac..007a6aa1c8 100644
--- a/akka-stream/src/main/scala/akka/stream/javadsl/OperationAttributes.scala
+++ b/akka-stream/src/main/scala/akka/stream/javadsl/OperationAttributes.scala
@@ -43,13 +43,6 @@ object OperationAttributes {
     private[akka] def asScala = scaladsl.OperationAttributes.inputBuffer(initial, max)
   }
 
-  /**
-   * Specifies the initial and maximum size of the fan out buffer.
-   */
-  def fanOutBuffer(initial: Int, max: Int): OperationAttributes = new OperationAttributes {
-    private[akka] def asScala = scaladsl.OperationAttributes.fanOutBuffer(initial, max)
-  }
-
   /**
    * Specifies the name of the dispatcher.
    */
diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/OperationAttributes.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/OperationAttributes.scala
index c93369f68e..6d69435792 100644
--- a/akka-stream/src/main/scala/akka/stream/scaladsl/OperationAttributes.scala
+++ b/akka-stream/src/main/scala/akka/stream/scaladsl/OperationAttributes.scala
@@ -36,7 +36,6 @@ case class OperationAttributes private (private val attributes: List[OperationAt
   private[akka] def settings: MaterializerSettings ⇒ MaterializerSettings =
     attributes.collect {
       case InputBuffer(initial, max) ⇒ (s: MaterializerSettings) ⇒ s.withInputBuffer(initial, max)
-      case FanOutBuffer(initial, max) ⇒ (s: MaterializerSettings) ⇒ s.withFanOutBuffer(initial, max)
       case Dispatcher(dispatcher) ⇒ (s: MaterializerSettings) ⇒ s.withDispatcher(dispatcher)
     }.reduceOption(_ andThen _).getOrElse(identity) // FIXME is this the optimal way of encoding this?
 
@@ -62,7 +61,6 @@ object OperationAttributes {
   private[OperationAttributes] trait Attribute
   private[OperationAttributes] case class Name(n: String) extends Attribute
   private[OperationAttributes] case class InputBuffer(initial: Int, max: Int) extends Attribute
-  private[OperationAttributes] case class FanOutBuffer(initial: Int, max: Int) extends Attribute
   private[OperationAttributes] case class Dispatcher(dispatcher: String) extends Attribute
 
   private[OperationAttributes] def apply(attribute: Attribute): OperationAttributes =
@@ -80,11 +78,6 @@ object OperationAttributes {
    */
   def inputBuffer(initial: Int, max: Int): OperationAttributes = OperationAttributes(InputBuffer(initial, max))
 
-  /**
-   * Specifies the initial and maximum size of the fan out buffer.
-   */
-  def fanOutBuffer(initial: Int, max: Int): OperationAttributes = OperationAttributes(FanOutBuffer(initial, max))
-
   /**
    * Specifies the name of the dispatcher.
    */