25 files changed, 1 insertions, 634 deletions

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 8ef1fcaa8..16ced4595 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -384,8 +384,6 @@ add_library(core STATIC
     hle/service/am/omm.h
     hle/service/am/spsm.cpp
     hle/service/am/spsm.h
-    hle/service/am/tcap.cpp
-    hle/service/am/tcap.h
     hle/service/aoc/aoc_u.cpp
     hle/service/aoc/aoc_u.h
     hle/service/apm/apm.cpp
@@ -396,28 +394,18 @@ add_library(core STATIC
     hle/service/apm/apm_interface.h
     hle/service/audio/audctl.cpp
     hle/service/audio/audctl.h
-    hle/service/audio/auddbg.cpp
-    hle/service/audio/auddbg.h
-    hle/service/audio/audin_a.cpp
-    hle/service/audio/audin_a.h
     hle/service/audio/audin_u.cpp
     hle/service/audio/audin_u.h
     hle/service/audio/audio.cpp
     hle/service/audio/audio.h
-    hle/service/audio/audout_a.cpp
-    hle/service/audio/audout_a.h
     hle/service/audio/audout_u.cpp
     hle/service/audio/audout_u.h
     hle/service/audio/audrec_a.cpp
     hle/service/audio/audrec_a.h
     hle/service/audio/audrec_u.cpp
     hle/service/audio/audrec_u.h
-    hle/service/audio/audren_a.cpp
-    hle/service/audio/audren_a.h
     hle/service/audio/audren_u.cpp
     hle/service/audio/audren_u.h
-    hle/service/audio/codecctl.cpp
-    hle/service/audio/codecctl.h
     hle/service/audio/errors.h
     hle/service/audio/hwopus.cpp
     hle/service/audio/hwopus.h
@@ -712,8 +700,6 @@ add_library(core STATIC
     hle/service/sm/sm_controller.h
     hle/service/sockets/bsd.cpp
     hle/service/sockets/bsd.h
-    hle/service/sockets/ethc.cpp
-    hle/service/sockets/ethc.h
     hle/service/sockets/nsd.cpp
     hle/service/sockets/nsd.h
     hle/service/sockets/sfdnsres.cpp
@@ -780,8 +766,6 @@ add_library(core STATIC
     hle/service/vi/vi_s.h
     hle/service/vi/vi_u.cpp
     hle/service/vi/vi_u.h
-    hle/service/wlan/wlan.cpp
-    hle/service/wlan/wlan.h
     internal_network/network.cpp
     internal_network/network.h
     internal_network/network_interface.cpp
diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp
index 8d5c8a3a3..83c862b4d 100644
--- a/src/core/hle/service/am/am.cpp
+++ b/src/core/hle/service/am/am.cpp
@@ -24,7 +24,6 @@
 #include "core/hle/service/am/idle.h"
 #include "core/hle/service/am/omm.h"
 #include "core/hle/service/am/spsm.h"
-#include "core/hle/service/am/tcap.h"
 #include "core/hle/service/apm/apm_controller.h"
 #include "core/hle/service/apm/apm_interface.h"
 #include "core/hle/service/bcat/backend/backend.h"
@@ -1838,7 +1837,6 @@ void InstallInterfaces(SM::ServiceManager& service_manager, NVFlinger::NVFlinger
     std::make_shared<IdleSys>(system)->InstallAsService(service_manager);
     std::make_shared<OMM>(system)->InstallAsService(service_manager);
     std::make_shared<SPSM>(system)->InstallAsService(service_manager);
-    std::make_shared<TCAP>(system)->InstallAsService(service_manager);
 }
 
 IHomeMenuFunctions::IHomeMenuFunctions(Core::System& system_)
diff --git a/src/core/hle/service/am/tcap.cpp b/src/core/hle/service/am/tcap.cpp
deleted file mode 100644
index 818420e22..000000000
--- a/src/core/hle/service/am/tcap.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "core/hle/service/am/tcap.h"
-
-namespace Service::AM {
-
-TCAP::TCAP(Core::System& system_) : ServiceFramework{system_, "tcap"} {
-    // clang-format off
-    static const FunctionInfo functions[] = {
-        {0, nullptr, "GetContinuousHighSkinTemperatureEvent"},
-        {1, nullptr, "SetOperationMode"},
-        {2, nullptr, "LoadAndApplySettings"},
-    };
-    // clang-format on
-
-    RegisterHandlers(functions);
-}
-
-TCAP::~TCAP() = default;
-
-} // namespace Service::AM
diff --git a/src/core/hle/service/am/tcap.h b/src/core/hle/service/am/tcap.h
deleted file mode 100644
index 6b2148c29..000000000
--- a/src/core/hle/service/am/tcap.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "core/hle/service/service.h"
-
-namespace Core {
-class System;
-}
-
-namespace Service::AM {
-
-class TCAP final : public ServiceFramework<TCAP> {
-public:
-    explicit TCAP(Core::System& system_);
-    ~TCAP() override;
-};
-
-} // namespace Service::AM
diff --git a/src/core/hle/service/apm/apm.cpp b/src/core/hle/service/apm/apm.cpp
index 8a338d9b1..44b2927a6 100644
--- a/src/core/hle/service/apm/apm.cpp
+++ b/src/core/hle/service/apm/apm.cpp
@@ -14,8 +14,6 @@ void InstallInterfaces(Core::System& system) {
     auto module_ = std::make_shared<Module>();
     std::make_shared<APM>(system, module_, system.GetAPMController(), "apm")
         ->InstallAsService(system.ServiceManager());
-    std::make_shared<APM>(system, module_, system.GetAPMController(), "apm:p")
-        ->InstallAsService(system.ServiceManager());
     std::make_shared<APM>(system, module_, system.GetAPMController(), "apm:am")
         ->InstallAsService(system.ServiceManager());
     std::make_shared<APM_Sys>(system, system.GetAPMController())
diff --git a/src/core/hle/service/audio/auddbg.cpp b/src/core/hle/service/audio/auddbg.cpp
deleted file mode 100644
index 5541af300..000000000
--- a/src/core/hle/service/audio/auddbg.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "core/hle/service/audio/auddbg.h"
-
-namespace Service::Audio {
-
-AudDbg::AudDbg(Core::System& system_, const char* name) : ServiceFramework{system_, name} {
-    // clang-format off
-    static const FunctionInfo functions[] = {
-        {0, nullptr, "RequestSuspendForDebug"},
-        {1, nullptr, "RequestResumeForDebug"},
-    };
-    // clang-format on
-
-    RegisterHandlers(functions);
-}
-
-AudDbg::~AudDbg() = default;
-
-} // namespace Service::Audio
diff --git a/src/core/hle/service/audio/auddbg.h b/src/core/hle/service/audio/auddbg.h
deleted file mode 100644
index 8f26be5dc..000000000
--- a/src/core/hle/service/audio/auddbg.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "core/hle/service/service.h"
-
-namespace Core {
-class System;
-}
-
-namespace Service::Audio {
-
-class AudDbg final : public ServiceFramework<AudDbg> {
-public:
-    explicit AudDbg(Core::System& system_, const char* name);
-    ~AudDbg() override;
-};
-
-} // namespace Service::Audio
diff --git a/src/core/hle/service/audio/audin_a.cpp b/src/core/hle/service/audio/audin_a.cpp
deleted file mode 100644
index 98f4a6048..000000000
--- a/src/core/hle/service/audio/audin_a.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "core/hle/service/audio/audin_a.h"
-
-namespace Service::Audio {
-
-AudInA::AudInA(Core::System& system_) : ServiceFramework{system_, "audin:a"} {
-    // clang-format off
-    static const FunctionInfo functions[] = {
-        {0, nullptr, "RequestSuspend"},
-        {1, nullptr, "RequestResume"},
-        {2, nullptr, "GetProcessMasterVolume"},
-        {3, nullptr, "SetProcessMasterVolume"},
-    };
-    // clang-format on
-
-    RegisterHandlers(functions);
-}
-
-AudInA::~AudInA() = default;
-
-} // namespace Service::Audio
diff --git a/src/core/hle/service/audio/audin_a.h b/src/core/hle/service/audio/audin_a.h
deleted file mode 100644
index 19a927de5..000000000
--- a/src/core/hle/service/audio/audin_a.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "core/hle/service/service.h"
-
-namespace Core {
-class System;
-}
-
-namespace Service::Audio {
-
-class AudInA final : public ServiceFramework<AudInA> {
-public:
-    explicit AudInA(Core::System& system_);
-    ~AudInA() override;
-};
-
-} // namespace Service::Audio
diff --git a/src/core/hle/service/audio/audio.cpp b/src/core/hle/service/audio/audio.cpp
index 97da71dfa..ed36e3448 100644
--- a/src/core/hle/service/audio/audio.cpp
+++ b/src/core/hle/service/audio/audio.cpp
@@ -2,17 +2,12 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "core/hle/service/audio/audctl.h"
-#include "core/hle/service/audio/auddbg.h"
-#include "core/hle/service/audio/audin_a.h"
 #include "core/hle/service/audio/audin_u.h"
 #include "core/hle/service/audio/audio.h"
-#include "core/hle/service/audio/audout_a.h"
 #include "core/hle/service/audio/audout_u.h"
 #include "core/hle/service/audio/audrec_a.h"
 #include "core/hle/service/audio/audrec_u.h"
-#include "core/hle/service/audio/audren_a.h"
 #include "core/hle/service/audio/audren_u.h"
-#include "core/hle/service/audio/codecctl.h"
 #include "core/hle/service/audio/hwopus.h"
 #include "core/hle/service/service.h"
 
@@ -20,21 +15,12 @@ namespace Service::Audio {
 
 void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system) {
     std::make_shared<AudCtl>(system)->InstallAsService(service_manager);
-    std::make_shared<AudOutA>(system)->InstallAsService(service_manager);
     std::make_shared<AudOutU>(system)->InstallAsService(service_manager);
-    std::make_shared<AudInA>(system)->InstallAsService(service_manager);
     std::make_shared<AudInU>(system)->InstallAsService(service_manager);
     std::make_shared<AudRecA>(system)->InstallAsService(service_manager);
     std::make_shared<AudRecU>(system)->InstallAsService(service_manager);
-    std::make_shared<AudRenA>(system)->InstallAsService(service_manager);
     std::make_shared<AudRenU>(system)->InstallAsService(service_manager);
-    std::make_shared<CodecCtl>(system)->InstallAsService(service_manager);
     std::make_shared<HwOpus>(system)->InstallAsService(service_manager);
-
-    std::make_shared<AudDbg>(system, "audin:d")->InstallAsService(service_manager);
-    std::make_shared<AudDbg>(system, "audout:d")->InstallAsService(service_manager);
-    std::make_shared<AudDbg>(system, "audrec:d")->InstallAsService(service_manager);
-    std::make_shared<AudDbg>(system, "audren:d")->InstallAsService(service_manager);
 }
 
 } // namespace Service::Audio
diff --git a/src/core/hle/service/audio/audout_a.cpp b/src/core/hle/service/audio/audout_a.cpp
deleted file mode 100644
index 5ecb99236..000000000
--- a/src/core/hle/service/audio/audout_a.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "core/hle/service/audio/audout_a.h"
-
-namespace Service::Audio {
-
-AudOutA::AudOutA(Core::System& system_) : ServiceFramework{system_, "audout:a"} {
-    // clang-format off
-    static const FunctionInfo functions[] = {
-        {0, nullptr, "RequestSuspend"},
-        {1, nullptr, "RequestResume"},
-        {2, nullptr, "GetProcessMasterVolume"},
-        {3, nullptr, "SetProcessMasterVolume"},
-        {4, nullptr, "GetProcessRecordVolume"},
-        {5, nullptr, "SetProcessRecordVolume"},
-    };
-    // clang-format on
-
-    RegisterHandlers(functions);
-}
-
-AudOutA::~AudOutA() = default;
-
-} // namespace Service::Audio
diff --git a/src/core/hle/service/audio/audout_a.h b/src/core/hle/service/audio/audout_a.h
deleted file mode 100644
index f641cffeb..000000000
--- a/src/core/hle/service/audio/audout_a.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "core/hle/service/service.h"
-
-namespace Core {
-class System;
-}
-
-namespace Service::Audio {
-
-class AudOutA final : public ServiceFramework<AudOutA> {
-public:
-    explicit AudOutA(Core::System& system_);
-    ~AudOutA() override;
-};
-
-} // namespace Service::Audio
diff --git a/src/core/hle/service/audio/audren_a.cpp b/src/core/hle/service/audio/audren_a.cpp
deleted file mode 100644
index e775ac3bf..000000000
--- a/src/core/hle/service/audio/audren_a.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "core/hle/service/audio/audren_a.h"
-
-namespace Service::Audio {
-
-AudRenA::AudRenA(Core::System& system_) : ServiceFramework{system_, "audren:a"} {
-    // clang-format off
-    static const FunctionInfo functions[] = {
-        {0, nullptr, "RequestSuspend"},
-        {1, nullptr, "RequestResume"},
-        {2, nullptr, "GetProcessMasterVolume"},
-        {3, nullptr, "SetProcessMasterVolume"},
-        {4, nullptr, "RegisterAppletResourceUserId"},
-        {5, nullptr, "UnregisterAppletResourceUserId"},
-        {6, nullptr, "GetProcessRecordVolume"},
-        {7, nullptr, "SetProcessRecordVolume"},
-    };
-    // clang-format on
-
-    RegisterHandlers(functions);
-}
-
-AudRenA::~AudRenA() = default;
-
-} // namespace Service::Audio
diff --git a/src/core/hle/service/audio/audren_a.h b/src/core/hle/service/audio/audren_a.h
deleted file mode 100644
index 9e08b4245..000000000
--- a/src/core/hle/service/audio/audren_a.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "core/hle/service/service.h"
-
-namespace Core {
-class System;
-}
-
-namespace Service::Audio {
-
-class AudRenA final : public ServiceFramework<AudRenA> {
-public:
-    explicit AudRenA(Core::System& system_);
-    ~AudRenA() override;
-};
-
-} // namespace Service::Audio
diff --git a/src/core/hle/service/audio/codecctl.cpp b/src/core/hle/service/audio/codecctl.cpp
deleted file mode 100644
index 81b956d7e..000000000
--- a/src/core/hle/service/audio/codecctl.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "core/hle/service/audio/codecctl.h"
-
-namespace Service::Audio {
-
-CodecCtl::CodecCtl(Core::System& system_) : ServiceFramework{system_, "codecctl"} {
-    static const FunctionInfo functions[] = {
-        {0, nullptr, "Initialize"},
-        {1, nullptr, "Finalize"},
-        {2, nullptr, "Sleep"},
-        {3, nullptr, "Wake"},
-        {4, nullptr, "SetVolume"},
-        {5, nullptr, "GetVolumeMax"},
-        {6, nullptr, "GetVolumeMin"},
-        {7, nullptr, "SetActiveTarget"},
-        {8, nullptr, "GetActiveTarget"},
-        {9, nullptr, "BindHeadphoneMicJackInterrupt"},
-        {10, nullptr, "IsHeadphoneMicJackInserted"},
-        {11, nullptr, "ClearHeadphoneMicJackInterrupt"},
-        {12, nullptr, "IsRequested"},
-    };
-    RegisterHandlers(functions);
-}
-
-CodecCtl::~CodecCtl() = default;
-
-} // namespace Service::Audio
diff --git a/src/core/hle/service/audio/codecctl.h b/src/core/hle/service/audio/codecctl.h
deleted file mode 100644
index 34da98212..000000000
--- a/src/core/hle/service/audio/codecctl.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "core/hle/service/service.h"
-
-namespace Core {
-class System;
-}
-
-namespace Service::Audio {
-
-class CodecCtl final : public ServiceFramework<CodecCtl> {
-public:
-    explicit CodecCtl(Core::System& system_);
-    ~CodecCtl() override;
-};
-
-} // namespace Service::Audio
diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp
index 5a1aa0903..cd6d000ef 100644
--- a/src/core/hle/service/hid/hid.cpp
+++ b/src/core/hle/service/hid/hid.cpp
@@ -2734,25 +2734,11 @@ private:
     }
 };
 
-class HidTmp final : public ServiceFramework<HidTmp> {
-public:
-    explicit HidTmp(Core::System& system_) : ServiceFramework{system_, "hid:tmp"} {
-        // clang-format off
-        static const FunctionInfo functions[] = {
-            {0, nullptr, "GetConsoleSixAxisSensorCalibrationValues"},
-        };
-        // clang-format on
-
-        RegisterHandlers(functions);
-    }
-};
-
 void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system) {
     std::make_shared<Hid>(system)->InstallAsService(service_manager);
     std::make_shared<HidBus>(system)->InstallAsService(service_manager);
     std::make_shared<HidDbg>(system)->InstallAsService(service_manager);
     std::make_shared<HidSys>(system)->InstallAsService(service_manager);
-    std::make_shared<HidTmp>(system)->InstallAsService(service_manager);
 
     std::make_shared<Service::IRS::IRS>(system)->InstallAsService(service_manager);
     std::make_shared<Service::IRS::IRS_SYS>(system)->InstallAsService(service_manager);
diff --git a/src/core/hle/service/pcv/pcv.cpp b/src/core/hle/service/pcv/pcv.cpp
index f7a497a14..98037a8d4 100644
--- a/src/core/hle/service/pcv/pcv.cpp
+++ b/src/core/hle/service/pcv/pcv.cpp
@@ -52,32 +52,6 @@ public:
     }
 };
 
-class PCV_ARB final : public ServiceFramework<PCV_ARB> {
-public:
-    explicit PCV_ARB(Core::System& system_) : ServiceFramework{system_, "pcv:arb"} {
-        // clang-format off
-        static const FunctionInfo functions[] = {
-            {0, nullptr, "ReleaseControl"},
-        };
-        // clang-format on
-
-        RegisterHandlers(functions);
-    }
-};
-
-class PCV_IMM final : public ServiceFramework<PCV_IMM> {
-public:
-    explicit PCV_IMM(Core::System& system_) : ServiceFramework{system_, "pcv:imm"} {
-        // clang-format off
-        static const FunctionInfo functions[] = {
-            {0, nullptr, "SetClockRate"},
-        };
-        // clang-format on
-
-        RegisterHandlers(functions);
-    }
-};
-
 class IClkrstSession final : public ServiceFramework<IClkrstSession> {
 public:
     explicit IClkrstSession(Core::System& system_, DeviceCode deivce_code_)
@@ -169,8 +143,6 @@ public:
 
 void InstallInterfaces(SM::ServiceManager& sm, Core::System& system) {
     std::make_shared<PCV>(system)->InstallAsService(sm);
-    std::make_shared<PCV_ARB>(system)->InstallAsService(sm);
-    std::make_shared<PCV_IMM>(system)->InstallAsService(sm);
     std::make_shared<CLKRST>(system, "clkrst")->InstallAsService(sm);
     std::make_shared<CLKRST>(system, "clkrst:i")->InstallAsService(sm);
     std::make_shared<CLKRST_A>(system)->InstallAsService(sm);
diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp
index 0de67f1e1..1ffc1c694 100644
--- a/src/core/hle/service/service.cpp
+++ b/src/core/hle/service/service.cpp
@@ -68,7 +68,6 @@
 #include "core/hle/service/time/time.h"
 #include "core/hle/service/usb/usb.h"
 #include "core/hle/service/vi/vi.h"
-#include "core/hle/service/wlan/wlan.h"
 #include "core/reporter.h"
 
 namespace Service {
@@ -306,7 +305,6 @@ Services::Services(std::shared_ptr<SM::ServiceManager>& sm, Core::System& system
     Time::InstallInterfaces(system);
     USB::InstallInterfaces(*sm, system);
     VI::InstallInterfaces(*sm, system, *nv_flinger, *hos_binder_driver_server);
-    WLAN::InstallInterfaces(*sm, system);
 }
 
 Services::~Services() = default;
diff --git a/src/core/hle/service/sockets/ethc.cpp b/src/core/hle/service/sockets/ethc.cpp
deleted file mode 100644
index c12ea999b..000000000
--- a/src/core/hle/service/sockets/ethc.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "core/hle/service/sockets/ethc.h"
-
-namespace Service::Sockets {
-
-ETHC_C::ETHC_C(Core::System& system_) : ServiceFramework{system_, "ethc:c"} {
-    // clang-format off
-    static const FunctionInfo functions[] = {
-        {0, nullptr, "Initialize"},
-        {1, nullptr, "Cancel"},
-        {2, nullptr, "GetResult"},
-        {3, nullptr, "GetMediaList"},
-        {4, nullptr, "SetMediaType"},
-        {5, nullptr, "GetMediaType"},
-        {6, nullptr, "Unknown6"},
-    };
-    // clang-format on
-
-    RegisterHandlers(functions);
-}
-
-ETHC_C::~ETHC_C() = default;
-
-ETHC_I::ETHC_I(Core::System& system_) : ServiceFramework{system_, "ethc:i"} {
-    // clang-format off
-    static const FunctionInfo functions[] = {
-        {0, nullptr, "GetReadableHandle"},
-        {1, nullptr, "Cancel"},
-        {2, nullptr, "GetResult"},
-        {3, nullptr, "GetInterfaceList"},
-        {4, nullptr, "GetInterfaceCount"},
-    };
-    // clang-format on
-
-    RegisterHandlers(functions);
-}
-
-ETHC_I::~ETHC_I() = default;
-
-} // namespace Service::Sockets
diff --git a/src/core/hle/service/sockets/ethc.h b/src/core/hle/service/sockets/ethc.h
deleted file mode 100644
index 7c5759a96..000000000
--- a/src/core/hle/service/sockets/ethc.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "core/hle/service/service.h"
-
-namespace Core {
-class System;
-}
-
-namespace Service::Sockets {
-
-class ETHC_C final : public ServiceFramework<ETHC_C> {
-public:
-    explicit ETHC_C(Core::System& system_);
-    ~ETHC_C() override;
-};
-
-class ETHC_I final : public ServiceFramework<ETHC_I> {
-public:
-    explicit ETHC_I(Core::System& system_);
-    ~ETHC_I() override;
-};
-
-} // namespace Service::Sockets
diff --git a/src/core/hle/service/sockets/sockets.cpp b/src/core/hle/service/sockets/sockets.cpp
index 8d3ba6f96..b191b5cf5 100644
--- a/src/core/hle/service/sockets/sockets.cpp
+++ b/src/core/hle/service/sockets/sockets.cpp
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "core/hle/service/sockets/bsd.h"
-#include "core/hle/service/sockets/ethc.h"
 #include "core/hle/service/sockets/nsd.h"
 #include "core/hle/service/sockets/sfdnsres.h"
 #include "core/hle/service/sockets/sockets.h"
@@ -14,9 +13,6 @@ void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system
     std::make_shared<BSD>(system, "bsd:u")->InstallAsService(service_manager);
     std::make_shared<BSDCFG>(system)->InstallAsService(service_manager);
 
-    std::make_shared<ETHC_C>(system)->InstallAsService(service_manager);
-    std::make_shared<ETHC_I>(system)->InstallAsService(service_manager);
-
     std::make_shared<NSD>(system, "nsd:a")->InstallAsService(service_manager);
     std::make_shared<NSD>(system, "nsd:u")->InstallAsService(service_manager);
 
diff --git a/src/core/hle/service/wlan/wlan.cpp b/src/core/hle/service/wlan/wlan.cpp
deleted file mode 100644
index 226e3034c..000000000
--- a/src/core/hle/service/wlan/wlan.cpp
+++ /dev/null
@@ -1,186 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include <memory>
-
-#include "core/hle/service/service.h"
-#include "core/hle/service/sm/sm.h"
-#include "core/hle/service/wlan/wlan.h"
-
-namespace Service::WLAN {
-
-class WLANInfra final : public ServiceFramework<WLANInfra> {
-public:
-    explicit WLANInfra(Core::System& system_) : ServiceFramework{system_, "wlan:inf"} {
-        // clang-format off
-        static const FunctionInfo functions[] = {
-            {0, nullptr, "OpenMode"},
-            {1, nullptr, "CloseMode"},
-            {2, nullptr, "GetMacAddress"},
-            {3, nullptr, "StartScan"},
-            {4, nullptr, "StopScan"},
-            {5, nullptr, "Connect"},
-            {6, nullptr, "CancelConnect"},
-            {7, nullptr, "Disconnect"},
-            {8, nullptr, "GetConnectionEvent"},
-            {9, nullptr, "GetConnectionStatus"},
-            {10, nullptr, "GetState"},
-            {11, nullptr, "GetScanResult"},
-            {12, nullptr, "GetRssi"},
-            {13, nullptr, "ChangeRxAntenna"},
-            {14, nullptr, "GetFwVersion"},
-            {15, nullptr, "RequestSleep"},
-            {16, nullptr, "RequestWakeUp"},
-            {17, nullptr, "RequestIfUpDown"},
-            {18, nullptr, "Unknown18"},
-            {19, nullptr, "Unknown19"},
-            {20, nullptr, "Unknown20"},
-            {21, nullptr, "Unknown21"},
-            {22, nullptr, "Unknown22"},
-            {23, nullptr, "Unknown23"},
-            {24, nullptr, "Unknown24"},
-            {25, nullptr, "Unknown25"},
-            {26, nullptr, "Unknown26"},
-            {27, nullptr, "Unknown27"},
-            {28, nullptr, "Unknown28"},
-            {29, nullptr, "Unknown29"},
-            {30, nullptr, "Unknown30"},
-            {31, nullptr, "Unknown31"},
-            {32, nullptr, "Unknown32"},
-            {33, nullptr, "Unknown33"},
-            {34, nullptr, "Unknown34"},
-            {35, nullptr, "Unknown35"},
-            {36, nullptr, "Unknown36"},
-            {37, nullptr, "Unknown37"},
-            {38, nullptr, "Unknown38"},
-        };
-        // clang-format on
-
-        RegisterHandlers(functions);
-    }
-};
-
-class WLANLocal final : public ServiceFramework<WLANLocal> {
-public:
-    explicit WLANLocal(Core::System& system_) : ServiceFramework{system_, "wlan:lcl"} {
-        // clang-format off
-        static const FunctionInfo functions[] = {
-            {0, nullptr, "Unknown0"},
-            {1, nullptr, "Unknown1"},
-            {2, nullptr, "Unknown2"},
-            {3, nullptr, "Unknown3"},
-            {4, nullptr, "Unknown4"},
-            {5, nullptr, "Unknown5"},
-            {6, nullptr, "GetMacAddress"},
-            {7, nullptr, "CreateBss"},
-            {8, nullptr, "DestroyBss"},
-            {9, nullptr, "StartScan"},
-            {10, nullptr, "StopScan"},
-            {11, nullptr, "Connect"},
-            {12, nullptr, "CancelConnect"},
-            {13, nullptr, "Join"},
-            {14, nullptr, "CancelJoin"},
-            {15, nullptr, "Disconnect"},
-            {16, nullptr, "SetBeaconLostCount"},
-            {17, nullptr, "Unknown17"},
-            {18, nullptr, "Unknown18"},
-            {19, nullptr, "Unknown19"},
-            {20, nullptr, "GetBssIndicationEvent"},
-            {21, nullptr, "GetBssIndicationInfo"},
-            {22, nullptr, "GetState"},
-            {23, nullptr, "GetAllowedChannels"},
-            {24, nullptr, "AddIe"},
-            {25, nullptr, "DeleteIe"},
-            {26, nullptr, "Unknown26"},
-            {27, nullptr, "Unknown27"},
-            {28, nullptr, "CreateRxEntry"},
-            {29, nullptr, "DeleteRxEntry"},
-            {30, nullptr, "Unknown30"},
-            {31, nullptr, "Unknown31"},
-            {32, nullptr, "AddMatchingDataToRxEntry"},
-            {33, nullptr, "RemoveMatchingDataFromRxEntry"},
-            {34, nullptr, "GetScanResult"},
-            {35, nullptr, "Unknown35"},
-            {36, nullptr, "SetActionFrameWithBeacon"},
-            {37, nullptr, "CancelActionFrameWithBeacon"},
-            {38, nullptr, "CreateRxEntryForActionFrame"},
-            {39, nullptr, "DeleteRxEntryForActionFrame"},
-            {40, nullptr, "Unknown40"},
-            {41, nullptr, "Unknown41"},
-            {42, nullptr, "CancelGetActionFrame"},
-            {43, nullptr, "GetRssi"},
-            {44, nullptr, "Unknown44"},
-            {45, nullptr, "Unknown45"},
-            {46, nullptr, "Unknown46"},
-            {47, nullptr, "Unknown47"},
-            {48, nullptr, "Unknown48"},
-            {49, nullptr, "Unknown49"},
-            {50, nullptr, "Unknown50"},
-            {51, nullptr, "Unknown51"},
-        };
-        // clang-format on
-
-        RegisterHandlers(functions);
-    }
-};
-
-class WLANLocalGetFrame final : public ServiceFramework<WLANLocalGetFrame> {
-public:
-    explicit WLANLocalGetFrame(Core::System& system_) : ServiceFramework{system_, "wlan:lg"} {
-        // clang-format off
-        static const FunctionInfo functions[] = {
-            {0, nullptr, "Unknown"},
-        };
-        // clang-format on
-
-        RegisterHandlers(functions);
-    }
-};
-
-class WLANSocketGetFrame final : public ServiceFramework<WLANSocketGetFrame> {
-public:
-    explicit WLANSocketGetFrame(Core::System& system_) : ServiceFramework{system_, "wlan:sg"} {
-        // clang-format off
-        static const FunctionInfo functions[] = {
-            {0, nullptr, "Unknown"},
-        };
-        // clang-format on
-
-        RegisterHandlers(functions);
-    }
-};
-
-class WLANSocketManager final : public ServiceFramework<WLANSocketManager> {
-public:
-    explicit WLANSocketManager(Core::System& system_) : ServiceFramework{system_, "wlan:soc"} {
-        // clang-format off
-        static const FunctionInfo functions[] = {
-            {0, nullptr, "Unknown0"},
-            {1, nullptr, "Unknown1"},
-            {2, nullptr, "Unknown2"},
-            {3, nullptr, "Unknown3"},
-            {4, nullptr, "Unknown4"},
-            {5, nullptr, "Unknown5"},
-            {6, nullptr, "GetMacAddress"},
-            {7, nullptr, "SwitchTsfTimerFunction"},
-            {8, nullptr, "Unknown8"},
-            {9, nullptr, "Unknown9"},
-            {10, nullptr, "Unknown10"},
-            {11, nullptr, "Unknown11"},
-            {12, nullptr, "Unknown12"},
-        };
-        // clang-format on
-
-        RegisterHandlers(functions);
-    }
-};
-
-void InstallInterfaces(SM::ServiceManager& sm, Core::System& system) {
-    std::make_shared<WLANInfra>(system)->InstallAsService(sm);
-    std::make_shared<WLANLocal>(system)->InstallAsService(sm);
-    std::make_shared<WLANLocalGetFrame>(system)->InstallAsService(sm);
-    std::make_shared<WLANSocketGetFrame>(system)->InstallAsService(sm);
-    std::make_shared<WLANSocketManager>(system)->InstallAsService(sm);
-}
-
-} // namespace Service::WLAN
diff --git a/src/core/hle/service/wlan/wlan.h b/src/core/hle/service/wlan/wlan.h
deleted file mode 100644
index 535c3bf0d..000000000
--- a/src/core/hle/service/wlan/wlan.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-namespace Core {
-class System;
-}
-
-namespace Service::SM {
-class ServiceManager;
-}
-
-namespace Service::WLAN {
-
-void InstallInterfaces(SM::ServiceManager& sm, Core::System& system);
-
-} // namespace Service::WLAN
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 1e6778ada..7629904b3 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -3167,20 +3167,8 @@ void GMainWindow::ShowFullscreen() {
         window->hide();
         window->setWindowFlags(window->windowFlags() | Qt::FramelessWindowHint);
         const auto screen_geometry = GuessCurrentScreen(window)->geometry();
-        // NB: On Windows, a borderless window will be treated the same as exclusive fullscreen
-        //     when the window geometry matches the physical dimensions of the screen.
-        //     However, with High DPI scaling, when the devicePixelRatioF() is > 1, the borderless
-        //     window apparently is not treated as exclusive fullscreen and functions correctly.
-        //     One can verify and replicate this behavior by using a high resolution (4K) display,
-        //     and switching between 100% and 200% scaling in Windows' display settings.
-        //     At 100%, without the addition of 1, it is treated as exclusive fullscreen.
-        //     At 200%, with or without the addition of 1, it is treated as borderless windowed.
-        //     Therefore, we can use (read: abuse) this difference in behavior to fix this issue for
-        //     those with higher resolution displays when the Qt scaling ratio is > 1.
-        //     Should this behavior be changed in the future, please revisit this workaround.
-        const bool must_add_one = devicePixelRatioF() == 1.0f;
         window->setGeometry(screen_geometry.x(), screen_geometry.y(), screen_geometry.width(),
-                            screen_geometry.height() + (must_add_one ? 1 : 0));
+                            screen_geometry.height() + 1);
         window->raise();
         window->showNormal();
     };