diff --git a/src/loaders/RepositoryDataLoader.ts b/src/loaders/RepositoryDataLoader.ts
index efe4298..04e2c21 100644
--- a/src/loaders/RepositoryDataLoader.ts
+++ b/src/loaders/RepositoryDataLoader.ts
@@ -48,11 +48,15 @@ export class RepositoryDataLoader {
     if (!this.shouldBeRunning) return;
 
     try {
-      await this.clearAllData();
+      await this.repository.clearSystemData();
       await this.fetchAndUpdateSystemData();
+      await this.repository.clearRouteData();
       await this.fetchAndUpdateRouteDataForExistingSystems();
+      await this.repository.clearStopData();
       await this.fetchAndUpdateStopAndPolylineDataForRoutesInExistingSystems();
+      await this.repository.clearShuttleData();
       await this.fetchAndUpdateShuttleDataForExistingSystems();
+      await this.repository.clearEtaData();
       await this.fetchAndUpdateEtaDataForExistingOrderedStops();
     } catch (e) {
       console.error(e);
@@ -61,15 +65,6 @@ export class RepositoryDataLoader {
     this.timer = setTimeout(this.startFetchDataAndUpdate, timeout);
   }
 
-  private async clearAllData() {
-    await this.repository.clearRouteData();
-    await this.repository.clearSystemData();
-    await this.repository.clearEtaData();
-    await this.repository.clearStopData();
-    await this.repository.clearOrderedStopData();
-    await this.repository.clearShuttleData();
-  }
-
   private async fetchAndUpdateSystemData() {
     const params = {
       getSystems: "2",