diff --git a/src/de/schildbach/pte/AbstractEfaProvider.java b/src/de/schildbach/pte/AbstractEfaProvider.java
index 3c11665c..aa858dab 100644
--- a/src/de/schildbach/pte/AbstractEfaProvider.java
+++ b/src/de/schildbach/pte/AbstractEfaProvider.java
@@ -1423,7 +1423,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
         } else if ("11".equals(mot)) {
             return new Line(id, network, null, ParserUtils.firstNotEmpty(symbol, name));
         } else if ("13".equals(mot)) {
-            if (("S-Bahn".equals(trainName) || (longName != null && longName.startsWith("S-Bahn"))) && symbol != null)
+            if (symbol != null)
                 return new Line(id, network, Product.SUBURBAN_TRAIN, symbol);
         } else if ("17".equals(mot)) {
             if (trainNum == null && trainName != null && trainName.startsWith("Schienenersatz"))
diff --git a/src/de/schildbach/pte/MerseyProvider.java b/src/de/schildbach/pte/MerseyProvider.java
index 1bd31bc0..3fac9790 100644
--- a/src/de/schildbach/pte/MerseyProvider.java
+++ b/src/de/schildbach/pte/MerseyProvider.java
@@ -49,18 +49,6 @@ public class MerseyProvider extends AbstractEfaProvider {
         return Product.ALL;
     }
 
-    @Override
-    protected Line parseLine(final @Nullable String id, final @Nullable String network, final @Nullable String mot,
-            final @Nullable String symbol, final @Nullable String name, final @Nullable String longName,
-            final @Nullable String trainType, final @Nullable String trainNum, final @Nullable String trainName) {
-        if ("13".equals(mot)) {
-            if ("OO".equals(trainType) || "Ordinary passenger (o.pas.)".equals(trainName))
-                return new Line(id, network, Product.REGIONAL_TRAIN, "OO" + Strings.nullToEmpty(trainNum));
-        }
-
-        return super.parseLine(id, network, mot, symbol, name, longName, trainType, trainNum, trainName);
-    }
-
     private static final Pattern P_POSITION_BOUND = Pattern.compile("([NESW]+)-bound", Pattern.CASE_INSENSITIVE);
 
     @Override
diff --git a/src/de/schildbach/pte/TlemProvider.java b/src/de/schildbach/pte/TlemProvider.java
index 7d6a064f..a1eb6980 100644
--- a/src/de/schildbach/pte/TlemProvider.java
+++ b/src/de/schildbach/pte/TlemProvider.java
@@ -71,9 +71,6 @@ public class TlemProvider extends AbstractEfaProvider {
         if ("1".equals(mot)) {
             if (trainType == null && ("DLR".equals(trainNum) || "Light Railway".equals(trainName)))
                 return new Line(id, network, Product.SUBURBAN_TRAIN, "DLR");
-        } else if ("13".equals(mot)) {
-            if ("OO".equals(trainType) || "Ordinary passenger (o.pas.)".equals(trainName))
-                return new Line(id, network, Product.REGIONAL_TRAIN, "OO" + Strings.nullToEmpty(trainNum));
         }
 
         return super.parseLine(id, network, mot, symbol, name, longName, trainType, trainNum, trainName);