diff --git a/enabler/src/de/schildbach/pte/BvbProvider.java b/enabler/src/de/schildbach/pte/BvbProvider.java
deleted file mode 100644
index 1f3f2d4c..00000000
--- a/enabler/src/de/schildbach/pte/BvbProvider.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2010-2015 the original author or authors.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package de.schildbach.pte;
-
-import java.io.IOException;
-
-import de.schildbach.pte.dto.Location;
-import de.schildbach.pte.dto.LocationType;
-import de.schildbach.pte.dto.SuggestLocationsResult;
-
-import okhttp3.HttpUrl;
-
-/**
- * @author Andreas Schildbach
- */
-public class BvbProvider extends AbstractEfaProvider {
-    private static final HttpUrl API_BASE = HttpUrl.parse("http://www.efa-bvb.ch/bvb/");
-
-    public BvbProvider() {
-        super(NetworkId.BVB, API_BASE);
-    }
-
-    @Override
-    public SuggestLocationsResult suggestLocations(final CharSequence constraint) throws IOException {
-        return xmlStopfinderRequest(new Location(LocationType.STATION, null, null, constraint.toString()));
-    }
-}
diff --git a/enabler/src/de/schildbach/pte/NetworkId.java b/enabler/src/de/schildbach/pte/NetworkId.java
index 25cc286c..6496011e 100644
--- a/enabler/src/de/schildbach/pte/NetworkId.java
+++ b/enabler/src/de/schildbach/pte/NetworkId.java
@@ -31,7 +31,7 @@ public enum NetworkId {
     OEBB, VAO, VOR, WIEN, OOEVV, LINZ, SVV, VVT, IVB, STV, VMOBIL,
 
     // Switzerland
-    SBB, BVB, VBL, ZVV,
+    SBB, VBL, ZVV,
 
     // France
     PARIS, FRANCESOUTHWEST, FRANCESOUTHEAST, FRANCENORTHWEST, FRANCENORTHEAST,
diff --git a/enabler/test/de/schildbach/pte/live/BvbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/BvbProviderLiveTest.java
deleted file mode 100644
index 925cd173..00000000
--- a/enabler/test/de/schildbach/pte/live/BvbProviderLiveTest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright 2010-2015 the original author or authors.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package de.schildbach.pte.live;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Date;
-
-import org.junit.Test;
-
-import de.schildbach.pte.BvbProvider;
-import de.schildbach.pte.NetworkProvider.Accessibility;
-import de.schildbach.pte.NetworkProvider.WalkSpeed;
-import de.schildbach.pte.dto.Location;
-import de.schildbach.pte.dto.LocationType;
-import de.schildbach.pte.dto.NearbyLocationsResult;
-import de.schildbach.pte.dto.Product;
-import de.schildbach.pte.dto.QueryDeparturesResult;
-import de.schildbach.pte.dto.QueryTripsResult;
-import de.schildbach.pte.dto.SuggestLocationsResult;
-
-/**
- * @author Andreas Schildbach
- */
-public class BvbProviderLiveTest extends AbstractProviderLiveTest {
-    public BvbProviderLiveTest() {
-        super(new BvbProvider());
-    }
-
-    @Test
-    public void nearbyStations() throws Exception {
-        final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.STATION, "10000"));
-        print(result);
-    }
-
-    @Test
-    public void nearbyStationsByCoordinate() throws Exception {
-        final NearbyLocationsResult result = queryNearbyStations(Location.coord(47551466, 7585187));
-        print(result);
-    }
-
-    @Test
-    public void queryDepartures() throws Exception {
-        final QueryDeparturesResult result = queryDepartures("10000", false);
-        print(result);
-    }
-
-    @Test
-    public void suggestLocations() throws Exception {
-        final SuggestLocationsResult result = suggestLocations("Haupt");
-        print(result);
-    }
-
-    @Test
-    public void suggestLocationsWithUmlaut() throws Exception {
-        final SuggestLocationsResult result = suggestLocations("Käferholz");
-        print(result);
-    }
-
-    @Test
-    public void shortTrip() throws Exception {
-        final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "10000", null, "Bahnhof"), null,
-                new Location(LocationType.STATION, "86", null, "Markthalle"), new Date(), true, Product.ALL,
-                WalkSpeed.NORMAL, Accessibility.NEUTRAL);
-        print(result);
-        assertEquals(QueryTripsResult.Status.OK, result.status);
-        assertTrue(result.trips.size() > 0);
-
-        if (!result.context.canQueryLater())
-            return;
-
-        final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
-        print(laterResult);
-
-        if (!laterResult.context.canQueryLater())
-            return;
-
-        final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true);
-        print(later2Result);
-
-        if (!later2Result.context.canQueryEarlier())
-            return;
-
-        final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false);
-        print(earlierResult);
-    }
-}