diff --git a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java
index bbf84197..79cce4d1 100644
--- a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java
+++ b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java
@@ -1378,6 +1378,9 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
         } else if ("17".equals(mot)) {
             if (trainNum == null && trainName != null && trainName.startsWith("Schienenersatz"))
                 return new Line(id, network, Product.BUS, "SEV");
+        } else if ("19".equals(mot)) {
+            if ("Bürgerbus".equals(trainName) || "BürgerBus".equals(trainName))
+                return new Line(id, network, Product.BUS, symbol);
         }
 
         throw new IllegalStateException(
diff --git a/enabler/src/de/schildbach/pte/BsvagProvider.java b/enabler/src/de/schildbach/pte/BsvagProvider.java
index a5454099..361f2163 100644
--- a/enabler/src/de/schildbach/pte/BsvagProvider.java
+++ b/enabler/src/de/schildbach/pte/BsvagProvider.java
@@ -25,9 +25,7 @@ import javax.annotation.Nullable;
 
 import com.google.common.base.Charsets;
 
-import de.schildbach.pte.dto.Line;
 import de.schildbach.pte.dto.Location;
-import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.Style;
 import de.schildbach.pte.dto.TripOptions;
 
@@ -56,17 +54,6 @@ public class BsvagProvider extends AbstractEfaProvider {
         url.addEncodedQueryParameter("inclMOT_11", "on");
     }
 
-    @Override
-    protected Line parseLine(String id, String network, String mot, String symbol, String name, String longName,
-            String trainType, String trainNum, String trainName) {
-        if ("19".equals(mot)) {
-            if ("Bürgerbus".equals(trainName) || "BürgerBus".equals(trainName))
-                return new Line(id, network, Product.BUS, symbol);
-        }
-
-        return super.parseLine(id, network, mot, symbol, name, longName, trainType, trainNum, trainName);
-    }
-
     private static final Map<String, Style> STYLES = new HashMap<>();
 
     static {
diff --git a/enabler/src/de/schildbach/pte/KvvProvider.java b/enabler/src/de/schildbach/pte/KvvProvider.java
index 0150a40e..23b904b8 100644
--- a/enabler/src/de/schildbach/pte/KvvProvider.java
+++ b/enabler/src/de/schildbach/pte/KvvProvider.java
@@ -57,9 +57,6 @@ public class KvvProvider extends AbstractEfaProvider {
                 return new Line(id, network, Product.REGIONAL_TRAIN, trainNum);
             if (trainName != null && trainName.startsWith("TRILEX"))
                 return new Line(id, network, Product.REGIONAL_TRAIN, trainName);
-        } else if ("19".equals(mot)) {
-            if ("Bürgerbus".equals(trainName) || "BürgerBus".equals(trainName))
-                return new Line(id, network, Product.BUS, symbol);
         }
 
         return super.parseLine(id, network, mot, symbol, name, longName, trainType, trainNum, trainName);
diff --git a/enabler/src/de/schildbach/pte/VrrProvider.java b/enabler/src/de/schildbach/pte/VrrProvider.java
index e3d184c9..b70e2bda 100644
--- a/enabler/src/de/schildbach/pte/VrrProvider.java
+++ b/enabler/src/de/schildbach/pte/VrrProvider.java
@@ -93,9 +93,6 @@ public class VrrProvider extends AbstractEfaProvider {
             // H-Bahn TU Dortmund
             if ("H-Bahn".equals(trainName) || (longName != null && longName.startsWith("H-Bahn")))
                 return new Line(id, network, Product.CABLECAR, name);
-        } else if ("19".equals(mot)) {
-            if ("Bürgerbus".equals(trainName) || "BürgerBus".equals(trainName))
-                return new Line(id, network, Product.BUS, symbol);
         }
 
         return super.parseLine(id, network, mot, symbol, name, longName, trainType, trainNum, trainName);