diff --git a/oeffi/assets/networks.txt b/oeffi/assets/networks.txt
index 0294826..dca04bd 100644
--- a/oeffi/assets/networks.txt
+++ b/oeffi/assets/networks.txt
@@ -83,9 +83,6 @@ FINLAND|fi-FI|FI;Helsinki|beta
TLEM|en-UK|GB;Greater London;Derbyshire;Leicestershire;Rutland;Northamptonshire;Nottinghamshire;Lincolnshire;Berkshire;Buckinghamshire;East Sussex;Hampshire;Isle of Wight;Kent;Oxfordshire;Surrey;West Sussex;Essex;Hertfordshire;Bedfordshire;Cambridgeshire;Norfolk;Suffolk;Somerset;Gloucestershire;Wiltshire;Dorset;Devon;Cornwall;West Devon;Stowford;Eastleigh;Swindon;Gloucester;Plymouth;Torbay;Bournemouth;Poole;Birmingham
MERSEY|en-UK|GB;Liverpool|beta
-# IE
-TFI|ga-IE|IE;Dublin;GB;Belfast
-
# AE
DUB|ae-AE|AE;Dubai|beta
diff --git a/oeffi/res/values-de/networks.xml b/oeffi/res/values-de/networks.xml
index 16f6bc2..0852204 100644
--- a/oeffi/res/values-de/networks.xml
+++ b/oeffi/res/values-de/networks.xml
@@ -109,8 +109,6 @@
Lokal- und Regionalverkehr (z.B. London, Birmingham)
Liverpool
Lokal- und Regionalverkehr
- Irland & Nordirland
- Lokal- und Regionalverkehr
Dubai
Lokalverkehr
San Francisco
diff --git a/oeffi/res/values/networks.xml b/oeffi/res/values/networks.xml
index d2b02f6..d546bcc 100644
--- a/oeffi/res/values/networks.xml
+++ b/oeffi/res/values/networks.xml
@@ -109,8 +109,6 @@
local and regional (e.g. London, Birmingham)
Liverpool
local and regional
- Ireland & Northern Ireland
- local and regional
Dubai
local
San Francisco
diff --git a/oeffi/src/de/schildbach/oeffi/Application.java b/oeffi/src/de/schildbach/oeffi/Application.java
index b3e3796..492c138 100644
--- a/oeffi/src/de/schildbach/oeffi/Application.java
+++ b/oeffi/src/de/schildbach/oeffi/Application.java
@@ -109,6 +109,12 @@ public class Application extends android.app.Application {
FavoriteStationsProvider.migrateFavoriteStations(this, VMS, NetworkId.VVO);
QueryHistoryProvider.migrateQueryHistory(this, VMS, NetworkId.VVO);
+ // 2023-11-05: migrate TFI to use RT
+ final String TFI = "TFI";
+ migrateSelectedNetwork(TFI, NetworkId.RT);
+ FavoriteStationsProvider.deleteFavoriteStations(this, TFI);
+ QueryHistoryProvider.deleteQueryHistory(this, TFI);
+
log.info("Migrations took {}", watch);
}
diff --git a/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java b/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java
index 2b16ff5..83c6e76 100644
--- a/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java
+++ b/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java
@@ -59,7 +59,6 @@ import de.schildbach.pte.SncbProvider;
import de.schildbach.pte.SpainProvider;
import de.schildbach.pte.StvProvider;
import de.schildbach.pte.SydneyProvider;
-import de.schildbach.pte.TfiProvider;
import de.schildbach.pte.TlemProvider;
import de.schildbach.pte.VbbProvider;
import de.schildbach.pte.VblProvider;
@@ -200,8 +199,6 @@ public final class NetworkProviderFactory {
return new TlemProvider();
else if (networkId.equals(NetworkId.MERSEY))
return new MerseyProvider();
- else if (networkId.equals(NetworkId.TFI))
- return new TfiProvider();
else if (networkId.equals(NetworkId.DUB))
return new DubProvider();
else if (networkId.equals(NetworkId.BART))