diff --git a/lib/framework/ESP8266React.cpp b/lib/framework/ESP8266React.cpp
index 1de95f1cf..97b8335a0 100644
--- a/lib/framework/ESP8266React.cpp
+++ b/lib/framework/ESP8266React.cpp
@@ -14,9 +14,7 @@ ESP8266React::ESP8266React(AsyncWebServer * server, FS * fs)
     , _uploadFileService(server, &_securitySettingsService)
     , _mqttSettingsService(server, fs, &_securitySettingsService)
     , _mqttStatus(server, &_mqttSettingsService, &_securitySettingsService)
-    , _authenticationService(server, &_securitySettingsService)
-    , _restartService(server, &_securitySettingsService)
-    , _factoryResetService(server, fs, &_securitySettingsService) {
+    , _authenticationService(server, &_securitySettingsService) {
     //
     // Serve static web resources
     //
diff --git a/lib/framework/ESP8266React.h b/lib/framework/ESP8266React.h
index 1fdd69e5d..2c8dc7cc1 100644
--- a/lib/framework/ESP8266React.h
+++ b/lib/framework/ESP8266React.h
@@ -4,13 +4,11 @@
 #include "APSettingsService.h"
 #include "APStatus.h"
 #include "AuthenticationService.h"
-#include "FactoryResetService.h"
 #include "MqttSettingsService.h"
 #include "MqttStatus.h"
 #include "NTPSettingsService.h"
 #include "NTPStatus.h"
 #include "UploadFileService.h"
-#include "RestartService.h"
 #include "SecuritySettingsService.h"
 #include "WiFiScanner.h"
 #include "NetworkSettingsService.h"
@@ -68,12 +66,6 @@ class ESP8266React {
         return _apSettingsService.getAPNetworkStatus() == APNetworkStatus::ACTIVE;
     }
 
-#ifndef EMSESP_STANDALONE
-    void factoryReset() {
-        _factoryResetService.factoryReset();
-    }
-#endif
-
   private:
     SecuritySettingsService _securitySettingsService;
     NetworkSettingsService  _networkSettingsService;
@@ -87,8 +79,6 @@ class ESP8266React {
     MqttSettingsService     _mqttSettingsService;
     MqttStatus              _mqttStatus;
     AuthenticationService   _authenticationService;
-    RestartService          _restartService;
-    FactoryResetService     _factoryResetService;
 };
 
 #endif
diff --git a/lib/framework/FactoryResetService.cpp b/lib/framework/FactoryResetService.cpp
deleted file mode 100644
index 3a23f6a3b..000000000
--- a/lib/framework/FactoryResetService.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "FactoryResetService.h"
-
-FactoryResetService::FactoryResetService(AsyncWebServer * server, FS * fs, SecurityManager * securityManager)
-    : fs(fs) {
-    server->on(FACTORY_RESET_SERVICE_PATH,
-               HTTP_POST,
-               securityManager->wrapRequest([this](AsyncWebServerRequest * request) { handleRequest(request); }, AuthenticationPredicates::IS_ADMIN));
-}
-
-void FactoryResetService::handleRequest(AsyncWebServerRequest * request) {
-    request->onDisconnect([this] { factoryReset(); });
-    request->send(200);
-}
-
-/**
- * Delete function assumes that all files are stored flat, within the config directory.
- */
-void FactoryResetService::factoryReset() {
-    // TODO To replaced with fs.rmdir(FS_CONFIG_DIRECTORY) now we're using IDF 4.2
-    File root = fs->open(FS_CONFIG_DIRECTORY);
-    File file;
-    while ((file = root.openNextFile())) {
-        String path = file.path();
-        file.close();
-        fs->remove(path);
-    }
-
-    RestartService::restartNow();
-}
diff --git a/lib/framework/FactoryResetService.h b/lib/framework/FactoryResetService.h
deleted file mode 100644
index 2a53c3122..000000000
--- a/lib/framework/FactoryResetService.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef FactoryResetService_h
-#define FactoryResetService_h
-
-#include <WiFi.h>
-#include <ESPAsyncWebServer.h>
-#include <FS.h>
-
-#include "SecurityManager.h"
-#include "RestartService.h"
-
-#define FS_CONFIG_DIRECTORY "/config"
-#define FACTORY_RESET_SERVICE_PATH "/rest/factoryReset"
-
-class FactoryResetService {
-  public:
-    FactoryResetService(AsyncWebServer * server, FS * fs, SecurityManager * securityManager);
-
-    void factoryReset();
-
-  private:
-    FS * fs;
-    void handleRequest(AsyncWebServerRequest * request);
-};
-
-#endif
diff --git a/lib/framework/RestartService.cpp b/lib/framework/RestartService.cpp
deleted file mode 100644
index ef7551e81..000000000
--- a/lib/framework/RestartService.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "RestartService.h"
-
-#include <esp_ota_ops.h>
-
-#include "../../src/emsesp_stub.hpp"
-
-RestartService::RestartService(AsyncWebServer * server, SecurityManager * securityManager) {
-    server->on(RESTART_SERVICE_PATH,
-               HTTP_POST,
-               securityManager->wrapRequest([this](AsyncWebServerRequest * request) { restart(request); }, AuthenticationPredicates::IS_ADMIN));
-}
-
-void RestartService::restartNow() {
-    emsesp::EMSESP::system_.restart_requested(true); // will be handled by the main loop
-}
-
-void RestartService::restart(AsyncWebServerRequest * request) {
-    request->onDisconnect(RestartService::restartNow);
-    request->send(200);
-}
diff --git a/lib/framework/RestartService.h b/lib/framework/RestartService.h
deleted file mode 100644
index b386def19..000000000
--- a/lib/framework/RestartService.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef RestartService_h
-#define RestartService_h
-
-#include <WiFi.h>
-#include <AsyncTCP.h>
-#include <ESPAsyncWebServer.h>
-
-#include "SecurityManager.h"
-
-#define RESTART_SERVICE_PATH "/rest/restart"
-
-class RestartService {
-  public:
-    RestartService(AsyncWebServer * server, SecurityManager * securityManager);
-
-    static void restartNow();
-
-  private:
-    void restart(AsyncWebServerRequest * request);
-};
-
-#endif
diff --git a/lib/framework/UploadFileService.h b/lib/framework/UploadFileService.h
index 067ad491e..04a19a2c9 100644
--- a/lib/framework/UploadFileService.h
+++ b/lib/framework/UploadFileService.h
@@ -1,7 +1,6 @@
 #ifndef UploadFileService_h
 #define UploadFileService_h
 
-#include "RestartService.h"
 #include "SecurityManager.h"
 
 #include <Arduino.h>