1 files changed, 2 insertions, 70 deletions

diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp
index f267aad74..afd27d446 100644
--- a/src/core/hle/service/service.cpp
+++ b/src/core/hle/service/service.cpp
@@ -12,43 +12,17 @@
 #include "core/hle/kernel/process.h"
 #include "core/hle/kernel/server_port.h"
 #include "core/hle/kernel/server_session.h"
-#include "core/hle/service/ac/ac.h"
-#include "core/hle/service/act/act.h"
-#include "core/hle/service/am/am.h"
-#include "core/hle/service/apt/apt.h"
-#include "core/hle/service/boss/boss.h"
-#include "core/hle/service/cam/cam.h"
-#include "core/hle/service/cecd/cecd.h"
+#include "core/hle/kernel/handle_table.h"
 #include "core/hle/service/cfg/cfg.h"
-#include "core/hle/service/csnd_snd.h"
-#include "core/hle/service/dlp/dlp.h"
 #include "core/hle/service/dsp_dsp.h"
-#include "core/hle/service/err_f.h"
-#include "core/hle/service/frd/frd.h"
 #include "core/hle/service/fs/archive.h"
 #include "core/hle/service/gsp_gpu.h"
 #include "core/hle/service/gsp_lcd.h"
 #include "core/hle/service/hid/hid.h"
-#include "core/hle/service/http_c.h"
-#include "core/hle/service/ir/ir.h"
-#include "core/hle/service/ldr_ro/ldr_ro.h"
-#include "core/hle/service/mic_u.h"
-#include "core/hle/service/mvd/mvd.h"
-#include "core/hle/service/ndm/ndm.h"
-#include "core/hle/service/news/news.h"
-#include "core/hle/service/nfc/nfc.h"
-#include "core/hle/service/nim/nim.h"
 #include "core/hle/service/ns/ns.h"
-#include "core/hle/service/nwm/nwm.h"
-#include "core/hle/service/pm_app.h"
-#include "core/hle/service/ptm/ptm.h"
-#include "core/hle/service/qtm/qtm.h"
 #include "core/hle/service/service.h"
 #include "core/hle/service/sm/sm.h"
 #include "core/hle/service/sm/srv.h"
-#include "core/hle/service/soc_u.h"
-#include "core/hle/service/ssl_c.h"
-#include "core/hle/service/y2r_u.h"
 
 using Kernel::ClientPort;
 using Kernel::ServerPort;
@@ -217,63 +191,21 @@ void Init() {
 
     NS::InstallInterfaces(*SM::g_service_manager);
 
-    AddNamedPort(new ERR::ERR_F);
-
     FS::ArchiveInit();
-    AC::Init();
-    ACT::Init();
-    AM::Init();
-    APT::Init();
-    BOSS::Init();
-    CAM::Init();
-    CECD::Init();
     CFG::Init();
-    DLP::Init();
-    FRD::Init();
     HID::Init();
-    IR::Init();
-    MVD::Init();
-    NDM::Init();
-    NEWS::Init();
-    NFC::Init();
-    NIM::Init();
-    NWM::Init();
-    PTM::Init();
-    QTM::Init();
-
-    AddService(new CSND::CSND_SND);
+
     AddService(new DSP_DSP::Interface);
     AddService(new GSP::GSP_GPU);
     AddService(new GSP::GSP_LCD);
-    AddService(new HTTP::HTTP_C);
-    AddService(new LDR::LDR_RO);
-    AddService(new MIC::MIC_U);
-    AddService(new PM::PM_APP);
-    AddService(new SOC::SOC_U);
-    AddService(new SSL::SSL_C);
-    AddService(new Y2R::Y2R_U);
 
     LOG_DEBUG(Service, "initialized OK");
 }
 
 /// Shutdown ServiceManager
 void Shutdown() {
-    PTM::Shutdown();
-    NFC::Shutdown();
-    NIM::Shutdown();
-    NEWS::Shutdown();
-    NDM::Shutdown();
-    IR::Shutdown();
     HID::Shutdown();
-    FRD::Shutdown();
-    DLP::Shutdown();
     CFG::Shutdown();
-    CECD::Shutdown();
-    CAM::Shutdown();
-    BOSS::Shutdown();
-    APT::Shutdown();
-    AM::Shutdown();
-    AC::Shutdown();
     FS::ArchiveShutdown();
 
     SM::g_service_manager = nullptr;