90 files changed, 0 insertions, 229 deletions
diff --git a/modern/src/App.js b/modern/src/App.jsx
index 89785cfa..89785cfa 100644
--- a/modern/src/App.js
+++ b/modern/src/App.jsx
diff --git a/modern/src/AppThemeProvider.js b/modern/src/AppThemeProvider.jsx
index 0f1c5479..0f1c5479 100644
--- a/modern/src/AppThemeProvider.js
+++ b/modern/src/AppThemeProvider.jsx
diff --git a/modern/src/ErrorBoundary.js b/modern/src/ErrorBoundary.jsx
index 93a6fe0f..93a6fe0f 100644
--- a/modern/src/ErrorBoundary.js
+++ b/modern/src/ErrorBoundary.jsx
diff --git a/modern/src/Navigation.js b/modern/src/Navigation.jsx
index ad02106c..ad02106c 100644
--- a/modern/src/Navigation.js
+++ b/modern/src/Navigation.jsx
diff --git a/modern/src/ServerProvider.js b/modern/src/ServerProvider.jsx
index 720d0418..720d0418 100644
--- a/modern/src/ServerProvider.js
+++ b/modern/src/ServerProvider.jsx
diff --git a/modern/src/SocketController.js b/modern/src/SocketController.jsx
index 7dd073fd..7dd073fd 100644
--- a/modern/src/SocketController.js
+++ b/modern/src/SocketController.jsx
diff --git a/modern/src/common/components/AddressValue.js b/modern/src/common/components/AddressValue.jsx
index 827a71de..827a71de 100644
--- a/modern/src/common/components/AddressValue.js
+++ b/modern/src/common/components/AddressValue.jsx
diff --git a/modern/src/common/components/BottomMenu.js b/modern/src/common/components/BottomMenu.jsx
index 07fa2e11..07fa2e11 100644
--- a/modern/src/common/components/BottomMenu.js
+++ b/modern/src/common/components/BottomMenu.jsx
diff --git a/modern/src/common/components/ErrorHandler.js b/modern/src/common/components/ErrorHandler.jsx
index 5c9c26d9..5c9c26d9 100644
--- a/modern/src/common/components/ErrorHandler.js
+++ b/modern/src/common/components/ErrorHandler.jsx
diff --git a/modern/src/common/components/LinkField.js b/modern/src/common/components/LinkField.jsx
index 08c6213a..08c6213a 100644
--- a/modern/src/common/components/LinkField.js
+++ b/modern/src/common/components/LinkField.jsx
diff --git a/modern/src/common/components/LocalizationProvider.js b/modern/src/common/components/LocalizationProvider.jsx
index 6bc64831..6bc64831 100644
--- a/modern/src/common/components/LocalizationProvider.js
+++ b/modern/src/common/components/LocalizationProvider.jsx
diff --git a/modern/src/common/components/NavBar.js b/modern/src/common/components/NavBar.jsx
index a53960fd..a53960fd 100644
--- a/modern/src/common/components/NavBar.js
+++ b/modern/src/common/components/NavBar.jsx
diff --git a/modern/src/common/components/PageLayout.js b/modern/src/common/components/PageLayout.jsx
index e81c9754..e81c9754 100644
--- a/modern/src/common/components/PageLayout.js
+++ b/modern/src/common/components/PageLayout.jsx
diff --git a/modern/src/common/components/PositionValue.js b/modern/src/common/components/PositionValue.jsx
index 58841939..58841939 100644
--- a/modern/src/common/components/PositionValue.js
+++ b/modern/src/common/components/PositionValue.jsx
diff --git a/modern/src/common/components/RemoveDialog.js b/modern/src/common/components/RemoveDialog.jsx
index 9a2a27fb..9a2a27fb 100644
--- a/modern/src/common/components/RemoveDialog.js
+++ b/modern/src/common/components/RemoveDialog.jsx
diff --git a/modern/src/common/components/SelectField.js b/modern/src/common/components/SelectField.jsx
index 35f817a0..35f817a0 100644
--- a/modern/src/common/components/SelectField.js
+++ b/modern/src/common/components/SelectField.jsx
diff --git a/modern/src/common/components/SideNav.js b/modern/src/common/components/SideNav.jsx
index 97968bd1..97968bd1 100644
--- a/modern/src/common/components/SideNav.js
+++ b/modern/src/common/components/SideNav.jsx
diff --git a/modern/src/common/components/SplitButton.js b/modern/src/common/components/SplitButton.jsx
index 84876f15..84876f15 100644
--- a/modern/src/common/components/SplitButton.js
+++ b/modern/src/common/components/SplitButton.jsx
diff --git a/modern/src/common/components/StatusCard.js b/modern/src/common/components/StatusCard.jsx
index c389636c..c389636c 100644
--- a/modern/src/common/components/StatusCard.js
+++ b/modern/src/common/components/StatusCard.jsx
diff --git a/modern/src/common/components/TableShimmer.js b/modern/src/common/components/TableShimmer.jsx
index 08a984a4..08a984a4 100644
--- a/modern/src/common/components/TableShimmer.js
+++ b/modern/src/common/components/TableShimmer.jsx
diff --git a/modern/src/index.js b/modern/src/index.jsx
index 6473e2cd..3eb96d2f 100644
--- a/modern/src/index.js
+++ b/modern/src/index.jsx
@@ -12,7 +12,6 @@ import { LocalizationProvider } from './common/components/LocalizationProvider';
 import ErrorHandler from './common/components/ErrorHandler';
 import Navigation from './Navigation';
 import preloadImages from './map/core/preloadImages';
-import * as serviceWorkerRegistration from './serviceWorkerRegistration';
 import NativeInterface from './common/components/NativeInterface';
 import ServerProvider from './ServerProvider';
 import ErrorBoundary from './ErrorBoundary';
@@ -41,5 +40,3 @@ root.render(
     </Provider>
   </ErrorBoundary>,
 );
-
-serviceWorkerRegistration.register();
diff --git a/modern/src/login/ChangeServerPage.js b/modern/src/login/ChangeServerPage.jsx
index a92536d0..a92536d0 100644
--- a/modern/src/login/ChangeServerPage.js
+++ b/modern/src/login/ChangeServerPage.jsx
diff --git a/modern/src/login/LoginLayout.js b/modern/src/login/LoginLayout.jsx
index 8f2ee6ca..8f2ee6ca 100644
--- a/modern/src/login/LoginLayout.js
+++ b/modern/src/login/LoginLayout.jsx
diff --git a/modern/src/login/LoginPage.js b/modern/src/login/LoginPage.jsx
index 54fd09fb..54fd09fb 100644
--- a/modern/src/login/LoginPage.js
+++ b/modern/src/login/LoginPage.jsx
diff --git a/modern/src/login/LogoImage.js b/modern/src/login/LogoImage.jsx
index f4c7969c..f4c7969c 100644
--- a/modern/src/login/LogoImage.js
+++ b/modern/src/login/LogoImage.jsx
diff --git a/modern/src/login/RegisterPage.js b/modern/src/login/RegisterPage.jsx
index 6dfe40a4..6dfe40a4 100644
--- a/modern/src/login/RegisterPage.js
+++ b/modern/src/login/RegisterPage.jsx
diff --git a/modern/src/login/ResetPasswordPage.js b/modern/src/login/ResetPasswordPage.jsx
index f2f1a132..f2f1a132 100644
--- a/modern/src/login/ResetPasswordPage.js
+++ b/modern/src/login/ResetPasswordPage.jsx
diff --git a/modern/src/main/DeviceList.js b/modern/src/main/DeviceList.jsx
index eb51232f..eb51232f 100644
--- a/modern/src/main/DeviceList.js
+++ b/modern/src/main/DeviceList.jsx
diff --git a/modern/src/main/DeviceRow.js b/modern/src/main/DeviceRow.jsx
index 44da58f9..44da58f9 100644
--- a/modern/src/main/DeviceRow.js
+++ b/modern/src/main/DeviceRow.jsx
diff --git a/modern/src/main/EventsDrawer.js b/modern/src/main/EventsDrawer.jsx
index 67700fc4..67700fc4 100644
--- a/modern/src/main/EventsDrawer.js
+++ b/modern/src/main/EventsDrawer.jsx
diff --git a/modern/src/main/MainMap.js b/modern/src/main/MainMap.jsx
index 3b57c745..3b57c745 100644
--- a/modern/src/main/MainMap.js
+++ b/modern/src/main/MainMap.jsx
diff --git a/modern/src/main/MainPage.js b/modern/src/main/MainPage.jsx
index 8369ba97..8369ba97 100644
--- a/modern/src/main/MainPage.js
+++ b/modern/src/main/MainPage.jsx
diff --git a/modern/src/main/MainToolbar.js b/modern/src/main/MainToolbar.jsx
index b029529c..b029529c 100644
--- a/modern/src/main/MainToolbar.js
+++ b/modern/src/main/MainToolbar.jsx
diff --git a/modern/src/map/core/MapView.js b/modern/src/map/core/MapView.jsx
index 35b3a65a..35b3a65a 100644
--- a/modern/src/map/core/MapView.js
+++ b/modern/src/map/core/MapView.jsx
diff --git a/modern/src/other/EventPage.js b/modern/src/other/EventPage.jsx
index c8d84d5e..c8d84d5e 100644
--- a/modern/src/other/EventPage.js
+++ b/modern/src/other/EventPage.jsx
diff --git a/modern/src/other/GeofencesList.js b/modern/src/other/GeofencesList.jsx
index d26eff09..d26eff09 100644
--- a/modern/src/other/GeofencesList.js
+++ b/modern/src/other/GeofencesList.jsx
diff --git a/modern/src/other/GeofencesPage.js b/modern/src/other/GeofencesPage.jsx
index 4f31c1b3..4f31c1b3 100644
--- a/modern/src/other/GeofencesPage.js
+++ b/modern/src/other/GeofencesPage.jsx
diff --git a/modern/src/other/NetworkPage.js b/modern/src/other/NetworkPage.jsx
index 9dc00c61..9dc00c61 100644
--- a/modern/src/other/NetworkPage.js
+++ b/modern/src/other/NetworkPage.jsx
diff --git a/modern/src/other/PositionPage.js b/modern/src/other/PositionPage.jsx
index 1a5f6d9d..1a5f6d9d 100644
--- a/modern/src/other/PositionPage.js
+++ b/modern/src/other/PositionPage.jsx
diff --git a/modern/src/other/ReplayPage.js b/modern/src/other/ReplayPage.jsx
index 1050b976..1050b976 100644
--- a/modern/src/other/ReplayPage.js
+++ b/modern/src/other/ReplayPage.jsx
diff --git a/modern/src/reports/ChartReportPage.js b/modern/src/reports/ChartReportPage.jsx
index 2c33f0f5..2c33f0f5 100644
--- a/modern/src/reports/ChartReportPage.js
+++ b/modern/src/reports/ChartReportPage.jsx
diff --git a/modern/src/reports/CombinedReportPage.js b/modern/src/reports/CombinedReportPage.jsx
index a5000839..a5000839 100644
--- a/modern/src/reports/CombinedReportPage.js
+++ b/modern/src/reports/CombinedReportPage.jsx
diff --git a/modern/src/reports/EventReportPage.js b/modern/src/reports/EventReportPage.jsx
index 10b539ab..10b539ab 100644
--- a/modern/src/reports/EventReportPage.js
+++ b/modern/src/reports/EventReportPage.jsx
diff --git a/modern/src/reports/RouteReportPage.js b/modern/src/reports/RouteReportPage.jsx
index 5003ff31..5003ff31 100644
--- a/modern/src/reports/RouteReportPage.js
+++ b/modern/src/reports/RouteReportPage.jsx
diff --git a/modern/src/reports/ScheduledPage.js b/modern/src/reports/ScheduledPage.jsx
index 50e335d5..50e335d5 100644
--- a/modern/src/reports/ScheduledPage.js
+++ b/modern/src/reports/ScheduledPage.jsx
diff --git a/modern/src/reports/StatisticsPage.js b/modern/src/reports/StatisticsPage.jsx
index 7b3f2879..7b3f2879 100644
--- a/modern/src/reports/StatisticsPage.js
+++ b/modern/src/reports/StatisticsPage.jsx
diff --git a/modern/src/reports/StopReportPage.js b/modern/src/reports/StopReportPage.jsx
index 3a6ee18d..3a6ee18d 100644
--- a/modern/src/reports/StopReportPage.js
+++ b/modern/src/reports/StopReportPage.jsx
diff --git a/modern/src/reports/SummaryReportPage.js b/modern/src/reports/SummaryReportPage.jsx
index ec5395f1..ec5395f1 100644
--- a/modern/src/reports/SummaryReportPage.js
+++ b/modern/src/reports/SummaryReportPage.jsx
diff --git a/modern/src/reports/TripReportPage.js b/modern/src/reports/TripReportPage.jsx
index 606b08c5..606b08c5 100644
--- a/modern/src/reports/TripReportPage.js
+++ b/modern/src/reports/TripReportPage.jsx
diff --git a/modern/src/reports/components/ColumnSelect.js b/modern/src/reports/components/ColumnSelect.jsx
index d08394ea..d08394ea 100644
--- a/modern/src/reports/components/ColumnSelect.js
+++ b/modern/src/reports/components/ColumnSelect.jsx
diff --git a/modern/src/reports/components/ReportFilter.js b/modern/src/reports/components/ReportFilter.jsx
index ff0dc146..ff0dc146 100644
--- a/modern/src/reports/components/ReportFilter.js
+++ b/modern/src/reports/components/ReportFilter.jsx
diff --git a/modern/src/reports/components/ReportsMenu.js b/modern/src/reports/components/ReportsMenu.jsx
index a6c38578..a6c38578 100644
--- a/modern/src/reports/components/ReportsMenu.js
+++ b/modern/src/reports/components/ReportsMenu.jsx
diff --git a/modern/src/service-worker.js b/modern/src/service-worker.js
deleted file mode 100644
index 718ed766..00000000
--- a/modern/src/service-worker.js
+++ /dev/null
@@ -1,81 +0,0 @@
-/* eslint-disable no-restricted-globals */
-
-// This service worker can be customized!
-// See https://developers.google.com/web/tools/workbox/modules
-// for the list of available Workbox modules, or add any other
-// code you'd like.
-// You can also remove this file if you'd prefer not to use a
-// service worker, and the Workbox build step will be skipped.
-
-import { clientsClaim } from 'workbox-core';
-import { ExpirationPlugin } from 'workbox-expiration';
-import { precacheAndRoute, createHandlerBoundToURL } from 'workbox-precaching';
-import { registerRoute } from 'workbox-routing';
-import { StaleWhileRevalidate } from 'workbox-strategies';
-
-clientsClaim();
-
-// Precache all of the assets generated by your build process.
-// Their URLs are injected into the manifest variable below.
-// This variable must be present somewhere in your service worker file,
-// even if you decide not to use precaching. See https://cra.link/PWA
-precacheAndRoute(self.__WB_MANIFEST);
-
-// Set up App Shell-style routing, so that all navigation requests
-// are fulfilled with your index.html shell. Learn more at
-// https://developers.google.com/web/fundamentals/architecture/app-shell
-const fileExtensionRegexp = new RegExp('/[^/?]+\\.[^/]+$');
-registerRoute(
-  // Return false to exempt requests from being fulfilled by index.html.
-  ({ request, url }) => {
-
-    // If this isn't a navigation, skip.
-    if (request.mode !== 'navigate') {
-      return false;
-    }
-
-    // If this is a URL that starts with /api/, skip.
-    if (url.pathname.startsWith('/api/')) {
-      return false;
-    }
-
-    // If this is a URL that starts with /_, skip.
-    if (url.pathname.startsWith('/_')) {
-      return false;
-    }
-    
-    // If this looks like a URL for a resource, because it contains // a file extension, skip.
-    if (url.pathname.match(fileExtensionRegexp)) {
-      return false;
-    }
-    
-    // Return true to signal that we want to use the handler.
-    return true;
-  },
-  createHandlerBoundToURL(process.env.PUBLIC_URL + '/index.html')
-);
-
-// An example runtime caching route for requests that aren't handled by the
-// precache, in this case same-origin .png requests like those from in public/
-registerRoute(
-  // Add in any other file extensions or routing criteria as needed.
-  ({ url }) => url.origin === self.location.origin && url.pathname.endsWith('.png'), // Customize this strategy as needed, e.g., by changing to CacheFirst.
-  new StaleWhileRevalidate({
-    cacheName: 'images',
-    plugins: [
-      // Ensure that once this runtime cache reaches a maximum size the
-      // least-recently used images are removed.
-      new ExpirationPlugin({ maxEntries: 50 }),
-    ],
-  })
-);
-
-// This allows the web app to trigger skipWaiting via
-// registration.waiting.postMessage({type: 'SKIP_WAITING'})
-self.addEventListener('message', (event) => {
-  if (event.data && event.data.type === 'SKIP_WAITING') {
-    self.skipWaiting();
-  }
-});
-
-// Any other custom service worker logic can go here.
diff --git a/modern/src/serviceWorkerRegistration.js b/modern/src/serviceWorkerRegistration.js
deleted file mode 100644
index 2262ecdb..00000000
--- a/modern/src/serviceWorkerRegistration.js
+++ /dev/null
@@ -1,137 +0,0 @@
-// This optional code is used to register a service worker.
-// register() is not called by default.
-
-// This lets the app load faster on subsequent visits in production, and gives
-// it offline capabilities. However, it also means that developers (and users)
-// will only see deployed updates on subsequent visits to a page, after all the
-// existing tabs open on the page have been closed, since previously cached
-// resources are updated in the background.
-
-// To learn more about the benefits of this model and instructions on how to
-// opt-in, read https://cra.link/PWA
-
-const isLocalhost = Boolean(
-  window.location.hostname === 'localhost' ||
-    // [::1] is the IPv6 localhost address.
-    window.location.hostname === '[::1]' ||
-    // 127.0.0.0/8 are considered localhost for IPv4.
-    window.location.hostname.match(/^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/)
-);
-
-export function register(config) {
-  if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) {
-    // The URL constructor is available in all browsers that support SW.
-    const publicUrl = new URL(process.env.PUBLIC_URL, window.location.href);
-    if (publicUrl.origin !== window.location.origin) {
-      // Our service worker won't work if PUBLIC_URL is on a different origin
-      // from what our page is served on. This might happen if a CDN is used to
-      // serve assets; see https://github.com/facebook/create-react-app/issues/2374
-      return;
-    }
-
-    window.addEventListener('load', () => {
-      const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`;
-
-      if (isLocalhost) {
-        // This is running on localhost. Let's check if a service worker still exists or not.
-        checkValidServiceWorker(swUrl, config);
-
-        // Add some additional logging to localhost, pointing developers to the
-        // service worker/PWA documentation.
-        navigator.serviceWorker.ready.then(() => {
-          console.log(
-            'This web app is being served cache-first by a service ' +
-              'worker. To learn more, visit https://cra.link/PWA'
-          );
-        });
-      } else {
-        // Is not localhost. Just register service worker
-        registerValidSW(swUrl, config);
-      }
-    });
-  }
-}
-
-function registerValidSW(swUrl, config) {
-  navigator.serviceWorker
-    .register(swUrl)
-    .then((registration) => {
-      registration.onupdatefound = () => {
-        const installingWorker = registration.installing;
-        if (installingWorker == null) {
-          return;
-        }
-        installingWorker.onstatechange = () => {
-          if (installingWorker.state === 'installed') {
-            if (navigator.serviceWorker.controller) {
-              // At this point, the updated precached content has been fetched,
-              // but the previous service worker will still serve the older
-              // content until all client tabs are closed.
-              console.log(
-                'New content is available and will be used when all ' +
-                  'tabs for this page are closed. See https://cra.link/PWA.'
-              );
-
-              // Execute callback
-              if (config && config.onUpdate) {
-                config.onUpdate(registration);
-              }
-            } else {
-              // At this point, everything has been precached.
-              // It's the perfect time to display a
-              // "Content is cached for offline use." message.
-              console.log('Content is cached for offline use.');
-
-              // Execute callback
-              if (config && config.onSuccess) {
-                config.onSuccess(registration);
-              }
-            }
-          }
-        };
-      };
-    })
-    .catch((error) => {
-      console.error('Error during service worker registration:', error);
-    });
-}
-
-function checkValidServiceWorker(swUrl, config) {
-  // Check if the service worker can be found. If it can't reload the page.
-  fetch(swUrl, {
-    headers: { 'Service-Worker': 'script' },
-  })
-    .then((response) => {
-      // Ensure service worker exists, and that we really are getting a JS file.
-      const contentType = response.headers.get('content-type');
-      if (
-        response.status === 404 ||
-        (contentType != null && contentType.indexOf('javascript') === -1)
-      ) {
-        // No service worker found. Probably a different app. Reload the page.
-        navigator.serviceWorker.ready.then((registration) => {
-          registration.unregister().then(() => {
-            window.location.reload();
-          });
-        });
-      } else {
-        // Service worker found. Proceed as normal.
-        registerValidSW(swUrl, config);
-      }
-    })
-    .catch(() => {
-      console.log('No internet connection found. App is running in offline mode.');
-    });
-}
-
-export function unregister() {
-  if ('serviceWorker' in navigator) {
-    navigator.serviceWorker.ready
-      .then((registration) => {
-        registration.unregister();
-      })
-      .catch((error) => {
-        console.error(error.message);
-      });
-  }
-}
diff --git a/modern/src/settings/AccumulatorsPage.js b/modern/src/settings/AccumulatorsPage.jsx
index 5067e4fd..5067e4fd 100644
--- a/modern/src/settings/AccumulatorsPage.js
+++ b/modern/src/settings/AccumulatorsPage.jsx
diff --git a/modern/src/settings/CalendarPage.js b/modern/src/settings/CalendarPage.jsx
index 2868d3d5..2868d3d5 100644
--- a/modern/src/settings/CalendarPage.js
+++ b/modern/src/settings/CalendarPage.jsx
diff --git a/modern/src/settings/CalendarsPage.js b/modern/src/settings/CalendarsPage.jsx
index de27a451..de27a451 100644
--- a/modern/src/settings/CalendarsPage.js
+++ b/modern/src/settings/CalendarsPage.jsx
diff --git a/modern/src/settings/CommandDevicePage.js b/modern/src/settings/CommandDevicePage.jsx
index ed802bfa..ed802bfa 100644
--- a/modern/src/settings/CommandDevicePage.js
+++ b/modern/src/settings/CommandDevicePage.jsx
diff --git a/modern/src/settings/CommandGroupPage.js b/modern/src/settings/CommandGroupPage.jsx
index e2ba3946..e2ba3946 100644
--- a/modern/src/settings/CommandGroupPage.js
+++ b/modern/src/settings/CommandGroupPage.jsx
diff --git a/modern/src/settings/CommandPage.js b/modern/src/settings/CommandPage.jsx
index 1d788610..1d788610 100644
--- a/modern/src/settings/CommandPage.js
+++ b/modern/src/settings/CommandPage.jsx
diff --git a/modern/src/settings/CommandsPage.js b/modern/src/settings/CommandsPage.jsx
index 1b893831..1b893831 100644
--- a/modern/src/settings/CommandsPage.js
+++ b/modern/src/settings/CommandsPage.jsx
diff --git a/modern/src/settings/ComputedAttributePage.js b/modern/src/settings/ComputedAttributePage.jsx
index 3bae8231..3bae8231 100644
--- a/modern/src/settings/ComputedAttributePage.js
+++ b/modern/src/settings/ComputedAttributePage.jsx
diff --git a/modern/src/settings/ComputedAttributesPage.js b/modern/src/settings/ComputedAttributesPage.jsx
index 6d098547..6d098547 100644
--- a/modern/src/settings/ComputedAttributesPage.js
+++ b/modern/src/settings/ComputedAttributesPage.jsx
diff --git a/modern/src/settings/DeviceConnectionsPage.js b/modern/src/settings/DeviceConnectionsPage.jsx
index 88d47872..88d47872 100644
--- a/modern/src/settings/DeviceConnectionsPage.js
+++ b/modern/src/settings/DeviceConnectionsPage.jsx
diff --git a/modern/src/settings/DevicePage.js b/modern/src/settings/DevicePage.jsx
index 11d122d3..11d122d3 100644
--- a/modern/src/settings/DevicePage.js
+++ b/modern/src/settings/DevicePage.jsx
diff --git a/modern/src/settings/DevicesPage.js b/modern/src/settings/DevicesPage.jsx
index 5ef5aae5..5ef5aae5 100644
--- a/modern/src/settings/DevicesPage.js
+++ b/modern/src/settings/DevicesPage.jsx
diff --git a/modern/src/settings/DriverPage.js b/modern/src/settings/DriverPage.jsx
index 83d1f88f..83d1f88f 100644
--- a/modern/src/settings/DriverPage.js
+++ b/modern/src/settings/DriverPage.jsx
diff --git a/modern/src/settings/DriversPage.js b/modern/src/settings/DriversPage.jsx
index 72834860..72834860 100644
--- a/modern/src/settings/DriversPage.js
+++ b/modern/src/settings/DriversPage.jsx
diff --git a/modern/src/settings/GeofencePage.js b/modern/src/settings/GeofencePage.jsx
index b6c516a1..b6c516a1 100644
--- a/modern/src/settings/GeofencePage.js
+++ b/modern/src/settings/GeofencePage.jsx
diff --git a/modern/src/settings/GroupConnectionsPage.js b/modern/src/settings/GroupConnectionsPage.jsx
index 8ea3b88e..8ea3b88e 100644
--- a/modern/src/settings/GroupConnectionsPage.js
+++ b/modern/src/settings/GroupConnectionsPage.jsx
diff --git a/modern/src/settings/GroupPage.js b/modern/src/settings/GroupPage.jsx
index 51fbda0e..51fbda0e 100644
--- a/modern/src/settings/GroupPage.js
+++ b/modern/src/settings/GroupPage.jsx
diff --git a/modern/src/settings/GroupsPage.js b/modern/src/settings/GroupsPage.jsx
index baba7f72..baba7f72 100644
--- a/modern/src/settings/GroupsPage.js
+++ b/modern/src/settings/GroupsPage.jsx
diff --git a/modern/src/settings/MaintenancePage.js b/modern/src/settings/MaintenancePage.jsx
index 987789d5..987789d5 100644
--- a/modern/src/settings/MaintenancePage.js
+++ b/modern/src/settings/MaintenancePage.jsx
diff --git a/modern/src/settings/MaintenancesPage.js b/modern/src/settings/MaintenancesPage.jsx
index 2a66590c..2a66590c 100644
--- a/modern/src/settings/MaintenancesPage.js
+++ b/modern/src/settings/MaintenancesPage.jsx
diff --git a/modern/src/settings/NotificationPage.js b/modern/src/settings/NotificationPage.jsx
index fdefedaf..fdefedaf 100644
--- a/modern/src/settings/NotificationPage.js
+++ b/modern/src/settings/NotificationPage.jsx
diff --git a/modern/src/settings/NotificationsPage.js b/modern/src/settings/NotificationsPage.jsx
index f1e70a85..f1e70a85 100644
--- a/modern/src/settings/NotificationsPage.js
+++ b/modern/src/settings/NotificationsPage.jsx
diff --git a/modern/src/settings/PreferencesPage.js b/modern/src/settings/PreferencesPage.jsx
index a05924a9..a05924a9 100644
--- a/modern/src/settings/PreferencesPage.js
+++ b/modern/src/settings/PreferencesPage.jsx
diff --git a/modern/src/settings/ServerPage.js b/modern/src/settings/ServerPage.jsx
index 07ce2dad..07ce2dad 100644
--- a/modern/src/settings/ServerPage.js
+++ b/modern/src/settings/ServerPage.jsx
diff --git a/modern/src/settings/UserConnectionsPage.js b/modern/src/settings/UserConnectionsPage.jsx
index 80de8835..80de8835 100644
--- a/modern/src/settings/UserConnectionsPage.js
+++ b/modern/src/settings/UserConnectionsPage.jsx
diff --git a/modern/src/settings/UserPage.js b/modern/src/settings/UserPage.jsx
index 21859ea7..21859ea7 100644
--- a/modern/src/settings/UserPage.js
+++ b/modern/src/settings/UserPage.jsx
diff --git a/modern/src/settings/UsersPage.js b/modern/src/settings/UsersPage.jsx
index d04f2a2b..d04f2a2b 100644
--- a/modern/src/settings/UsersPage.js
+++ b/modern/src/settings/UsersPage.jsx
diff --git a/modern/src/settings/components/AddAttributeDialog.js b/modern/src/settings/components/AddAttributeDialog.jsx
index 86ff64ea..86ff64ea 100644
--- a/modern/src/settings/components/AddAttributeDialog.js
+++ b/modern/src/settings/components/AddAttributeDialog.jsx
diff --git a/modern/src/settings/components/BaseCommandView.js b/modern/src/settings/components/BaseCommandView.jsx
index acf39090..acf39090 100644
--- a/modern/src/settings/components/BaseCommandView.js
+++ b/modern/src/settings/components/BaseCommandView.jsx
diff --git a/modern/src/settings/components/CollectionActions.js b/modern/src/settings/components/CollectionActions.jsx
index 666052d5..666052d5 100644
--- a/modern/src/settings/components/CollectionActions.js
+++ b/modern/src/settings/components/CollectionActions.jsx
diff --git a/modern/src/settings/components/CollectionFab.js b/modern/src/settings/components/CollectionFab.jsx
index 3c1fa783..3c1fa783 100644
--- a/modern/src/settings/components/CollectionFab.js
+++ b/modern/src/settings/components/CollectionFab.jsx
diff --git a/modern/src/settings/components/EditAttributesAccordion.js b/modern/src/settings/components/EditAttributesAccordion.jsx
index 214ddb0e..214ddb0e 100644
--- a/modern/src/settings/components/EditAttributesAccordion.js
+++ b/modern/src/settings/components/EditAttributesAccordion.jsx
diff --git a/modern/src/settings/components/EditItemView.js b/modern/src/settings/components/EditItemView.jsx
index d45855dd..d45855dd 100644
--- a/modern/src/settings/components/EditItemView.js
+++ b/modern/src/settings/components/EditItemView.jsx
diff --git a/modern/src/settings/components/SearchHeader.js b/modern/src/settings/components/SearchHeader.jsx
index 25757ed2..25757ed2 100644
--- a/modern/src/settings/components/SearchHeader.js
+++ b/modern/src/settings/components/SearchHeader.jsx
diff --git a/modern/src/settings/components/SettingsMenu.js b/modern/src/settings/components/SettingsMenu.jsx
index 96580974..96580974 100644
--- a/modern/src/settings/components/SettingsMenu.js
+++ b/modern/src/settings/components/SettingsMenu.jsx
diff --git a/modern/src/setupProxy.js b/modern/src/setupProxy.js
deleted file mode 100644
index be182a51..00000000
--- a/modern/src/setupProxy.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/* eslint-disable import/no-extraneous-dependencies */
-
-const { createProxyMiddleware } = require('http-proxy-middleware');
-
-module.exports = (app) => {
-  app.use(createProxyMiddleware('/api/socket', { target: `ws://${process.env.REACT_APP_URL_NAME}`, ws: true }));
-  app.use(createProxyMiddleware('/api', { target: `http://${process.env.REACT_APP_URL_NAME}` }));
-};