diff --git a/CMakeLists.txt b/CMakeLists.txt
index 87a485e5d..d8ab1dd97 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -404,7 +404,6 @@ add_subdirectory(externals)
 if (NOT USE_SYSTEM_BOOST)
     add_definitions( -DBOOST_ALL_NO_LIB )
     add_library(Boost::boost ALIAS boost)
-    add_library(Boost::serialization ALIAS boost_serialization)
     add_library(Boost::iostreams ALIAS boost_iostreams)
 endif()
 
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index fc45473b6..bae358366 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -20,11 +20,6 @@ if (NOT USE_SYSTEM_BOOST)
     add_library(boost INTERFACE)
     target_include_directories(boost SYSTEM INTERFACE ${Boost_INCLUDE_DIR})
 
-    # Boost::serialization
-    file(GLOB boost_serialization_SRC "${CMAKE_SOURCE_DIR}/externals/boost/libs/serialization/src/*.cpp")
-    add_library(boost_serialization STATIC ${boost_serialization_SRC})
-    target_link_libraries(boost_serialization PUBLIC boost)
-
     # Boost::iostreams
     add_library(
         boost_iostreams
diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cpp
index c670f7d19..5c651dcc3 100644
--- a/src/android/app/src/main/jni/native.cpp
+++ b/src/android/app/src/main/jni/native.cpp
@@ -37,7 +37,6 @@
 #include "core/hle/service/am/am.h"
 #include "core/hle/service/nfc/nfc.h"
 #include "core/loader/loader.h"
-#include "core/savestate.h"
 #include "core/telemetry_session.h"
 #include "jni/android_common/android_common.h"
 #include "jni/applets/mii_selector.h"
@@ -430,7 +429,8 @@ jobject Java_org_citra_citra_1emu_NativeLibrary_downloadTitleFromNus([[maybe_unu
                                                                      [[maybe_unused]] jobject obj,
                                                                      jlong title) {
     const auto title_id = static_cast<u64>(title);
-    Service::AM::InstallStatus status = Service::AM::InstallFromNus(title_id);
+    auto& system = Core::System::GetInstance();
+    Service::AM::InstallStatus status = Service::AM::InstallFromNus(system, title_id);
     if (status != Service::AM::InstallStatus::Success) {
         return IDCache::GetJavaCiaInstallStatus(status);
     }
@@ -690,12 +690,7 @@ JNIEXPORT jobject JNICALL Java_org_citra_citra_1emu_utils_CiaInstallWorker_insta
 
 jobjectArray Java_org_citra_citra_1emu_NativeLibrary_getSavestateInfo(
     JNIEnv* env, [[maybe_unused]] jobject obj) {
-    const jclass date_class = env->FindClass("java/util/Date");
-    const auto date_constructor = env->GetMethodID(date_class, "<init>", "(J)V");
-
     const jclass savestate_info_class = IDCache::GetSavestateInfoClass();
-    const auto slot_field = env->GetFieldID(savestate_info_class, "slot", "I");
-    const auto date_field = env->GetFieldID(savestate_info_class, "time", "Ljava/util/Date;");
 
     const Core::System& system{Core::System::GetInstance()};
     if (!system.IsPoweredOn()) {
@@ -707,18 +702,7 @@ jobjectArray Java_org_citra_citra_1emu_NativeLibrary_getSavestateInfo(
         return nullptr;
     }
 
-    const auto savestates = Core::ListSaveStates(title_id, system.Movie().GetCurrentMovieID());
-    const jobjectArray array =
-        env->NewObjectArray(static_cast<jsize>(savestates.size()), savestate_info_class, nullptr);
-    for (std::size_t i = 0; i < savestates.size(); ++i) {
-        const jobject object = env->AllocObject(savestate_info_class);
-        env->SetIntField(object, slot_field, static_cast<jint>(savestates[i].slot));
-        env->SetObjectField(object, date_field,
-                            env->NewObject(date_class, date_constructor,
-                                           static_cast<jlong>(savestates[i].time * 1000)));
-
-        env->SetObjectArrayElement(array, i, object);
-    }
+    const jobjectArray array = env->NewObjectArray(jsize(0), savestate_info_class, nullptr);
     return array;
 }
 
diff --git a/src/audio_core/dsp_interface.h b/src/audio_core/dsp_interface.h
index e2e76db6d..e49a0cd8c 100644
--- a/src/audio_core/dsp_interface.h
+++ b/src/audio_core/dsp_interface.h
@@ -4,9 +4,9 @@
 
 #pragma once
 
+#include <functional>
 #include <memory>
 #include <span>
-#include <boost/serialization/access.hpp>
 #include "audio_core/audio_types.h"
 #include "audio_core/time_stretch.h"
 #include "common/common_types.h"
@@ -123,10 +123,6 @@ private:
     std::array<s16, 2> last_frame{};
     TimeStretcher time_stretcher;
     std::unique_ptr<Sink> sink;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {}
-    friend class boost::serialization::access;
 };
 
 } // namespace AudioCore
diff --git a/src/audio_core/hle/hle.cpp b/src/audio_core/hle/hle.cpp
index 9d5277504..d21de3b23 100644
--- a/src/audio_core/hle/hle.cpp
+++ b/src/audio_core/hle/hle.cpp
@@ -2,11 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <boost/serialization/array.hpp>
-#include <boost/serialization/base_object.hpp>
-#include <boost/serialization/shared_ptr.hpp>
-#include <boost/serialization/vector.hpp>
-#include <boost/serialization/weak_ptr.hpp>
 #include "audio_core/audio_types.h"
 #include "audio_core/hle/aac_decoder.h"
 #include "audio_core/hle/common.h"
@@ -16,7 +11,6 @@
 #include "audio_core/hle/shared_memory.h"
 #include "audio_core/hle/source.h"
 #include "audio_core/sink.h"
-#include "common/archives.h"
 #include "common/assert.h"
 #include "common/common_types.h"
 #include "common/hash.h"
@@ -30,13 +24,6 @@ namespace AudioCore {
 
 DspHle::DspHle(Core::System& system) : DspHle(system, system.Memory(), system.CoreTiming()) {}
 
-template <class Archive>
-void DspHle::serialize(Archive& ar, const unsigned int) {
-    ar& boost::serialization::base_object<DspInterface>(*this);
-    ar&* impl.get();
-}
-SERIALIZE_IMPL(DspHle)
-
 // The value below is the "perfect" mathematical ratio of ARM11 cycles per audio frame, samples per
 // frame * teaklite cycles per sample * 2 ARM11 cycles/teaklite cycle
 // (160 * 4096 * 2) = (1310720)
@@ -95,17 +82,6 @@ private:
     std::unique_ptr<HLE::DecoderBase> aac_decoder{};
 
     std::function<void(Service::DSP::InterruptType type, DspPipe pipe)> interrupt_handler{};
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& dsp_state;
-        ar& pipe_data;
-        ar& dsp_memory.raw_memory;
-        ar& sources;
-        ar& mixers;
-        // interrupt_handler is reregistered when loading state from DSP_DSP
-    }
-    friend class boost::serialization::access;
 };
 
 DspHle::Impl::Impl(DspHle& parent_, Memory::MemorySystem& memory, Core::Timing& timing)
diff --git a/src/audio_core/hle/hle.h b/src/audio_core/hle/hle.h
index 2ee4421e7..f66f1a590 100644
--- a/src/audio_core/hle/hle.h
+++ b/src/audio_core/hle/hle.h
@@ -7,7 +7,6 @@
 #include <array>
 #include <memory>
 #include <vector>
-#include <boost/serialization/export.hpp>
 #include "audio_core/audio_types.h"
 #include "audio_core/dsp_interface.h"
 #include "common/common_types.h"
@@ -49,10 +48,6 @@ private:
     struct Impl;
     friend struct Impl;
     std::unique_ptr<Impl> impl;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
-    friend class boost::serialization::access;
 };
 
 } // namespace AudioCore
diff --git a/src/audio_core/hle/mixers.h b/src/audio_core/hle/mixers.h
index 9fecfcbe2..1831a7b50 100644
--- a/src/audio_core/hle/mixers.h
+++ b/src/audio_core/hle/mixers.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include <array>
-#include <boost/serialization/array.hpp>
 #include "audio_core/audio_types.h"
 #include "audio_core/hle/shared_memory.h"
 
@@ -54,16 +53,6 @@ private:
     void DownmixAndMixIntoCurrentFrame(float gain, const QuadFrame32& samples);
     /// INTERNAL: Generate DspStatus based on internal state.
     DspStatus GetCurrentStatus() const;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& current_frame;
-        ar& state.intermediate_mixer_volume;
-        ar& state.aux_bus_enable;
-        ar& state.intermediate_mix_buffer;
-        ar& state.output_format;
-    }
-    friend class boost::serialization::access;
 };
 
 } // namespace AudioCore::HLE
diff --git a/src/audio_core/hle/shared_memory.h b/src/audio_core/hle/shared_memory.h
index dfa9d2da1..c9974c60d 100644
--- a/src/audio_core/hle/shared_memory.h
+++ b/src/audio_core/hle/shared_memory.h
@@ -8,7 +8,6 @@
 #include <cstddef>
 #include <memory>
 #include <type_traits>
-#include <boost/serialization/access.hpp>
 #include "audio_core/audio_types.h"
 #include "audio_core/hle/common.h"
 #include "common/bit_field.h"
@@ -57,12 +56,6 @@ private:
         return (value << 16) | (value >> 16);
     }
     u32_le storage;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& storage;
-    }
-    friend class boost::serialization::access;
 };
 static_assert(std::is_trivially_copyable<u32_dsp>::value, "u32_dsp isn't trivially copyable");
 
diff --git a/src/audio_core/hle/source.h b/src/audio_core/hle/source.h
index d7114952b..523e6d9bb 100644
--- a/src/audio_core/hle/source.h
+++ b/src/audio_core/hle/source.h
@@ -6,10 +6,6 @@
 
 #include <array>
 #include <vector>
-#include <boost/serialization/array.hpp>
-#include <boost/serialization/deque.hpp>
-#include <boost/serialization/priority_queue.hpp>
-#include <boost/serialization/vector.hpp>
 #include <queue>
 #include "audio_core/audio_types.h"
 #include "audio_core/codec.h"
@@ -89,24 +85,6 @@ private:
         bool from_queue;
         u32 play_position; // = 0;
         bool has_played;   // = false;
-
-    private:
-        template <class Archive>
-        void serialize(Archive& ar, const unsigned int) {
-            ar& physical_address;
-            ar& length;
-            ar& adpcm_ps;
-            ar& adpcm_yn;
-            ar& adpcm_dirty;
-            ar& is_looping;
-            ar& buffer_id;
-            ar& mono_or_stereo;
-            ar& format;
-            ar& from_queue;
-            ar& play_position;
-            ar& has_played;
-        }
-        friend class boost::serialization::access;
     };
 
     struct BufferOrder {
@@ -159,27 +137,6 @@ private:
         // Filter state
 
         SourceFilters filters = {};
-
-    private:
-        template <class Archive>
-        void serialize(Archive& ar, const unsigned int) {
-            ar& enabled;
-            ar& sync_count;
-            ar& gain;
-            ar& input_queue;
-            ar& mono_or_stereo;
-            ar& format;
-            ar& current_sample_number;
-            ar& current_buffer_physical_address;
-            ar& current_buffer;
-            ar& buffer_update;
-            ar& current_buffer_id;
-            ar& adpcm_coeffs;
-            ar& rate_multiplier;
-            ar& interpolation_mode;
-        }
-        friend class boost::serialization::access;
-
     } state;
 
     // Internal functions
@@ -193,12 +150,6 @@ private:
     bool DequeueBuffer();
     /// INTERNAL: Generates a SourceStatus::Status based on our internal state.
     SourceStatus::Status GetCurrentStatus();
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& state;
-    }
-    friend class boost::serialization::access;
 };
 
 } // namespace AudioCore::HLE
diff --git a/src/citra_qt/configuration/configure_system.cpp b/src/citra_qt/configuration/configure_system.cpp
index 971f9f520..239a8c2fa 100644
--- a/src/citra_qt/configuration/configure_system.cpp
+++ b/src/citra_qt/configuration/configure_system.cpp
@@ -684,8 +684,8 @@ void ConfigureSystem::DownloadFromNUS() {
                      &QProgressDialog::setValue);
 
     auto failed = false;
-    const auto download_title = [&future_watcher, &failed](const u64& title_id) {
-        if (Service::AM::InstallFromNus(title_id) != Service::AM::InstallStatus::Success) {
+    const auto download_title = [&future_watcher, &failed, this](const u64& title_id) {
+        if (Service::AM::InstallFromNus(system, title_id) != Service::AM::InstallStatus::Success) {
             failed = true;
             future_watcher.cancel();
         }
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index 5d8b4204b..c001f56bf 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -4,7 +4,6 @@
 
 #include <clocale>
 #include <memory>
-#include <thread>
 #include <QFileDialog>
 #include <QFutureWatcher>
 #include <QLabel>
@@ -81,7 +80,6 @@
 #endif
 #include "common/settings.h"
 #include "core/core.h"
-#include "core/dumping/backend.h"
 #include "core/file_sys/archive_extsavedata.h"
 #include "core/file_sys/archive_source_sd_savedata.h"
 #include "core/frontend/applets/default_applets.h"
@@ -90,7 +88,6 @@
 #include "core/hle/service/nfc/nfc.h"
 #include "core/loader/loader.h"
 #include "core/movie.h"
-#include "core/savestate.h"
 #include "core/system_titles.h"
 #include "input_common/main.h"
 #include "network/network_settings.h"
@@ -581,7 +578,7 @@ void GMainWindow::InitializeRecentFileMenuActions() {
 }
 
 void GMainWindow::InitializeSaveStateMenuActions() {
-    for (u32 i = 0; i < Core::SaveStateSlotCount; ++i) {
+    for (u32 i = 0; i < SaveStateSlotCount; ++i) {
         actions_load_state[i] = new QAction(this);
         actions_load_state[i]->setData(i + 1);
         connect(actions_load_state[i], &QAction::triggered, this, &GMainWindow::OnLoadState);
@@ -1523,47 +1520,6 @@ void GMainWindow::UpdateSaveStates() {
     if (system.GetAppLoader().ReadProgramId(title_id) != Loader::ResultStatus::Success) {
         return;
     }
-    auto savestates = Core::ListSaveStates(title_id, movie.GetCurrentMovieID());
-    for (u32 i = 0; i < Core::SaveStateSlotCount; ++i) {
-        actions_load_state[i]->setEnabled(false);
-        actions_load_state[i]->setText(tr("Slot %1").arg(i + 1));
-        actions_save_state[i]->setText(tr("Slot %1").arg(i + 1));
-    }
-    for (const auto& savestate : savestates) {
-        const bool display_name =
-            savestate.status == Core::SaveStateInfo::ValidationStatus::RevisionDismatch &&
-            !savestate.build_name.empty();
-        const auto text =
-            tr("Slot %1 - %2 %3")
-                .arg(savestate.slot)
-                .arg(QDateTime::fromSecsSinceEpoch(savestate.time)
-                         .toString(QStringLiteral("yyyy-MM-dd hh:mm:ss")))
-                .arg(display_name ? QString::fromStdString(savestate.build_name) : QLatin1String())
-                .trimmed();
-
-        actions_load_state[savestate.slot - 1]->setEnabled(true);
-        actions_load_state[savestate.slot - 1]->setText(text);
-        actions_save_state[savestate.slot - 1]->setText(text);
-
-        ui->action_Load_from_Newest_Slot->setEnabled(true);
-
-        if (savestate.time > newest_slot_time) {
-            newest_slot = savestate.slot;
-            newest_slot_time = savestate.time;
-        }
-        if (savestate.time < oldest_slot_time) {
-            oldest_slot = savestate.slot;
-            oldest_slot_time = savestate.time;
-        }
-    }
-    for (u32 i = 0; i < Core::SaveStateSlotCount; ++i) {
-        if (!actions_load_state[i]->isEnabled()) {
-            // Prefer empty slot
-            oldest_slot = i + 1;
-            oldest_slot_time = 0;
-            break;
-        }
-    }
 }
 
 void GMainWindow::OnGameListLoadFile(QString game_path) {
diff --git a/src/citra_qt/main.h b/src/citra_qt/main.h
index b64bf1b32..2e72c39ca 100644
--- a/src/citra_qt/main.h
+++ b/src/citra_qt/main.h
@@ -15,7 +15,6 @@
 #include "citra_qt/compatibility_list.h"
 #include "citra_qt/hotkeys.h"
 #include "core/core.h"
-#include "core/savestate.h"
 
 #ifdef __unix__
 #include <QDBusObjectPath>
@@ -367,8 +366,9 @@ private:
     bool defer_update_prompt = false;
 
     QAction* actions_recent_files[max_recent_files_item];
-    std::array<QAction*, Core::SaveStateSlotCount> actions_load_state;
-    std::array<QAction*, Core::SaveStateSlotCount> actions_save_state;
+    static constexpr size_t SaveStateSlotCount = 8;
+    std::array<QAction*, SaveStateSlotCount> actions_load_state;
+    std::array<QAction*, SaveStateSlotCount> actions_save_state;
 
     u32 oldest_slot;
     u64 oldest_slot_time;
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index f8c953a60..16c4e6334 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -62,7 +62,6 @@ add_library(citra_common STATIC
     android_storage.cpp
     announce_multiplayer_room.h
     arch.h
-    archives.h
     assert.h
     atomic_ops.h
     detached_tasks.cpp
@@ -77,7 +76,6 @@ add_library(citra_common STATIC
     common_paths.h
     common_precompiled_headers.h
     common_types.h
-    construct.h
     dynamic_library/dynamic_library.cpp
     dynamic_library/dynamic_library.h
     dynamic_library/ffmpeg.cpp
@@ -119,12 +117,6 @@ add_library(citra_common STATIC
     settings.cpp
     settings.h
     slot_vector.h
-    serialization/atomic.h
-    serialization/boost_discrete_interval.hpp
-    serialization/boost_flat_set.h
-    serialization/boost_small_vector.hpp
-    serialization/boost_std_variant.hpp
-    serialization/boost_vector.hpp
     static_lru_cache.h
     string_literal.h
     string_util.cpp
@@ -184,7 +176,7 @@ endif()
 
 create_target_directory_groups(citra_common)
 
-target_link_libraries(citra_common PUBLIC fmt library-headers microprofile Boost::boost Boost::serialization Boost::iostreams)
+target_link_libraries(citra_common PUBLIC fmt library-headers microprofile Boost::iostreams)
 target_link_libraries(citra_common PRIVATE zstd)
 
 if ("x86_64" IN_LIST ARCHITECTURE)
diff --git a/src/common/archives.h b/src/common/archives.h
deleted file mode 100644
index b9f4330bd..000000000
--- a/src/common/archives.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2020 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include <boost/archive/binary_iarchive.hpp>
-#include <boost/archive/binary_oarchive.hpp>
-#include <boost/serialization/export.hpp>
-
-using iarchive = boost::archive::binary_iarchive;
-using oarchive = boost::archive::binary_oarchive;
-
-#define SERIALIZE_IMPL(A)                                                                          \
-    template void A::serialize<iarchive>(iarchive & ar, const unsigned int file_version);          \
-    template void A::serialize<oarchive>(oarchive & ar, const unsigned int file_version);
-
-#define SERIALIZE_EXPORT_IMPL(A)                                                                   \
-    BOOST_CLASS_EXPORT_IMPLEMENT(A)                                                                \
-    BOOST_SERIALIZATION_REGISTER_ARCHIVE(iarchive)                                                 \
-    BOOST_SERIALIZATION_REGISTER_ARCHIVE(oarchive)
diff --git a/src/common/construct.h b/src/common/construct.h
deleted file mode 100644
index cb47bb46e..000000000
--- a/src/common/construct.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2020 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include <boost/serialization/serialization.hpp>
-
-/// Allows classes to define `save_construct` and `load_construct` methods for serialization
-/// This is used where we don't call the default constructor during deserialization, as a shortcut
-/// instead of using load_construct_data directly
-class construct_access {
-public:
-    template <class Archive, class T>
-    static void save_construct(Archive& ar, const T* t, const unsigned int file_version) {
-        t->save_construct(ar, file_version);
-    }
-    template <class Archive, class T>
-    static void load_construct(Archive& ar, T* t, const unsigned int file_version) {
-        T::load_construct(ar, t, file_version);
-    }
-};
-
-#define BOOST_SERIALIZATION_CONSTRUCT(T)                                                           \
-    namespace boost::serialization {                                                               \
-    template <class Archive>                                                                       \
-    void save_construct_data(Archive& ar, const T* t, const unsigned int file_version) {           \
-        construct_access::save_construct(ar, t, file_version);                                     \
-    }                                                                                              \
-    template <class Archive>                                                                       \
-    void load_construct_data(Archive& ar, T* t, const unsigned int file_version) {                 \
-        construct_access::load_construct(ar, t, file_version);                                     \
-    }                                                                                              \
-    }
diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp
index cda752e5f..0e39e0152 100644
--- a/src/common/file_util.cpp
+++ b/src/common/file_util.cpp
@@ -849,13 +849,6 @@ bool StringReplace(std::string& haystack, const std::string& a, const std::strin
     return true;
 }
 
-std::string SerializePath(const std::string& input, bool is_saving) {
-    auto result = input;
-    StringReplace(result, "%CITRA_ROM_FILE%", g_currentRomPath, is_saving);
-    StringReplace(result, "%CITRA_USER_DIR%", GetUserPath(UserPath::UserDir), is_saving);
-    return result;
-}
-
 const std::string& GetUserPath(UserPath path) {
     // Set up all paths and files on the first run
     if (g_paths.empty())
diff --git a/src/common/file_util.h b/src/common/file_util.h
index 6595fead9..ca13369f7 100644
--- a/src/common/file_util.h
+++ b/src/common/file_util.h
@@ -14,9 +14,6 @@
 #include <string_view>
 #include <type_traits>
 #include <vector>
-#include <boost/serialization/split_member.hpp>
-#include <boost/serialization/string.hpp>
-#include <boost/serialization/wrapper.hpp>
 #include "common/common_types.h"
 #ifdef _MSC_VER
 #include "common/string_util.h"
@@ -42,34 +39,6 @@ enum class UserPath {
     UserDir,
 };
 
-// Replaces install-specific paths with standard placeholders, and back again
-std::string SerializePath(const std::string& input, bool is_saving);
-
-// A serializable path string
-struct Path : public boost::serialization::wrapper_traits<const Path> {
-    std::string& str;
-
-    explicit Path(std::string& _str) : str(_str) {}
-
-    static const Path make(std::string& str) {
-        return Path(str);
-    }
-
-    template <class Archive>
-    void save(Archive& ar, const unsigned int) const {
-        auto s_path = SerializePath(str, true);
-        ar << s_path;
-    }
-    template <class Archive>
-    void load(Archive& ar, const unsigned int) const {
-        ar >> str;
-        str = SerializePath(str, false);
-    }
-
-    BOOST_SERIALIZATION_SPLIT_MEMBER();
-    friend class boost::serialization::access;
-};
-
 // FileSystem tree node/
 struct FSTEntry {
     bool isDirectory;
@@ -77,17 +46,6 @@ struct FSTEntry {
     std::string physicalName; // name on disk
     std::string virtualName;  // name in FST names table
     std::vector<FSTEntry> children;
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& isDirectory;
-        ar& size;
-        ar& Path::make(physicalName);
-        ar& Path::make(virtualName);
-        ar& children;
-    }
-    friend class boost::serialization::access;
 };
 
 // Returns true if file filename exists
@@ -391,23 +349,6 @@ private:
     std::string filename;
     std::string openmode;
     u32 flags;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& Path::make(filename);
-        ar& openmode;
-        ar& flags;
-        u64 pos;
-        if (Archive::is_saving::value) {
-            pos = Tell();
-        }
-        ar& pos;
-        if (Archive::is_loading::value) {
-            Open();
-            Seek(pos, SEEK_SET);
-        }
-    }
-    friend class boost::serialization::access;
 };
 
 template <std::ios_base::openmode o, typename T>
diff --git a/src/common/memory_ref.cpp b/src/common/memory_ref.cpp
index 300f87d58..7f88e2b8d 100644
--- a/src/common/memory_ref.cpp
+++ b/src/common/memory_ref.cpp
@@ -2,7 +2,4 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "common/memory_ref.h"
-
-SERIALIZE_EXPORT_IMPL(BufferMem)
diff --git a/src/common/memory_ref.h b/src/common/memory_ref.h
index 389528f15..29eb7c96a 100644
--- a/src/common/memory_ref.h
+++ b/src/common/memory_ref.h
@@ -7,9 +7,6 @@
 #include <memory>
 #include <span>
 #include <vector>
-#include <boost/serialization/export.hpp>
-#include <boost/serialization/shared_ptr.hpp>
-#include <boost/serialization/vector.hpp>
 #include "common/assert.h"
 #include "common/common_types.h"
 
@@ -20,11 +17,6 @@ public:
     virtual u8* GetPtr() = 0;
     virtual const u8* GetPtr() const = 0;
     virtual std::size_t GetSize() const = 0;
-
-private:
-    template <class Archive>
-    void serialize(Archive&, const unsigned int) {}
-    friend class boost::serialization::access;
 };
 
 /// Backing memory implemented by a local buffer
@@ -55,17 +47,8 @@ public:
 
 private:
     std::vector<u8> data;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& boost::serialization::base_object<BackingMem>(*this);
-        ar& data;
-    }
-    friend class boost::serialization::access;
 };
 
-BOOST_CLASS_EXPORT_KEY(BufferMem);
-
 /**
  * A managed reference to host-side memory.
  * Fast enough to be used everywhere instead of u8*
@@ -148,12 +131,4 @@ private:
             csize = 0;
         }
     }
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& backing_mem;
-        ar& offset;
-        Init();
-    }
-    friend class boost::serialization::access;
 };
diff --git a/src/common/serialization/atomic.h b/src/common/serialization/atomic.h
deleted file mode 100644
index 0cf0f20bc..000000000
--- a/src/common/serialization/atomic.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2020 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include <atomic>
-#include <boost/serialization/split_free.hpp>
-
-namespace boost::serialization {
-
-template <class Archive, class T>
-void serialize(Archive& ar, std::atomic<T>& value, const unsigned int file_version) {
-    boost::serialization::split_free(ar, value, file_version);
-}
-
-template <class Archive, class T>
-void save(Archive& ar, const std::atomic<T>& value, const unsigned int file_version) {
-    ar << value.load();
-}
-
-template <class Archive, class T>
-void load(Archive& ar, std::atomic<T>& value, const unsigned int file_version) {
-    T tmp;
-    ar >> tmp;
-    value.store(tmp);
-}
-
-} // namespace boost::serialization
diff --git a/src/common/serialization/boost_discrete_interval.hpp b/src/common/serialization/boost_discrete_interval.hpp
deleted file mode 100644
index f04e3cabc..000000000
--- a/src/common/serialization/boost_discrete_interval.hpp
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2020 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include <boost/icl/discrete_interval.hpp>
-#include "common/common_types.h"
-#include "common/logging/log.h"
-
-namespace boost::serialization {
-
-template <class Archive, class DomainT, ICL_COMPARE Compare>
-void save(Archive& ar, const boost::icl::discrete_interval<DomainT, Compare>& obj,
-          const unsigned int file_version) {
-    ar << obj.lower();
-    ar << obj.upper();
-    ar << obj.bounds()._bits;
-}
-
-template <class Archive, class DomainT, ICL_COMPARE Compare>
-void load(Archive& ar, boost::icl::discrete_interval<DomainT, Compare>& obj,
-          const unsigned int file_version) {
-    DomainT upper, lower;
-    boost::icl::bound_type bounds;
-    ar >> lower;
-    ar >> upper;
-    ar >> bounds;
-    obj = boost::icl::discrete_interval(lower, upper, boost::icl::interval_bounds(bounds));
-}
-
-template <class Archive, class DomainT, ICL_COMPARE Compare>
-void serialize(Archive& ar, boost::icl::discrete_interval<DomainT, Compare>& obj,
-               const unsigned int file_version) {
-    boost::serialization::split_free(ar, obj, file_version);
-}
-
-} // namespace boost::serialization
diff --git a/src/common/serialization/boost_flat_set.h b/src/common/serialization/boost_flat_set.h
deleted file mode 100644
index 703bd28b3..000000000
--- a/src/common/serialization/boost_flat_set.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2020 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include <boost/container/flat_set.hpp>
-#include <boost/serialization/split_free.hpp>
-#include "common/common_types.h"
-
-namespace boost::serialization {
-
-template <class Archive, class T>
-void save(Archive& ar, const boost::container::flat_set<T>& set, const unsigned int file_version) {
-    ar << static_cast<u64>(set.size());
-    for (auto& v : set) {
-        ar << v;
-    }
-}
-
-template <class Archive, class T>
-void load(Archive& ar, boost::container::flat_set<T>& set, const unsigned int file_version) {
-    u64 count{};
-    ar >> count;
-    set.clear();
-    for (u64 i = 0; i < count; i++) {
-        T value{};
-        ar >> value;
-        set.insert(value);
-    }
-}
-
-template <class Archive, class T>
-void serialize(Archive& ar, boost::container::flat_set<T>& set, const unsigned int file_version) {
-    boost::serialization::split_free(ar, set, file_version);
-}
-
-} // namespace boost::serialization
diff --git a/src/common/serialization/boost_interval_set.hpp b/src/common/serialization/boost_interval_set.hpp
deleted file mode 100644
index 73a560360..000000000
--- a/src/common/serialization/boost_interval_set.hpp
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2020 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include <boost/icl/interval_set.hpp>
-#include <boost/serialization/split_free.hpp>
-#include "common/serialization/boost_discrete_interval.hpp"
-
-namespace boost::serialization {
-
-template <class Archive, class T>
-void save(Archive& ar, const boost::icl::interval_set<T>& set, const unsigned int file_version) {
-    ar << static_cast<u64>(set.iterative_size());
-    for (auto& v : set) {
-        ar << v;
-    }
-}
-
-template <class Archive, class T>
-void load(Archive& ar, boost::icl::interval_set<T>& set, const unsigned int file_version) {
-    u64 count{};
-    ar >> count;
-    set.clear();
-    for (u64 i = 0; i < count; i++) {
-        typename boost::icl::interval_set<T>::interval_type value{};
-        ar >> value;
-        set += value;
-    }
-}
-
-template <class Archive, class T>
-void serialize(Archive& ar, boost::icl::interval_set<T>& set, const unsigned int file_version) {
-    boost::serialization::split_free(ar, set, file_version);
-}
-
-} // namespace boost::serialization
diff --git a/src/common/serialization/boost_small_vector.hpp b/src/common/serialization/boost_small_vector.hpp
deleted file mode 100644
index b4e07a896..000000000
--- a/src/common/serialization/boost_small_vector.hpp
+++ /dev/null
@@ -1,144 +0,0 @@
-#ifndef BOOST_SERIALIZATION_BOOST_SMALL_VECTOR_HPP
-#define BOOST_SERIALIZATION_BOOST_SMALL_VECTOR_HPP
-
-// MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
-#pragma once
-#endif
-
-/////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
-// boost_vector.hpp: serialization for boost vector templates
-
-// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
-// fast array serialization (C) Copyright 2005 Matthias Troyer
-// Use, modification and distribution is subject to the Boost Software
-// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org for updates, documentation, and revision history.
-
-#include <boost/container/small_vector.hpp>
-
-#include <boost/config.hpp>
-#include <boost/detail/workaround.hpp>
-
-#include <boost/archive/detail/basic_iarchive.hpp>
-#include <boost/serialization/access.hpp>
-#include <boost/serialization/collection_size_type.hpp>
-#include <boost/serialization/item_version_type.hpp>
-#include <boost/serialization/nvp.hpp>
-
-#include <boost/mpl/bool_fwd.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/serialization/array_wrapper.hpp>
-#include <boost/serialization/collections_load_imp.hpp>
-#include <boost/serialization/collections_save_imp.hpp>
-#include <boost/serialization/split_free.hpp>
-
-// default is being compatible with version 1.34.1 files, not 1.35 files
-#ifndef BOOST_SERIALIZATION_VECTOR_VERSIONED
-#define BOOST_SERIALIZATION_VECTOR_VERSIONED(V) (V == 4 || V == 5)
-#endif
-
-namespace boost {
-namespace serialization {
-
-/////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
-// vector< T >
-
-// the default versions
-
-template <class Archive, class U, std::size_t N>
-inline void save(Archive& ar, const boost::container::small_vector<U, N>& t,
-                 const unsigned int /* file_version */, mpl::false_) {
-    boost::serialization::stl::save_collection<Archive, boost::container::small_vector<U, N>>(ar,
-                                                                                              t);
-}
-
-template <class Archive, class U, std::size_t N>
-inline void load(Archive& ar, boost::container::small_vector<U, N>& t,
-                 const unsigned int /* file_version */, mpl::false_) {
-    const boost::archive::library_version_type library_version(ar.get_library_version());
-    // retrieve number of elements
-    item_version_type item_version(0);
-    collection_size_type count;
-    ar >> BOOST_SERIALIZATION_NVP(count);
-    if (boost::archive::library_version_type(3) < library_version) {
-        ar >> BOOST_SERIALIZATION_NVP(item_version);
-    }
-    t.reserve(count);
-    stl::collection_load_impl(ar, t, count, item_version);
-}
-
-// the optimized versions
-
-template <class Archive, class U, std::size_t N>
-inline void save(Archive& ar, const boost::container::small_vector<U, N>& t,
-                 const unsigned int /* file_version */, mpl::true_) {
-    const collection_size_type count(t.size());
-    ar << BOOST_SERIALIZATION_NVP(count);
-    if (!t.empty())
-        // explict template arguments to pass intel C++ compiler
-        ar << serialization::make_array<const U, collection_size_type>(static_cast<const U*>(&t[0]),
-                                                                       count);
-}
-
-template <class Archive, class U, std::size_t N>
-inline void load(Archive& ar, boost::container::small_vector<U, N>& t,
-                 const unsigned int /* file_version */, mpl::true_) {
-    collection_size_type count(t.size());
-    ar >> BOOST_SERIALIZATION_NVP(count);
-    t.resize(count);
-    unsigned int item_version = 0;
-    if (BOOST_SERIALIZATION_VECTOR_VERSIONED(ar.get_library_version())) {
-        ar >> BOOST_SERIALIZATION_NVP(item_version);
-    }
-    if (!t.empty())
-        // explict template arguments to pass intel C++ compiler
-        ar >> serialization::make_array<U, collection_size_type>(static_cast<U*>(&t[0]), count);
-}
-
-// dispatch to either default or optimized versions
-
-template <class Archive, class U, std::size_t N>
-inline void save(Archive& ar, const boost::container::small_vector<U, N>& t,
-                 const unsigned int file_version) {
-    typedef typename boost::serialization::use_array_optimization<Archive>::template apply<
-        typename remove_const<U>::type>::type use_optimized;
-    save(ar, t, file_version, use_optimized());
-}
-
-template <class Archive, class U, std::size_t N>
-inline void load(Archive& ar, boost::container::small_vector<U, N>& t,
-                 const unsigned int file_version) {
-#ifdef BOOST_SERIALIZATION_VECTOR_135_HPP
-    if (ar.get_library_version() == boost::archive::library_version_type(5)) {
-        load(ar, t, file_version, boost::is_arithmetic<U>());
-        return;
-    }
-#endif
-    typedef typename boost::serialization::use_array_optimization<Archive>::template apply<
-        typename remove_const<U>::type>::type use_optimized;
-    load(ar, t, file_version, use_optimized());
-}
-
-// split non-intrusive serialization function member into separate
-// non intrusive save/load member functions
-template <class Archive, class U, std::size_t N>
-inline void serialize(Archive& ar, boost::container::small_vector<U, N>& t,
-                      const unsigned int file_version) {
-    boost::serialization::split_free(ar, t, file_version);
-}
-
-// split non-intrusive serialization function member into separate
-// non intrusive save/load member functions
-template <class Archive, std::size_t N>
-inline void serialize(Archive& ar, boost::container::small_vector<bool, N>& t,
-                      const unsigned int file_version) {
-    boost::serialization::split_free(ar, t, file_version);
-}
-
-} // namespace serialization
-} // namespace boost
-
-#endif // BOOST_SERIALIZATION_BOOST_SMALL_VECTOR_HPP
diff --git a/src/common/serialization/boost_std_variant.hpp b/src/common/serialization/boost_std_variant.hpp
deleted file mode 100644
index b00f827b1..000000000
--- a/src/common/serialization/boost_std_variant.hpp
+++ /dev/null
@@ -1,204 +0,0 @@
-#ifndef BOOST_SERIALIZATION_STD_VARIANT_HPP
-#define BOOST_SERIALIZATION_STD_VARIANT_HPP
-
-// MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
-# pragma once
-#endif
-
-/////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
-// variant.hpp - non-intrusive serialization of variant types
-//
-// copyright (c) 2019 Samuel Debionne, ESRF
-//
-// Use, modification and distribution is subject to the Boost Software
-// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org for updates, documentation, and revision history.
-//
-// Widely inspired form boost::variant serialization
-//
-
-#include <boost/serialization/throw_exception.hpp>
-
-#include <variant>
-
-#include <boost/archive/archive_exception.hpp>
-
-#include <boost/serialization/split_free.hpp>
-#include <boost/serialization/serialization.hpp>
-#include <boost/serialization/nvp.hpp>
-
-namespace boost {
-namespace serialization {
-
-template<class Archive>
-struct std_variant_save_visitor
-{
-    std_variant_save_visitor(Archive& ar) :
-        m_ar(ar)
-    {}
-    template<class T>
-    void operator()(T const & value) const
-    {
-        m_ar << BOOST_SERIALIZATION_NVP(value);
-    }
-private:
-    Archive & m_ar;
-};
-
-
-template<class Archive>
-struct std_variant_load_visitor
-{
-    std_variant_load_visitor(Archive& ar) :
-        m_ar(ar)
-    {}
-    template<class T>
-    void operator()(T & value) const
-    {
-        m_ar >> BOOST_SERIALIZATION_NVP(value);
-    }
-private:
-    Archive & m_ar;
-};
-
-template<class Archive, class ...Types>
-void save(
-    Archive & ar,
-    std::variant<Types...> const & v,
-    unsigned int /*version*/
-){
-    const std::size_t which = v.index();
-    ar << BOOST_SERIALIZATION_NVP(which);
-    std_variant_save_visitor<Archive> visitor(ar);
-    std::visit(visitor, v);
-}
-
-// Minimalist metaprogramming for handling parameter pack
-namespace mp {
-    namespace detail {
-    template <typename Seq>
-    struct front_impl;
-
-    template <template <typename...> class Seq, typename T, typename... Ts>
-    struct front_impl<Seq<T, Ts...>> {
-        using type = T;
-    };
-
-    template <typename Seq>
-    struct pop_front_impl;
-
-    template <template <typename...> class Seq, typename T, typename... Ts>
-    struct pop_front_impl<Seq<T, Ts...>> {
-        using type = Seq<Ts...>;
-    };
-    } //namespace detail
-
-    template <typename... Ts>
-    struct typelist {};
-
-    template <typename Seq>
-    using front = typename detail::front_impl<Seq>::type;
-
-    template <typename Seq>
-    using pop_front = typename detail::pop_front_impl<Seq>::type;
-}  // namespace mp
-
-template<std::size_t N, class Seq>
-struct variant_impl
-{
-    template<class Archive, class V>
-    static void load (
-        Archive & ar,
-        std::size_t which,
-        V & v,
-        const unsigned int version
-    ){
-        if(which == 0){
-            // note: A non-intrusive implementation (such as this one)
-            // necessary has to copy the value.  This wouldn't be necessary
-            // with an implementation that de-serialized to the address of the
-            // aligned storage included in the variant.
-            using type = mp::front<Seq>;
-            type value;
-            ar >> BOOST_SERIALIZATION_NVP(value);
-            v = std::move(value);
-            type * new_address = & std::get<type>(v);
-            ar.reset_object_address(new_address, & value);
-            return;
-        }
-        //typedef typename mpl::pop_front<S>::type type;
-        using types = mp::pop_front<Seq>;
-        variant_impl<N - 1, types>::load(ar, which - 1, v, version);
-    }
-};
-
-template<class Seq>
-struct variant_impl<0, Seq>
-{
-    template<class Archive, class V>
-    static void load (
-        Archive & /*ar*/,
-        std::size_t /*which*/,
-        V & /*v*/,
-        const unsigned int /*version*/
-    ){}
-};
-
-template<class Archive, class... Types>
-void load(
-    Archive & ar,
-    std::variant<Types...>& v,
-    const unsigned int version
-){
-    std::size_t which;
-    ar >> BOOST_SERIALIZATION_NVP(which);
-    if(which >=  sizeof...(Types))
-        // this might happen if a type was removed from the list of variant types
-        boost::serialization::throw_exception(
-            boost::archive::archive_exception(
-                boost::archive::archive_exception::unsupported_version
-            )
-        );
-    variant_impl<sizeof...(Types), mp::typelist<Types...>>::load(ar, which, v, version);
-}
-
-template<class Archive,class... Types>
-inline void serialize(
-    Archive & ar,
-    std::variant<Types...> & v,
-    const unsigned int file_version
-){
-    split_free(ar,v,file_version);
-}
-
-// Specialization for std::monostate
-template<class Archive>
-void serialize(Archive &ar, std::monostate &, const unsigned int /*version*/)
-{}
-
-} // namespace serialization
-} // namespace boost
-
-//template<typename T0_, BOOST_VARIANT_ENUM_SHIFTED_PARAMS(typename T)>
-
-#include <boost/serialization/tracking.hpp>
-
-namespace boost {
-    namespace serialization {
-
-template<class... Types>
-struct tracking_level<
-    std::variant<Types...>
->{
-    typedef mpl::integral_c_tag tag;
-    typedef mpl::int_< ::boost::serialization::track_always> type;
-    BOOST_STATIC_CONSTANT(int, value = type::value);
-};
-
-} // namespace serialization
-} // namespace boost
-
-#endif //BOOST_SERIALIZATION_VARIANT_HPP
diff --git a/src/common/serialization/boost_vector.hpp b/src/common/serialization/boost_vector.hpp
deleted file mode 100644
index 55a5b9eae..000000000
--- a/src/common/serialization/boost_vector.hpp
+++ /dev/null
@@ -1,149 +0,0 @@
-#ifndef BOOST_SERIALIZATION_BOOST_VECTOR_HPP
-#define BOOST_SERIALIZATION_BOOST_VECTOR_HPP
-
-// MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
-#pragma once
-#endif
-
-/////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
-// boost_vector.hpp: serialization for boost vector templates
-
-// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
-// fast array serialization (C) Copyright 2005 Matthias Troyer
-// Use, modification and distribution is subject to the Boost Software
-// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org for updates, documentation, and revision history.
-
-#include <boost/container/vector.hpp>
-
-#include <boost/config.hpp>
-#include <boost/detail/workaround.hpp>
-
-#include <boost/archive/detail/basic_iarchive.hpp>
-#include <boost/serialization/access.hpp>
-#include <boost/serialization/collection_size_type.hpp>
-#include <boost/serialization/item_version_type.hpp>
-#include <boost/serialization/nvp.hpp>
-
-#include <boost/mpl/bool_fwd.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/serialization/array_wrapper.hpp>
-#include <boost/serialization/collections_load_imp.hpp>
-#include <boost/serialization/collections_save_imp.hpp>
-#include <boost/serialization/split_free.hpp>
-
-// default is being compatible with version 1.34.1 files, not 1.35 files
-#ifndef BOOST_SERIALIZATION_VECTOR_VERSIONED
-#define BOOST_SERIALIZATION_VECTOR_VERSIONED(V) (V == 4 || V == 5)
-#endif
-
-namespace boost {
-namespace serialization {
-
-/////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
-// vector< T >
-
-// the default versions
-
-template <class Archive, class U, class Allocator, class Options>
-inline void save(Archive& ar, const boost::container::vector<U, Allocator, Options>& t,
-                 const unsigned int /* file_version */, mpl::false_) {
-    boost::serialization::stl::save_collection<Archive,
-                                               boost::container::vector<U, Allocator, Options>>(ar,
-                                                                                                t);
-}
-
-template <class Archive, class U, class Allocator, class Options>
-inline void load(Archive& ar, boost::container::vector<U, Allocator, Options>& t,
-                 const unsigned int /* file_version */, mpl::false_) {
-    const boost::archive::library_version_type library_version(ar.get_library_version());
-    // retrieve number of elements
-    item_version_type item_version(0);
-    collection_size_type count;
-    ar >> BOOST_SERIALIZATION_NVP(count);
-    if (boost::archive::library_version_type(3) < library_version) {
-        ar >> BOOST_SERIALIZATION_NVP(item_version);
-    }
-    t.reserve(count);
-    stl::collection_load_impl(ar, t, count, item_version);
-}
-
-// the optimized versions
-
-template <class Archive, class U, class Allocator, class Options>
-inline void save(Archive& ar, const boost::container::vector<U, Allocator, Options>& t,
-                 const unsigned int /* file_version */, mpl::true_) {
-    const collection_size_type count(t.size());
-    ar << BOOST_SERIALIZATION_NVP(count);
-    if (!t.empty())
-        // explict template arguments to pass intel C++ compiler
-        ar << serialization::make_array<const U, collection_size_type>(static_cast<const U*>(&t[0]),
-                                                                       count);
-}
-
-template <class Archive, class U, class Allocator, class Options>
-inline void load(Archive& ar, boost::container::vector<U, Allocator, Options>& t,
-                 const unsigned int /* file_version */, mpl::true_) {
-    collection_size_type count(t.size());
-    ar >> BOOST_SERIALIZATION_NVP(count);
-    t.resize(count);
-    unsigned int item_version = 0;
-    if (BOOST_SERIALIZATION_VECTOR_VERSIONED(ar.get_library_version())) {
-        ar >> BOOST_SERIALIZATION_NVP(item_version);
-    }
-    if (!t.empty())
-        // explict template arguments to pass intel C++ compiler
-        ar >> serialization::make_array<U, collection_size_type>(static_cast<U*>(&t[0]), count);
-}
-
-// dispatch to either default or optimized versions
-
-template <class Archive, class U, class Allocator, class Options>
-inline void save(Archive& ar, const boost::container::vector<U, Allocator, Options>& t,
-                 const unsigned int file_version) {
-    typedef typename boost::serialization::use_array_optimization<Archive>::template apply<
-        typename remove_const<U>::type>::type use_optimized;
-    save(ar, t, file_version, use_optimized());
-}
-
-template <class Archive, class U, class Allocator, class Options>
-inline void load(Archive& ar, boost::container::vector<U, Allocator, Options>& t,
-                 const unsigned int file_version) {
-#ifdef BOOST_SERIALIZATION_VECTOR_135_HPP
-    if (ar.get_library_version() == boost::archive::library_version_type(5)) {
-        load(ar, t, file_version, boost::is_arithmetic<U>());
-        return;
-    }
-#endif
-    typedef typename boost::serialization::use_array_optimization<Archive>::template apply<
-        typename remove_const<U>::type>::type use_optimized;
-    load(ar, t, file_version, use_optimized());
-}
-
-// split non-intrusive serialization function member into separate
-// non intrusive save/load member functions
-template <class Archive, class U, class Allocator, class Options>
-inline void serialize(Archive& ar, boost::container::vector<U, Allocator, Options>& t,
-                      const unsigned int file_version) {
-    boost::serialization::split_free(ar, t, file_version);
-}
-
-// split non-intrusive serialization function member into separate
-// non intrusive save/load member functions
-template <class Archive, class Allocator, class Options>
-inline void serialize(Archive& ar, boost::container::vector<bool, Allocator, Options>& t,
-                      const unsigned int file_version) {
-    boost::serialization::split_free(ar, t, file_version);
-}
-
-} // namespace serialization
-} // namespace boost
-
-#include <boost/serialization/collection_traits.hpp>
-
-BOOST_SERIALIZATION_COLLECTION_TRAITS(boost::container::vector)
-
-#endif // BOOST_SERIALIZATION_BOOST_VECTOR_HPP
diff --git a/src/common/thread_queue_list.h b/src/common/thread_queue_list.h
index 5995d76f2..dbf1c4a8a 100644
--- a/src/common/thread_queue_list.h
+++ b/src/common/thread_queue_list.h
@@ -7,8 +7,6 @@
 #include <algorithm>
 #include <array>
 #include <deque>
-#include <boost/serialization/deque.hpp>
-#include <boost/serialization/split_member.hpp>
 #include "common/common_types.h"
 
 namespace Common {
@@ -180,32 +178,6 @@ private:
             return &queues[idx];
         }
     }
-
-    friend class boost::serialization::access;
-    template <class Archive>
-    void save(Archive& ar, const unsigned int file_version) const {
-        const s64 idx = ToIndex(first);
-        ar << idx;
-        for (std::size_t i = 0; i < NUM_QUEUES; i++) {
-            const s64 idx1 = ToIndex(queues[i].next_nonempty);
-            ar << idx1;
-            ar << queues[i].data;
-        }
-    }
-
-    template <class Archive>
-    void load(Archive& ar, const unsigned int file_version) {
-        s64 idx;
-        ar >> idx;
-        first = ToPointer(idx);
-        for (std::size_t i = 0; i < NUM_QUEUES; i++) {
-            ar >> idx;
-            queues[i].next_nonempty = ToPointer(idx);
-            ar >> queues[i].data;
-        }
-    }
-
-    BOOST_SERIALIZATION_SPLIT_MEMBER()
 };
 
 } // namespace Common
diff --git a/src/common/vector_math.h b/src/common/vector_math.h
index 536f8e169..bed15334b 100644
--- a/src/common/vector_math.h
+++ b/src/common/vector_math.h
@@ -33,7 +33,6 @@
 #include <cmath>
 #include <cstring>
 #include <type_traits>
-#include <boost/serialization/access.hpp>
 
 namespace Common {
 
@@ -46,13 +45,6 @@ class Vec4;
 
 template <typename T>
 class Vec2 {
-    friend class boost::serialization::access;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int file_version) {
-        ar& x;
-        ar& y;
-    }
-
 public:
     T x;
     T y;
@@ -214,14 +206,6 @@ inline float Vec2<float>::Normalize() {
 
 template <typename T>
 class Vec3 {
-    friend class boost::serialization::access;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int file_version) {
-        ar& x;
-        ar& y;
-        ar& z;
-    }
-
 public:
     T x;
     T y;
@@ -442,15 +426,6 @@ using Vec3u = Vec3<unsigned int>;
 
 template <typename T>
 class Vec4 {
-    friend class boost::serialization::access;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int file_version) {
-        ar& x;
-        ar& y;
-        ar& z;
-        ar& w;
-    }
-
 public:
     T x;
     T y;
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index cf29c05a8..e8a2257de 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -462,9 +462,6 @@ add_library(citra_core STATIC
     perf_stats.cpp
     perf_stats.h
     precompiled_headers.h
-    savestate.cpp
-    savestate.h
-    savestate_data.h
     system_titles.cpp
     system_titles.h
     telemetry_session.cpp
@@ -477,7 +474,7 @@ add_library(citra_core STATIC
 create_target_directory_groups(citra_core)
 
 target_link_libraries(citra_core PUBLIC citra_common PRIVATE audio_core network video_core)
-target_link_libraries(citra_core PRIVATE Boost::boost Boost::serialization Boost::iostreams httplib)
+target_link_libraries(citra_core PRIVATE Boost::boost Boost::iostreams httplib)
 target_link_libraries(citra_core PUBLIC dds-ktx PRIVATE cryptopp fmt lodepng open_source_archives)
 
 if (ENABLE_WEB_SERVICE)
diff --git a/src/core/arm/arm_interface.h b/src/core/arm/arm_interface.h
index 48ad88218..eecbe9e58 100644
--- a/src/core/arm/arm_interface.h
+++ b/src/core/arm/arm_interface.h
@@ -6,9 +6,6 @@
 
 #include <cstddef>
 #include <memory>
-#include <boost/serialization/shared_ptr.hpp>
-#include <boost/serialization/split_member.hpp>
-#include <boost/serialization/version.hpp>
 #include "common/common_types.h"
 #include "core/arm/skyeye_common/arm_regformat.h"
 #include "core/arm/skyeye_common/vfp/asm_vfp.h"
@@ -55,18 +52,6 @@ public:
         std::array<u32, 64> fpu_registers{};
         u32 fpscr{};
         u32 fpexc{};
-
-    private:
-        friend class boost::serialization::access;
-
-        template <class Archive>
-        void serialize(Archive& ar, const unsigned int file_version) {
-            ar& cpu_registers;
-            ar& fpu_registers;
-            ar& cpsr;
-            ar& fpscr;
-            ar& fpexc;
-        }
     };
 
     /// Runs the CPU until an event happens
@@ -199,109 +184,8 @@ public:
     }
 
 protected:
-    // This us used for serialization. Returning nullptr is valid if page tables are not used.
-    virtual std::shared_ptr<Memory::PageTable> GetPageTable() const = 0;
-
     std::shared_ptr<Core::Timing::Timer> timer;
-
-private:
     u32 id;
-
-    friend class boost::serialization::access;
-
-    template <class Archive>
-    void save(Archive& ar, const unsigned int file_version) const {
-        ar << timer;
-        ar << id;
-        const auto page_table = GetPageTable();
-        ar << page_table;
-        for (int i = 0; i < 15; i++) {
-            const auto r = GetReg(i);
-            ar << r;
-        }
-        const auto pc = GetPC();
-        ar << pc;
-        const auto cpsr = GetCPSR();
-        ar << cpsr;
-        for (int i = 0; i < 64; i++) {
-            const auto r = GetVFPReg(i);
-            ar << r;
-        }
-        for (std::size_t i = 0; i < VFPSystemRegister::VFP_SYSTEM_REGISTER_COUNT; i++) {
-            const auto reg = static_cast<VFPSystemRegister>(i);
-            u32 r = 0;
-            switch (reg) {
-            case VFP_FPSCR:
-            case VFP_FPEXC:
-                r = GetVFPSystemReg(reg);
-            default:
-                break;
-            }
-            ar << r;
-        }
-        for (std::size_t i = 0; i < CP15Register::CP15_REGISTER_COUNT; i++) {
-            const auto reg = static_cast<CP15Register>(i);
-            u32 r = 0;
-            switch (reg) {
-            case CP15_THREAD_UPRW:
-            case CP15_THREAD_URO:
-                r = GetCP15Register(reg);
-            default:
-                break;
-            }
-            ar << r;
-        }
-    }
-
-    template <class Archive>
-    void load(Archive& ar, const unsigned int file_version) {
-        ClearInstructionCache();
-        ar >> timer;
-        ar >> id;
-        std::shared_ptr<Memory::PageTable> page_table{};
-        ar >> page_table;
-        SetPageTable(page_table);
-        u32 r;
-        for (int i = 0; i < 15; i++) {
-            ar >> r;
-            SetReg(i, r);
-        }
-        ar >> r;
-        SetPC(r);
-        ar >> r;
-        SetCPSR(r);
-        for (int i = 0; i < 64; i++) {
-            ar >> r;
-            SetVFPReg(i, r);
-        }
-        for (std::size_t i = 0; i < VFPSystemRegister::VFP_SYSTEM_REGISTER_COUNT; i++) {
-            ar >> r;
-            const auto reg = static_cast<VFPSystemRegister>(i);
-            switch (reg) {
-            case VFP_FPSCR:
-            case VFP_FPEXC:
-                SetVFPSystemReg(reg, r);
-            default:
-                break;
-            }
-        }
-        for (std::size_t i = 0; i < CP15Register::CP15_REGISTER_COUNT; i++) {
-            ar >> r;
-            const auto reg = static_cast<CP15Register>(i);
-            switch (reg) {
-            case CP15_THREAD_UPRW:
-            case CP15_THREAD_URO:
-                SetCP15Register(reg, r);
-            default:
-                break;
-            }
-        }
-    }
-
-    BOOST_SERIALIZATION_SPLIT_MEMBER()
 };
 
 } // namespace Core
-
-BOOST_CLASS_VERSION(Core::ARM_Interface, 1)
-BOOST_CLASS_VERSION(Core::ARM_Interface::ThreadContext, 1)
diff --git a/src/core/arm/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp
index dbf6ea71c..8dd81a4c9 100644
--- a/src/core/arm/dynarmic/arm_dynarmic.cpp
+++ b/src/core/arm/dynarmic/arm_dynarmic.cpp
@@ -267,10 +267,6 @@ void ARM_Dynarmic::ClearExclusiveState() {
     jit->ClearExclusiveState();
 }
 
-std::shared_ptr<Memory::PageTable> ARM_Dynarmic::GetPageTable() const {
-    return current_page_table;
-}
-
 void ARM_Dynarmic::SetPageTable(const std::shared_ptr<Memory::PageTable>& page_table) {
     current_page_table = page_table;
     ThreadContext ctx{};
diff --git a/src/core/arm/dynarmic/arm_dynarmic.h b/src/core/arm/dynarmic/arm_dynarmic.h
index ec0c13390..abbd5fb28 100644
--- a/src/core/arm/dynarmic/arm_dynarmic.h
+++ b/src/core/arm/dynarmic/arm_dynarmic.h
@@ -56,9 +56,6 @@ public:
     void ClearExclusiveState() override;
     void SetPageTable(const std::shared_ptr<Memory::PageTable>& page_table) override;
 
-protected:
-    std::shared_ptr<Memory::PageTable> GetPageTable() const override;
-
 private:
     void ServeBreak();
 
diff --git a/src/core/arm/dyncom/arm_dyncom.cpp b/src/core/arm/dyncom/arm_dyncom.cpp
index c9bb66e38..337a4c4ee 100644
--- a/src/core/arm/dyncom/arm_dyncom.cpp
+++ b/src/core/arm/dyncom/arm_dyncom.cpp
@@ -44,10 +44,6 @@ void ARM_DynCom::SetPageTable(const std::shared_ptr<Memory::PageTable>& page_tab
     ClearInstructionCache();
 }
 
-std::shared_ptr<Memory::PageTable> ARM_DynCom::GetPageTable() const {
-    return nullptr;
-}
-
 void ARM_DynCom::SetPC(u32 pc) {
     state->Reg[15] = pc;
 }
diff --git a/src/core/arm/dyncom/arm_dyncom.h b/src/core/arm/dyncom/arm_dyncom.h
index 5b367ebc7..5533a3aa6 100644
--- a/src/core/arm/dyncom/arm_dyncom.h
+++ b/src/core/arm/dyncom/arm_dyncom.h
@@ -51,9 +51,6 @@ public:
     void SetPageTable(const std::shared_ptr<Memory::PageTable>& page_table) override;
     void PrepareReschedule() override;
 
-protected:
-    std::shared_ptr<Memory::PageTable> GetPageTable() const override;
-
 private:
     void ExecuteInstructions(u64 num_instructions);
 
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 7d04abf03..c36db49cd 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -2,9 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <stdexcept>
 #include <utility>
-#include <boost/serialization/array.hpp>
 #include "audio_core/dsp_interface.h"
 #include "audio_core/hle/hle.h"
 #include "audio_core/lle/lle.h"
@@ -26,7 +24,7 @@
 #include "core/dumping/backend.h"
 #include "core/frontend/image_interface.h"
 #include "core/gdbstub/gdbstub.h"
-#include "core/global.h"
+
 #include "core/hle/kernel/kernel.h"
 #include "core/hle/kernel/process.h"
 #include "core/hle/kernel/thread.h"
@@ -57,21 +55,6 @@ namespace Core {
 
 /*static*/ System System::s_instance;
 
-template <>
-Core::System& Global() {
-    return System::GetInstance();
-}
-
-template <>
-Kernel::KernelSystem& Global() {
-    return System::GetInstance().Kernel();
-}
-
-template <>
-Core::Timing& Global() {
-    return System::GetInstance().CoreTiming();
-}
-
 System::System() : movie{*this}, cheat_engine{*this} {}
 
 System::~System() = default;
@@ -577,7 +560,7 @@ void System::RegisterImageInterface(std::shared_ptr<Frontend::ImageInterface> im
     registered_image_interface = std::move(image_interface);
 }
 
-void System::Shutdown(bool is_deserializing) {
+void System::Shutdown() {
     // Log last frame performance stats
     const auto perf_results = GetAndResetPerfStats();
     constexpr auto performance = Common::Telemetry::FieldType::Performance;
@@ -593,11 +576,9 @@ void System::Shutdown(bool is_deserializing) {
     is_powered_on = false;
 
     gpu.reset();
-    if (!is_deserializing) {
-        GDBStub::Shutdown();
-        perf_stats.reset();
-        app_loader.reset();
-    }
+    GDBStub::Shutdown();
+    perf_stats.reset();
+    app_loader.reset();
     custom_tex_manager.reset();
     telemetry_session.reset();
 #ifdef ENABLE_SCRIPTING
@@ -706,66 +687,4 @@ void System::ApplySettings() {
     }
 }
 
-template <class Archive>
-void System::serialize(Archive& ar, const unsigned int file_version) {
-
-    u32 num_cores;
-    if (Archive::is_saving::value) {
-        num_cores = this->GetNumCores();
-    }
-    ar& num_cores;
-
-    if (Archive::is_loading::value) {
-        // When loading, we want to make sure any lingering state gets cleared out before we begin.
-        // Shutdown, but persist a few things between loads...
-        Shutdown(true);
-
-        // Re-initialize everything like it was before
-        auto memory_mode = this->app_loader->LoadKernelMemoryMode();
-        auto n3ds_hw_caps = this->app_loader->LoadNew3dsHwCapabilities();
-        [[maybe_unused]] const System::ResultStatus result = Init(
-            *m_emu_window, m_secondary_window, *memory_mode.first, *n3ds_hw_caps.first, num_cores);
-    }
-
-    // Flush on save, don't flush on load
-    const bool should_flush = !Archive::is_loading::value;
-    gpu->ClearAll(should_flush);
-    ar&* timing.get();
-    for (u32 i = 0; i < num_cores; i++) {
-        ar&* cpu_cores[i].get();
-    }
-    ar&* service_manager.get();
-    ar&* archive_manager.get();
-
-    // NOTE: DSP doesn't like being destroyed and recreated. So instead we do an inline
-    // serialization; this means that the DSP Settings need to match for loading to work.
-    auto dsp_hle = dynamic_cast<AudioCore::DspHle*>(dsp_core.get());
-    if (dsp_hle) {
-        ar&* dsp_hle;
-    } else {
-        throw std::runtime_error("LLE audio not supported for save states");
-    }
-
-    ar&* memory.get();
-    ar&* kernel.get();
-    ar&* gpu.get();
-    ar& movie;
-
-    // This needs to be set from somewhere - might as well be here!
-    if (Archive::is_loading::value) {
-        timing->UnlockEventQueue();
-        memory->SetDSP(*dsp_core);
-        cheat_engine.Connect();
-        gpu->Sync();
-
-        // Re-register gpu callback, because gsp service changed after service_manager got
-        // serialized
-        auto gsp = service_manager->GetService<Service::GSP::GSP_GPU>("gsp::Gpu");
-        gpu->SetInterruptHandler(
-            [gsp](Service::GSP::InterruptId interrupt_id) { gsp->SignalInterrupt(interrupt_id); });
-    }
-}
-
-SERIALIZE_IMPL(System)
-
 } // namespace Core
diff --git a/src/core/core.h b/src/core/core.h
index 9f7430b72..184d3e182 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -8,8 +8,6 @@
 #include <memory>
 #include <mutex>
 #include <string>
-#include <boost/optional.hpp>
-#include <boost/serialization/version.hpp>
 #include "common/common_types.h"
 #include "core/arm/arm_interface.h"
 #include "core/cheats/cheats.h"
@@ -126,7 +124,7 @@ public:
     [[nodiscard]] ResultStatus SingleStep();
 
     /// Shutdown the emulated system.
-    void Shutdown(bool is_deserializing = false);
+    void Shutdown();
 
     /// Shutdown and then load again
     void Reset();
@@ -339,9 +337,9 @@ public:
                (mic_permission_granted = mic_permission_func());
     }
 
-    void SaveState(u32 slot) const;
+    void SaveState(u32 slot) const {}
 
-    void LoadState(u32 slot);
+    void LoadState(u32 slot) {}
 
     /// Self delete ncch
     bool SetSelfDelete(const std::string& file) {
@@ -447,12 +445,8 @@ private:
     std::function<bool()> mic_permission_func;
     bool mic_permission_granted = false;
 
-    boost::optional<Service::APT::DeliverArg> restore_deliver_arg;
-    boost::optional<Service::PLGLDR::PLG_LDR::PluginLoaderContext> restore_plugin_context;
-
-    friend class boost::serialization::access;
-    template <typename Archive>
-    void serialize(Archive& ar, const unsigned int file_version);
+    std::optional<Service::APT::DeliverArg> restore_deliver_arg;
+    std::optional<Service::PLGLDR::PLG_LDR::PluginLoaderContext> restore_plugin_context;
 };
 
 [[nodiscard]] inline ARM_Interface& GetRunningCore() {
@@ -468,5 +462,3 @@ private:
 }
 
 } // namespace Core
-
-BOOST_CLASS_VERSION(Core::System, 1)
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp
index 0d2506918..4cd8f5e21 100644
--- a/src/core/core_timing.cpp
+++ b/src/core/core_timing.cpp
@@ -63,10 +63,6 @@ TimingEventType* Timing::RegisterEvent(const std::string& name, TimedCallback ca
 
 void Timing::ScheduleEvent(s64 cycles_into_future, const TimingEventType* event_type,
                            std::uintptr_t user_data, std::size_t core_id, bool thread_safe_mode) {
-    if (event_queue_locked) {
-        return;
-    }
-
     ASSERT(event_type != nullptr);
     Timing::Timer* timer = nullptr;
     if (core_id == std::numeric_limits<std::size_t>::max()) {
@@ -103,9 +99,6 @@ void Timing::ScheduleEvent(s64 cycles_into_future, const TimingEventType* event_
 }
 
 void Timing::UnscheduleEvent(const TimingEventType* event_type, std::uintptr_t user_data) {
-    if (event_queue_locked) {
-        return;
-    }
     for (auto timer : timers) {
         auto itr = std::remove_if(
             timer->event_queue.begin(), timer->event_queue.end(),
@@ -121,9 +114,6 @@ void Timing::UnscheduleEvent(const TimingEventType* event_type, std::uintptr_t u
 }
 
 void Timing::RemoveEvent(const TimingEventType* event_type) {
-    if (event_queue_locked) {
-        return;
-    }
     for (auto timer : timers) {
         auto itr = std::remove_if(timer->event_queue.begin(), timer->event_queue.end(),
                                   [&](const Event& e) { return e.type == event_type; });
diff --git a/src/core/core_timing.h b/src/core/core_timing.h
index e8bded04f..392efc470 100644
--- a/src/core/core_timing.h
+++ b/src/core/core_timing.h
@@ -23,12 +23,9 @@
 #include <string>
 #include <unordered_map>
 #include <vector>
-#include <boost/serialization/split_member.hpp>
-#include <boost/serialization/vector.hpp>
 #include "common/common_types.h"
 #include "common/logging/log.h"
 #include "common/threadsafe_queue.h"
-#include "core/global.h"
 
 // The timing we get from the assembly is 268,111,855.956 Hz
 // It is possible that this number isn't just an integer because the compiler could have
@@ -150,29 +147,6 @@ public:
 
         bool operator>(const Event& right) const;
         bool operator<(const Event& right) const;
-
-    private:
-        template <class Archive>
-        void save(Archive& ar, const unsigned int) const {
-            ar& time;
-            ar& fifo_order;
-            ar& user_data;
-            std::string name = *(type->name);
-            ar << name;
-        }
-
-        template <class Archive>
-        void load(Archive& ar, const unsigned int) {
-            ar& time;
-            ar& fifo_order;
-            ar& user_data;
-            std::string name;
-            ar >> name;
-            type = Global<Timing>().RegisterEvent(name, nullptr);
-        }
-        friend class boost::serialization::access;
-
-        BOOST_SERIALIZATION_SPLIT_MEMBER()
     };
 
     // currently Service::HID::pad_update_ticks is the smallest interval for an event that gets
@@ -235,18 +209,6 @@ public:
         // Stores a scaling for the internal clockspeed. Changing this number results in
         // under/overclocking the guest cpu
         double cpu_clock_scale = 1.0;
-
-        template <class Archive>
-        void serialize(Archive& ar, const unsigned int) {
-            MoveEvents();
-            ar& event_queue;
-            ar& event_fifo_id;
-            ar& slice_length;
-            ar& downcount;
-            ar& executed_ticks;
-            ar& idled_cycles;
-        }
-        friend class boost::serialization::access;
     };
 
     explicit Timing(std::size_t num_cores, u32 cpu_clock_percentage, s64 override_base_ticks = -1);
@@ -285,11 +247,6 @@ public:
 
     std::shared_ptr<Timer> GetTimer(std::size_t cpu_id);
 
-    // Used after deserializing to unprotect the event queue.
-    void UnlockEventQueue() {
-        event_queue_locked = false;
-    }
-
     /// Generates a random tick count to seed the system tick timer with.
     static s64 GenerateBaseTicks();
 
@@ -300,23 +257,6 @@ private:
 
     std::vector<std::shared_ptr<Timer>> timers;
     Timer* current_timer = nullptr;
-
-    // When true, the event queue can't be modified. Used while deserializing to workaround
-    // destructor side effects.
-    bool event_queue_locked = false;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int file_version) {
-        // event_types set during initialization of other things
-        ar& timers;
-        ar& current_timer;
-        if (Archive::is_loading::value) {
-            event_queue_locked = true;
-        }
-    }
-    friend class boost::serialization::access;
 };
 
 } // namespace Core
-
-BOOST_CLASS_VERSION(Core::Timing, 1)
diff --git a/src/core/file_sys/archive_backend.h b/src/core/file_sys/archive_backend.h
index 7eb3893ba..0de98e4e2 100644
--- a/src/core/file_sys/archive_backend.h
+++ b/src/core/file_sys/archive_backend.h
@@ -8,8 +8,6 @@
 #include <string>
 #include <utility>
 #include <vector>
-#include <boost/serialization/string.hpp>
-#include <boost/serialization/vector.hpp>
 #include "common/bit_field.h"
 #include "common/common_types.h"
 #include "common/swap.h"
@@ -67,32 +65,6 @@ private:
     std::vector<u8> binary;
     std::string string;
     std::u16string u16str;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& type;
-        switch (type) {
-        case LowPathType::Binary:
-            ar& binary;
-            break;
-        case LowPathType::Char:
-            ar& string;
-            break;
-        case LowPathType::Wchar: {
-            std::vector<char16_t> data;
-            if (Archive::is_saving::value) {
-                std::copy(u16str.begin(), u16str.end(), std::back_inserter(data));
-            }
-            ar& data;
-            if (Archive::is_loading::value) {
-                u16str = std::u16string(data.data(), data.size());
-            }
-        } break;
-        default:
-            break;
-        }
-    }
-    friend class boost::serialization::access;
 };
 
 /// Parameters of the archive, as specified in the Create or Format call.
@@ -198,13 +170,6 @@ public:
 
 protected:
     std::unique_ptr<DelayGenerator> delay_generator;
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& delay_generator;
-    }
-    friend class boost::serialization::access;
 };
 
 class ArchiveFactory : NonCopyable {
@@ -241,10 +206,6 @@ public:
      * @return Format information about the archive or error code
      */
     virtual ResultVal<ArchiveFormatInfo> GetFormatInfo(const Path& path, u64 program_id) const = 0;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {}
-    friend class boost::serialization::access;
 };
 
 } // namespace FileSys
diff --git a/src/core/file_sys/archive_extsavedata.cpp b/src/core/file_sys/archive_extsavedata.cpp
index 65f13e7b2..007bfe315 100644
--- a/src/core/file_sys/archive_extsavedata.cpp
+++ b/src/core/file_sys/archive_extsavedata.cpp
@@ -6,7 +6,7 @@
 #include <memory>
 #include <vector>
 #include <fmt/format.h>
-#include "common/archives.h"
+
 #include "common/common_types.h"
 #include "common/file_util.h"
 #include "common/logging/log.h"
@@ -17,8 +17,6 @@
 #include "core/file_sys/savedata_archive.h"
 #include "core/hle/service/fs/archive.h"
 
-SERIALIZE_EXPORT_IMPL(FileSys::ArchiveFactory_ExtSaveData)
-
 namespace FileSys {
 
 /**
@@ -77,8 +75,6 @@ public:
         static constexpr u64 IPCDelayNanoseconds(3085068);
         return IPCDelayNanoseconds;
     }
-
-    SERIALIZE_DELAY_GENERATOR
 };
 
 /**
@@ -154,14 +150,6 @@ public:
         return std::make_unique<FixSizeDiskFile>(std::move(file), rwmode,
                                                  std::move(delay_generator));
     }
-
-private:
-    ExtSaveDataArchive() = default;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& boost::serialization::base_object<SaveDataArchive>(*this);
-    }
-    friend class boost::serialization::access;
 };
 
 struct ExtSaveDataArchivePath {
@@ -298,6 +286,3 @@ void ArchiveFactory_ExtSaveData::WriteIcon(const Path& path, std::span<const u8>
 }
 
 } // namespace FileSys
-
-SERIALIZE_EXPORT_IMPL(FileSys::ExtSaveDataDelayGenerator)
-SERIALIZE_EXPORT_IMPL(FileSys::ExtSaveDataArchive)
diff --git a/src/core/file_sys/archive_extsavedata.h b/src/core/file_sys/archive_extsavedata.h
index 5093ecdc1..c16b6ad3d 100644
--- a/src/core/file_sys/archive_extsavedata.h
+++ b/src/core/file_sys/archive_extsavedata.h
@@ -7,8 +7,6 @@
 #include <memory>
 #include <span>
 #include <string>
-#include <boost/serialization/export.hpp>
-#include <boost/serialization/string.hpp>
 #include "common/common_types.h"
 #include "core/file_sys/archive_backend.h"
 #include "core/hle/result.h"
@@ -60,15 +58,6 @@ private:
 
     /// Returns a path with the correct SaveIdHigh value for Shared extdata paths.
     Path GetCorrectedPath(const Path& path);
-
-    ArchiveFactory_ExtSaveData() = default;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& boost::serialization::base_object<ArchiveFactory>(*this);
-        ar& type;
-        ar& mount_point;
-    }
-    friend class boost::serialization::access;
 };
 
 /**
@@ -111,6 +100,3 @@ Path ConstructExtDataBinaryPath(u32 media_type, u32 high, u32 low);
 class ExtSaveDataDelayGenerator;
 
 } // namespace FileSys
-
-BOOST_CLASS_EXPORT_KEY(FileSys::ArchiveFactory_ExtSaveData)
-BOOST_CLASS_EXPORT_KEY(FileSys::ExtSaveDataDelayGenerator)
diff --git a/src/core/file_sys/archive_ncch.cpp b/src/core/file_sys/archive_ncch.cpp
index 4b3a478e2..e9529ea90 100644
--- a/src/core/file_sys/archive_ncch.cpp
+++ b/src/core/file_sys/archive_ncch.cpp
@@ -7,7 +7,7 @@
 #include <utility>
 #include <vector>
 #include "bad_word_list.app.romfs.h"
-#include "common/archives.h"
+
 #include "common/common_types.h"
 #include "common/file_util.h"
 #include "common/logging/log.h"
@@ -26,10 +26,6 @@
 #include "mii.app.romfs.h"
 #include "shared_font.app.romfs.h"
 
-SERIALIZE_EXPORT_IMPL(FileSys::NCCHArchive)
-SERIALIZE_EXPORT_IMPL(FileSys::NCCHFile)
-SERIALIZE_EXPORT_IMPL(FileSys::ArchiveFactory_NCCH)
-
 namespace FileSys {
 
 struct NCCHArchivePath {
diff --git a/src/core/file_sys/archive_ncch.h b/src/core/file_sys/archive_ncch.h
index 3e22ef02a..9970656a5 100644
--- a/src/core/file_sys/archive_ncch.h
+++ b/src/core/file_sys/archive_ncch.h
@@ -7,9 +7,6 @@
 #include <array>
 #include <memory>
 #include <string>
-#include <boost/serialization/base_object.hpp>
-#include <boost/serialization/export.hpp>
-#include <boost/serialization/vector.hpp>
 #include "core/file_sys/archive_backend.h"
 #include "core/file_sys/file_backend.h"
 #include "core/hle/result.h"
@@ -63,17 +60,6 @@ public:
 protected:
     u64 title_id;
     Service::FS::MediaType media_type;
-
-private:
-    NCCHArchive() = default;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& boost::serialization::base_object<ArchiveBackend>(*this);
-        ar& title_id;
-        ar& media_type;
-    }
-    friend class boost::serialization::access;
 };
 
 // File backend for NCCH files
@@ -93,15 +79,6 @@ public:
 
 private:
     std::vector<u8> file_buffer;
-
-    NCCHFile() = default;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& boost::serialization::base_object<FileBackend>(*this);
-        ar& file_buffer;
-    }
-    friend class boost::serialization::access;
 };
 
 /// File system interface to the NCCH archive
@@ -117,17 +94,6 @@ public:
     Result Format(const Path& path, const FileSys::ArchiveFormatInfo& format_info,
                   u64 program_id) override;
     ResultVal<ArchiveFormatInfo> GetFormatInfo(const Path& path, u64 program_id) const override;
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& boost::serialization::base_object<ArchiveFactory>(*this);
-    }
-    friend class boost::serialization::access;
 };
 
 } // namespace FileSys
-
-BOOST_CLASS_EXPORT_KEY(FileSys::NCCHArchive)
-BOOST_CLASS_EXPORT_KEY(FileSys::NCCHFile)
-BOOST_CLASS_EXPORT_KEY(FileSys::ArchiveFactory_NCCH)
diff --git a/src/core/file_sys/archive_other_savedata.cpp b/src/core/file_sys/archive_other_savedata.cpp
index 3944fce6f..91be55cc7 100644
--- a/src/core/file_sys/archive_other_savedata.cpp
+++ b/src/core/file_sys/archive_other_savedata.cpp
@@ -4,15 +4,12 @@
 
 #include <tuple>
 #include <utility>
-#include "common/archives.h"
+
 #include "core/file_sys/archive_other_savedata.h"
 #include "core/file_sys/errors.h"
 #include "core/hle/kernel/process.h"
 #include "core/hle/service/fs/archive.h"
 
-SERIALIZE_EXPORT_IMPL(FileSys::ArchiveFactory_OtherSaveDataPermitted)
-SERIALIZE_EXPORT_IMPL(FileSys::ArchiveFactory_OtherSaveDataGeneral)
-
 namespace FileSys {
 
 // TODO(wwylele): The storage info in exheader should be checked before accessing these archives
diff --git a/src/core/file_sys/archive_other_savedata.h b/src/core/file_sys/archive_other_savedata.h
index c9e720a8d..60394c9bd 100644
--- a/src/core/file_sys/archive_other_savedata.h
+++ b/src/core/file_sys/archive_other_savedata.h
@@ -4,9 +4,6 @@
 
 #pragma once
 
-#include <boost/serialization/base_object.hpp>
-#include <boost/serialization/export.hpp>
-#include <boost/serialization/shared_ptr.hpp>
 #include "core/file_sys/archive_source_sd_savedata.h"
 
 namespace FileSys {
@@ -28,14 +25,6 @@ public:
 
 private:
     std::shared_ptr<ArchiveSource_SDSaveData> sd_savedata_source;
-
-    ArchiveFactory_OtherSaveDataPermitted() = default;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& boost::serialization::base_object<ArchiveFactory>(*this);
-        ar& sd_savedata_source;
-    }
-    friend class boost::serialization::access;
 };
 
 /// File system interface to the OtherSaveDataGeneral archive
@@ -55,17 +44,6 @@ public:
 
 private:
     std::shared_ptr<ArchiveSource_SDSaveData> sd_savedata_source;
-
-    ArchiveFactory_OtherSaveDataGeneral() = default;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& boost::serialization::base_object<ArchiveFactory>(*this);
-        ar& sd_savedata_source;
-    }
-    friend class boost::serialization::access;
 };
 
 } // namespace FileSys
-
-BOOST_CLASS_EXPORT_KEY(FileSys::ArchiveFactory_OtherSaveDataPermitted)
-BOOST_CLASS_EXPORT_KEY(FileSys::ArchiveFactory_OtherSaveDataGeneral)
diff --git a/src/core/file_sys/archive_savedata.cpp b/src/core/file_sys/archive_savedata.cpp
index a5e767b14..9f9ba0134 100644
--- a/src/core/file_sys/archive_savedata.cpp
+++ b/src/core/file_sys/archive_savedata.cpp
@@ -3,13 +3,11 @@
 // Refer to the license.txt file included.
 
 #include <utility>
-#include "common/archives.h"
+
 #include "core/core.h"
 #include "core/file_sys/archive_savedata.h"
 #include "core/hle/kernel/process.h"
 
-SERIALIZE_EXPORT_IMPL(FileSys::ArchiveFactory_SaveData)
-
 namespace FileSys {
 
 ArchiveFactory_SaveData::ArchiveFactory_SaveData(
diff --git a/src/core/file_sys/archive_savedata.h b/src/core/file_sys/archive_savedata.h
index dba6d5cdb..07899b82c 100644
--- a/src/core/file_sys/archive_savedata.h
+++ b/src/core/file_sys/archive_savedata.h
@@ -4,8 +4,6 @@
 
 #pragma once
 
-#include <boost/serialization/base_object.hpp>
-#include <boost/serialization/shared_ptr.hpp>
 #include "core/file_sys/archive_source_sd_savedata.h"
 
 namespace FileSys {
@@ -27,16 +25,6 @@ public:
 
 private:
     std::shared_ptr<ArchiveSource_SDSaveData> sd_savedata_source;
-
-    ArchiveFactory_SaveData() = default;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& boost::serialization::base_object<ArchiveFactory>(*this);
-        ar& sd_savedata_source;
-    }
-    friend class boost::serialization::access;
 };
 
 } // namespace FileSys
-
-BOOST_CLASS_EXPORT_KEY(FileSys::ArchiveFactory_SaveData)
diff --git a/src/core/file_sys/archive_sdmc.cpp b/src/core/file_sys/archive_sdmc.cpp
index 8baac4cf5..456066e0a 100644
--- a/src/core/file_sys/archive_sdmc.cpp
+++ b/src/core/file_sys/archive_sdmc.cpp
@@ -4,7 +4,7 @@
 
 #include <algorithm>
 #include <memory>
-#include "common/archives.h"
+
 #include "common/error.h"
 #include "common/file_util.h"
 #include "common/logging/log.h"
@@ -14,9 +14,6 @@
 #include "core/file_sys/errors.h"
 #include "core/file_sys/path_parser.h"
 
-SERIALIZE_EXPORT_IMPL(FileSys::SDMCArchive)
-SERIALIZE_EXPORT_IMPL(FileSys::ArchiveFactory_SDMC)
-
 namespace FileSys {
 
 class SDMCDelayGenerator : public DelayGenerator {
@@ -39,8 +36,6 @@ public:
         static constexpr u64 IPCDelayNanoseconds(269082);
         return IPCDelayNanoseconds;
     }
-
-    SERIALIZE_DELAY_GENERATOR
 };
 
 ResultVal<std::unique_ptr<FileBackend>> SDMCArchive::OpenFile(const Path& path,
@@ -404,5 +399,3 @@ ResultVal<ArchiveFormatInfo> ArchiveFactory_SDMC::GetFormatInfo(const Path& path
     return ResultUnknown;
 }
 } // namespace FileSys
-
-SERIALIZE_EXPORT_IMPL(FileSys::SDMCDelayGenerator)
diff --git a/src/core/file_sys/archive_sdmc.h b/src/core/file_sys/archive_sdmc.h
index 267b1dfdf..81f3bfc34 100644
--- a/src/core/file_sys/archive_sdmc.h
+++ b/src/core/file_sys/archive_sdmc.h
@@ -6,9 +6,6 @@
 
 #include <memory>
 #include <string>
-#include <boost/serialization/base_object.hpp>
-#include <boost/serialization/export.hpp>
-#include <boost/serialization/string.hpp>
 #include "core/file_sys/archive_backend.h"
 #include "core/hle/result.h"
 
@@ -42,14 +39,6 @@ public:
 protected:
     ResultVal<std::unique_ptr<FileBackend>> OpenFileBase(const Path& path, const Mode& mode) const;
     std::string mount_point;
-
-    SDMCArchive() = default;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& boost::serialization::base_object<ArchiveBackend>(*this);
-        ar& mount_point;
-    }
-    friend class boost::serialization::access;
 };
 
 /// File system interface to the SDMC archive
@@ -74,20 +63,8 @@ public:
 
 private:
     std::string sdmc_directory;
-
-    ArchiveFactory_SDMC() = default;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& boost::serialization::base_object<ArchiveFactory>(*this);
-        ar& sdmc_directory;
-    }
-    friend class boost::serialization::access;
 };
 
 class SDMCDelayGenerator;
 
 } // namespace FileSys
-
-BOOST_CLASS_EXPORT_KEY(FileSys::SDMCArchive)
-BOOST_CLASS_EXPORT_KEY(FileSys::ArchiveFactory_SDMC)
-BOOST_CLASS_EXPORT_KEY(FileSys::SDMCDelayGenerator)
diff --git a/src/core/file_sys/archive_sdmcwriteonly.cpp b/src/core/file_sys/archive_sdmcwriteonly.cpp
index 31c27c2d2..fe107303a 100644
--- a/src/core/file_sys/archive_sdmcwriteonly.cpp
+++ b/src/core/file_sys/archive_sdmcwriteonly.cpp
@@ -3,7 +3,7 @@
 // Refer to the license.txt file included.
 
 #include <memory>
-#include "common/archives.h"
+
 #include "common/file_util.h"
 #include "common/settings.h"
 #include "core/file_sys/archive_sdmcwriteonly.h"
@@ -11,9 +11,6 @@
 #include "core/file_sys/errors.h"
 #include "core/file_sys/file_backend.h"
 
-SERIALIZE_EXPORT_IMPL(FileSys::SDMCWriteOnlyArchive)
-SERIALIZE_EXPORT_IMPL(FileSys::ArchiveFactory_SDMCWriteOnly)
-
 namespace FileSys {
 
 class SDMCWriteOnlyDelayGenerator : public DelayGenerator {
@@ -36,8 +33,6 @@ public:
         static constexpr u64 IPCDelayNanoseconds(269082);
         return IPCDelayNanoseconds;
     }
-
-    SERIALIZE_DELAY_GENERATOR
 };
 
 ResultVal<std::unique_ptr<FileBackend>> SDMCWriteOnlyArchive::OpenFile(const Path& path,
@@ -97,5 +92,3 @@ ResultVal<ArchiveFormatInfo> ArchiveFactory_SDMCWriteOnly::GetFormatInfo(const P
 }
 
 } // namespace FileSys
-
-SERIALIZE_EXPORT_IMPL(FileSys::SDMCWriteOnlyDelayGenerator)
diff --git a/src/core/file_sys/archive_sdmcwriteonly.h b/src/core/file_sys/archive_sdmcwriteonly.h
index c05f408d9..f02171b6c 100644
--- a/src/core/file_sys/archive_sdmcwriteonly.h
+++ b/src/core/file_sys/archive_sdmcwriteonly.h
@@ -28,14 +28,6 @@ public:
                                                      const Mode& mode) const override;
 
     ResultVal<std::unique_ptr<DirectoryBackend>> OpenDirectory(const Path& path) const override;
-
-private:
-    SDMCWriteOnlyArchive() = default;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& boost::serialization::base_object<SDMCArchive>(*this);
-    }
-    friend class boost::serialization::access;
 };
 
 /// File system interface to the SDMC write-only archive
@@ -60,20 +52,8 @@ public:
 
 private:
     std::string sdmc_directory;
-
-    ArchiveFactory_SDMCWriteOnly() = default;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& boost::serialization::base_object<ArchiveFactory>(*this);
-        ar& sdmc_directory;
-    }
-    friend class boost::serialization::access;
 };
 
 class SDMCWriteOnlyDelayGenerator;
 
 } // namespace FileSys
-
-BOOST_CLASS_EXPORT_KEY(FileSys::SDMCWriteOnlyArchive)
-BOOST_CLASS_EXPORT_KEY(FileSys::ArchiveFactory_SDMCWriteOnly)
-BOOST_CLASS_EXPORT_KEY(FileSys::SDMCWriteOnlyDelayGenerator)
diff --git a/src/core/file_sys/archive_selfncch.cpp b/src/core/file_sys/archive_selfncch.cpp
index 60454d674..ec3373691 100644
--- a/src/core/file_sys/archive_selfncch.cpp
+++ b/src/core/file_sys/archive_selfncch.cpp
@@ -3,7 +3,7 @@
 // Refer to the license.txt file included.
 
 #include <array>
-#include "common/archives.h"
+
 #include "common/common_types.h"
 #include "common/logging/log.h"
 #include "common/swap.h"
@@ -13,8 +13,6 @@
 #include "core/file_sys/ivfc_archive.h"
 #include "core/hle/kernel/process.h"
 
-SERIALIZE_EXPORT_IMPL(FileSys::ArchiveFactory_SelfNCCH)
-
 namespace FileSys {
 
 enum class SelfNCCHFilePathType : u32 {
@@ -73,15 +71,6 @@ public:
 
 private:
     std::shared_ptr<std::vector<u8>> data;
-
-    ExeFSSectionFile() = default;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& boost::serialization::base_object<FileBackend>(*this);
-        ar& data;
-    }
-    friend class boost::serialization::access;
 };
 
 // SelfNCCHArchive represents the running application itself. From this archive the application can
@@ -235,15 +224,6 @@ private:
     }
 
     NCCHData ncch_data;
-
-    SelfNCCHArchive() = default;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& boost::serialization::base_object<ArchiveBackend>(*this);
-        ar& ncch_data;
-    }
-    friend class boost::serialization::access;
 };
 
 void ArchiveFactory_SelfNCCH::Register(Loader::AppLoader& app_loader) {
@@ -309,6 +289,3 @@ ResultVal<ArchiveFormatInfo> ArchiveFactory_SelfNCCH::GetFormatInfo(const Path&,
 }
 
 } // namespace FileSys
-
-SERIALIZE_EXPORT_IMPL(FileSys::ExeFSSectionFile)
-SERIALIZE_EXPORT_IMPL(FileSys::SelfNCCHArchive)
diff --git a/src/core/file_sys/archive_selfncch.h b/src/core/file_sys/archive_selfncch.h
index 0643faf63..2af012b2d 100644
--- a/src/core/file_sys/archive_selfncch.h
+++ b/src/core/file_sys/archive_selfncch.h
@@ -8,10 +8,6 @@
 #include <string>
 #include <unordered_map>
 #include <vector>
-#include <boost/serialization/export.hpp>
-#include <boost/serialization/shared_ptr.hpp>
-#include <boost/serialization/unordered_map.hpp>
-#include <boost/serialization/vector.hpp>
 #include "common/common_types.h"
 #include "core/file_sys/archive_backend.h"
 #include "core/hle/result.h"
@@ -25,17 +21,6 @@ struct NCCHData {
     std::shared_ptr<std::vector<u8>> banner;
     std::shared_ptr<RomFSReader> romfs_file;
     std::shared_ptr<RomFSReader> update_romfs_file;
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& icon;
-        ar& logo;
-        ar& banner;
-        ar& romfs_file;
-        ar& update_romfs_file;
-    }
-    friend class boost::serialization::access;
 };
 
 /// File system interface to the SelfNCCH archive
@@ -57,20 +42,9 @@ public:
 private:
     /// Mapping of ProgramId -> NCCHData
     std::unordered_map<u64, NCCHData> ncch_data;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& boost::serialization::base_object<ArchiveFactory>(*this);
-        ar& ncch_data;
-    }
-    friend class boost::serialization::access;
 };
 
 class ExeFSSectionFile;
 class SelfNCCHArchive;
 
 } // namespace FileSys
-
-BOOST_CLASS_EXPORT_KEY(FileSys::ArchiveFactory_SelfNCCH)
-BOOST_CLASS_EXPORT_KEY(FileSys::ExeFSSectionFile)
-BOOST_CLASS_EXPORT_KEY(FileSys::SelfNCCHArchive)
diff --git a/src/core/file_sys/archive_source_sd_savedata.cpp b/src/core/file_sys/archive_source_sd_savedata.cpp
index 2f4cdcb54..588e5ece5 100644
--- a/src/core/file_sys/archive_source_sd_savedata.cpp
+++ b/src/core/file_sys/archive_source_sd_savedata.cpp
@@ -3,7 +3,7 @@
 // Refer to the license.txt file included.
 
 #include <fmt/format.h>
-#include "common/archives.h"
+
 #include "common/file_util.h"
 #include "common/logging/log.h"
 #include "core/file_sys/archive_source_sd_savedata.h"
@@ -11,8 +11,6 @@
 #include "core/file_sys/savedata_archive.h"
 #include "core/hle/service/fs/archive.h"
 
-SERIALIZE_EXPORT_IMPL(FileSys::ArchiveSource_SDSaveData)
-
 namespace FileSys {
 
 namespace {
diff --git a/src/core/file_sys/archive_source_sd_savedata.h b/src/core/file_sys/archive_source_sd_savedata.h
index 07832c3ae..489335e59 100644
--- a/src/core/file_sys/archive_source_sd_savedata.h
+++ b/src/core/file_sys/archive_source_sd_savedata.h
@@ -6,8 +6,6 @@
 
 #include <memory>
 #include <string>
-#include <boost/serialization/export.hpp>
-#include <boost/serialization/string.hpp>
 #include "core/file_sys/archive_backend.h"
 #include "core/hle/result.h"
 
@@ -26,15 +24,6 @@ public:
 
 private:
     std::string mount_point;
-
-    ArchiveSource_SDSaveData() = default;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& mount_point;
-    }
-    friend class boost::serialization::access;
 };
 
 } // namespace FileSys
-
-BOOST_CLASS_EXPORT_KEY(FileSys::ArchiveSource_SDSaveData)
diff --git a/src/core/file_sys/archive_systemsavedata.cpp b/src/core/file_sys/archive_systemsavedata.cpp
index 62734fca6..8b45992b9 100644
--- a/src/core/file_sys/archive_systemsavedata.cpp
+++ b/src/core/file_sys/archive_systemsavedata.cpp
@@ -7,7 +7,7 @@
 #include <memory>
 #include <vector>
 #include <fmt/format.h>
-#include "common/archives.h"
+
 #include "common/common_types.h"
 #include "common/file_util.h"
 #include "core/file_sys/archive_systemsavedata.h"
@@ -15,8 +15,6 @@
 #include "core/file_sys/savedata_archive.h"
 #include "core/hle/service/fs/archive.h"
 
-SERIALIZE_EXPORT_IMPL(FileSys::ArchiveFactory_SystemSaveData)
-
 namespace FileSys {
 
 std::string GetSystemSaveDataPath(std::string_view mount_point, const Path& path) {
diff --git a/src/core/file_sys/archive_systemsavedata.h b/src/core/file_sys/archive_systemsavedata.h
index af7c341e2..ce116d90b 100644
--- a/src/core/file_sys/archive_systemsavedata.h
+++ b/src/core/file_sys/archive_systemsavedata.h
@@ -6,8 +6,6 @@
 
 #include <memory>
 #include <string>
-#include <boost/serialization/export.hpp>
-#include <boost/serialization/string.hpp>
 #include "common/common_types.h"
 #include "core/file_sys/archive_backend.h"
 #include "core/hle/result.h"
@@ -30,14 +28,6 @@ public:
 
 private:
     std::string base_path;
-
-    ArchiveFactory_SystemSaveData() = default;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& boost::serialization::base_object<ArchiveFactory>(*this);
-        ar& base_path;
-    }
-    friend class boost::serialization::access;
 };
 
 /**
@@ -67,5 +57,3 @@ std::string GetSystemSaveDataContainerPath(std::string_view mount_point);
 Path ConstructSystemSaveDataBinaryPath(u32 high, u32 low);
 
 } // namespace FileSys
-
-BOOST_CLASS_EXPORT_KEY(FileSys::ArchiveFactory_SystemSaveData)
diff --git a/src/core/file_sys/delay_generator.cpp b/src/core/file_sys/delay_generator.cpp
index 137e63d69..7be0a6b04 100644
--- a/src/core/file_sys/delay_generator.cpp
+++ b/src/core/file_sys/delay_generator.cpp
@@ -3,10 +3,8 @@
 // Refer to the license.txt file included.
 
 #include <algorithm>
-#include "common/archives.h"
-#include "core/file_sys/delay_generator.h"
 
-SERIALIZE_EXPORT_IMPL(FileSys::DefaultDelayGenerator)
+#include "core/file_sys/delay_generator.h"
 
 namespace FileSys {
 
diff --git a/src/core/file_sys/delay_generator.h b/src/core/file_sys/delay_generator.h
index 6513a730e..d530f2ee2 100644
--- a/src/core/file_sys/delay_generator.h
+++ b/src/core/file_sys/delay_generator.h
@@ -5,18 +5,8 @@
 #pragma once
 
 #include <cstddef>
-#include <boost/serialization/base_object.hpp>
-#include <boost/serialization/export.hpp>
 #include "common/common_types.h"
 
-#define SERIALIZE_DELAY_GENERATOR                                                                  \
-private:                                                                                           \
-    template <class Archive>                                                                       \
-    void serialize(Archive& ar, const unsigned int) {                                              \
-        ar& boost::serialization::base_object<DelayGenerator>(*this);                              \
-    }                                                                                              \
-    friend class boost::serialization::access;
-
 namespace FileSys {
 
 class DelayGenerator {
@@ -26,20 +16,12 @@ public:
     virtual u64 GetOpenDelayNs() = 0;
 
     // TODO (B3N30): Add getter for all other file/directory io operations
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {}
-    friend class boost::serialization::access;
 };
 
 class DefaultDelayGenerator : public DelayGenerator {
 public:
     u64 GetReadDelayNs(std::size_t length) override;
     u64 GetOpenDelayNs() override;
-
-    SERIALIZE_DELAY_GENERATOR
 };
 
 } // namespace FileSys
-
-BOOST_CLASS_EXPORT_KEY(FileSys::DefaultDelayGenerator);
diff --git a/src/core/file_sys/directory_backend.h b/src/core/file_sys/directory_backend.h
index b5a2617bb..e6615cf37 100644
--- a/src/core/file_sys/directory_backend.h
+++ b/src/core/file_sys/directory_backend.h
@@ -50,11 +50,6 @@ public:
      * @return true if the directory closed correctly
      */
     virtual bool Close() const = 0;
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {}
-    friend class boost::serialization::access;
 };
 
 } // namespace FileSys
diff --git a/src/core/file_sys/disk_archive.cpp b/src/core/file_sys/disk_archive.cpp
index 12ea8932a..6674fdfe5 100644
--- a/src/core/file_sys/disk_archive.cpp
+++ b/src/core/file_sys/disk_archive.cpp
@@ -4,16 +4,13 @@
 
 #include <algorithm>
 #include <memory>
-#include "common/archives.h"
+
 #include "common/common_types.h"
 #include "common/file_util.h"
 #include "common/logging/log.h"
 #include "core/file_sys/disk_archive.h"
 #include "core/file_sys/errors.h"
 
-SERIALIZE_EXPORT_IMPL(FileSys::DiskFile)
-SERIALIZE_EXPORT_IMPL(FileSys::DiskDirectory)
-
 namespace FileSys {
 
 ResultVal<std::size_t> DiskFile::Read(const u64 offset, const std::size_t length,
diff --git a/src/core/file_sys/disk_archive.h b/src/core/file_sys/disk_archive.h
index 5843a37d5..b34622585 100644
--- a/src/core/file_sys/disk_archive.h
+++ b/src/core/file_sys/disk_archive.h
@@ -8,9 +8,6 @@
 #include <memory>
 #include <string>
 #include <vector>
-#include <boost/serialization/base_object.hpp>
-#include <boost/serialization/unique_ptr.hpp>
-#include <boost/serialization/vector.hpp>
 #include "common/common_types.h"
 #include "common/file_util.h"
 #include "core/file_sys/archive_backend.h"
@@ -43,17 +40,6 @@ public:
 protected:
     Mode mode;
     std::unique_ptr<FileUtil::IOFile> file;
-
-private:
-    DiskFile() = default;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& boost::serialization::base_object<FileBackend>(*this);
-        ar& mode.hex;
-        ar& file;
-    }
-    friend class boost::serialization::access;
 };
 
 class DiskDirectory : public DirectoryBackend {
@@ -76,27 +62,6 @@ protected:
     // We need to remember the last entry we returned, so a subsequent call to Read will continue
     // from the next one.  This iterator will always point to the next unread entry.
     std::vector<FileUtil::FSTEntry>::iterator children_iterator;
-
-private:
-    DiskDirectory() = default;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& boost::serialization::base_object<DirectoryBackend>(*this);
-        ar& directory;
-        u64 child_index;
-        if (Archive::is_saving::value) {
-            child_index = children_iterator - directory.children.begin();
-        }
-        ar& child_index;
-        if (Archive::is_loading::value) {
-            children_iterator = directory.children.begin() + child_index;
-        }
-    }
-    friend class boost::serialization::access;
 };
 
 } // namespace FileSys
-
-BOOST_CLASS_EXPORT_KEY(FileSys::DiskFile)
-BOOST_CLASS_EXPORT_KEY(FileSys::DiskDirectory)
diff --git a/src/core/file_sys/file_backend.h b/src/core/file_sys/file_backend.h
index bf0a1b493..8d818ff42 100644
--- a/src/core/file_sys/file_backend.h
+++ b/src/core/file_sys/file_backend.h
@@ -7,7 +7,6 @@
 #include <algorithm>
 #include <cstddef>
 #include <memory>
-#include <boost/serialization/unique_ptr.hpp>
 #include "common/common_types.h"
 #include "core/hle/result.h"
 #include "delay_generator.h"
@@ -102,12 +101,6 @@ public:
 
 protected:
     std::unique_ptr<DelayGenerator> delay_generator;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& delay_generator;
-    }
-    friend class boost::serialization::access;
 };
 
 } // namespace FileSys
diff --git a/src/core/file_sys/ivfc_archive.cpp b/src/core/file_sys/ivfc_archive.cpp
index de71883a7..5811230a3 100644
--- a/src/core/file_sys/ivfc_archive.cpp
+++ b/src/core/file_sys/ivfc_archive.cpp
@@ -5,17 +5,11 @@
 #include <cstring>
 #include <memory>
 #include <utility>
-#include "common/archives.h"
+
 #include "common/common_types.h"
 #include "common/logging/log.h"
 #include "core/file_sys/ivfc_archive.h"
 
-SERIALIZE_EXPORT_IMPL(FileSys::IVFCFile)
-SERIALIZE_EXPORT_IMPL(FileSys::IVFCFileInMemory)
-SERIALIZE_EXPORT_IMPL(FileSys::IVFCDelayGenerator)
-SERIALIZE_EXPORT_IMPL(FileSys::RomFSDelayGenerator)
-SERIALIZE_EXPORT_IMPL(FileSys::ExeFSDelayGenerator)
-
 namespace FileSys {
 
 IVFCArchive::IVFCArchive(std::shared_ptr<RomFSReader> file,
diff --git a/src/core/file_sys/ivfc_archive.h b/src/core/file_sys/ivfc_archive.h
index 765e41444..b4cbd42d7 100644
--- a/src/core/file_sys/ivfc_archive.h
+++ b/src/core/file_sys/ivfc_archive.h
@@ -8,8 +8,6 @@
 #include <memory>
 #include <string>
 #include <vector>
-#include <boost/serialization/export.hpp>
-#include <boost/serialization/shared_ptr.hpp>
 #include "common/common_types.h"
 #include "common/file_util.h"
 #include "core/file_sys/archive_backend.h"
@@ -37,8 +35,6 @@ class IVFCDelayGenerator : public DelayGenerator {
         static constexpr u64 IPCDelayNanoseconds(9438006);
         return IPCDelayNanoseconds;
     }
-
-    SERIALIZE_DELAY_GENERATOR
 };
 
 class RomFSDelayGenerator : public DelayGenerator {
@@ -61,8 +57,6 @@ public:
         static constexpr u64 IPCDelayNanoseconds(9438006);
         return IPCDelayNanoseconds;
     }
-
-    SERIALIZE_DELAY_GENERATOR
 };
 
 class ExeFSDelayGenerator : public DelayGenerator {
@@ -85,8 +79,6 @@ public:
         static constexpr u64 IPCDelayNanoseconds(9438006);
         return IPCDelayNanoseconds;
     }
-
-    SERIALIZE_DELAY_GENERATOR
 };
 
 /**
@@ -141,15 +133,6 @@ public:
 
 private:
     std::shared_ptr<RomFSReader> romfs_file;
-
-    IVFCFile() = default;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& boost::serialization::base_object<FileBackend>(*this);
-        ar& romfs_file;
-    }
-    friend class boost::serialization::access;
 };
 
 class IVFCDirectory : public DirectoryBackend {
@@ -181,23 +164,6 @@ private:
     std::vector<u8> romfs_file;
     u64 data_offset;
     u64 data_size;
-
-    IVFCFileInMemory() = default;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& boost::serialization::base_object<FileBackend>(*this);
-        ar& romfs_file;
-        ar& data_offset;
-        ar& data_size;
-    }
-    friend class boost::serialization::access;
 };
 
 } // namespace FileSys
-
-BOOST_CLASS_EXPORT_KEY(FileSys::IVFCFile)
-BOOST_CLASS_EXPORT_KEY(FileSys::IVFCFileInMemory)
-BOOST_CLASS_EXPORT_KEY(FileSys::IVFCDelayGenerator)
-BOOST_CLASS_EXPORT_KEY(FileSys::RomFSDelayGenerator)
-BOOST_CLASS_EXPORT_KEY(FileSys::ExeFSDelayGenerator)
diff --git a/src/core/file_sys/layered_fs.cpp b/src/core/file_sys/layered_fs.cpp
index 1cac97be4..0ec40858c 100644
--- a/src/core/file_sys/layered_fs.cpp
+++ b/src/core/file_sys/layered_fs.cpp
@@ -5,7 +5,7 @@
 #include <algorithm>
 #include <cstring>
 #include "common/alignment.h"
-#include "common/archives.h"
+
 #include "common/assert.h"
 #include "common/common_paths.h"
 #include "common/file_util.h"
@@ -14,8 +14,6 @@
 #include "core/file_sys/layered_fs.h"
 #include "core/file_sys/patch.h"
 
-SERIALIZE_EXPORT_IMPL(FileSys::LayeredFS)
-
 namespace FileSys {
 
 struct FileRelocationInfo {
@@ -54,8 +52,6 @@ struct FileMetadata {
 };
 static_assert(sizeof(FileMetadata) == 0x20, "Size of FileMetadata is not correct");
 
-LayeredFS::LayeredFS() = default;
-
 LayeredFS::LayeredFS(std::shared_ptr<RomFSReader> romfs_, std::string patch_path_,
                      std::string patch_ext_path_, bool load_relocations_)
     : romfs(std::move(romfs_)), patch_path(std::move(patch_path_)),
diff --git a/src/core/file_sys/layered_fs.h b/src/core/file_sys/layered_fs.h
index 0a0dc5669..67d02d67a 100644
--- a/src/core/file_sys/layered_fs.h
+++ b/src/core/file_sys/layered_fs.h
@@ -9,10 +9,6 @@
 #include <string>
 #include <unordered_map>
 #include <vector>
-#include <boost/serialization/base_object.hpp>
-#include <boost/serialization/export.hpp>
-#include <boost/serialization/shared_ptr.hpp>
-#include <boost/serialization/string.hpp>
 #include "common/common_types.h"
 #include "common/swap.h"
 #include "core/file_sys/romfs_reader.h"
@@ -135,24 +131,6 @@ private:
     u64 current_file_offset{};           // current file metadata offset
     std::vector<u8> file_metadata_table; // rebuilt file metadata table
     u64 current_data_offset{};           // current assigned data offset
-
-    LayeredFS();
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& boost::serialization::base_object<RomFSReader>(*this);
-        ar& romfs;
-        ar& patch_path;
-        ar& patch_ext_path;
-        ar& load_relocations;
-        if (Archive::is_loading::value) {
-            Load();
-        }
-        // NOTE: Everything else is essentially cached, updated when we call Load
-    }
-    friend class boost::serialization::access;
 };
 
 } // namespace FileSys
-
-BOOST_CLASS_EXPORT_KEY(FileSys::LayeredFS)
diff --git a/src/core/file_sys/romfs_reader.cpp b/src/core/file_sys/romfs_reader.cpp
index 40823d833..ee902b185 100644
--- a/src/core/file_sys/romfs_reader.cpp
+++ b/src/core/file_sys/romfs_reader.cpp
@@ -2,12 +2,10 @@
 #include <vector>
 #include <cryptopp/aes.h>
 #include <cryptopp/modes.h>
-#include "common/archives.h"
+
 #include "common/logging/log.h"
 #include "core/file_sys/romfs_reader.h"
 
-SERIALIZE_EXPORT_IMPL(FileSys::DirectRomFSReader)
-
 namespace FileSys {
 
 std::size_t DirectRomFSReader::ReadFile(std::size_t offset, std::size_t length, u8* buffer) {
diff --git a/src/core/file_sys/romfs_reader.h b/src/core/file_sys/romfs_reader.h
index 128d10dbd..a3fbbff1d 100644
--- a/src/core/file_sys/romfs_reader.h
+++ b/src/core/file_sys/romfs_reader.h
@@ -2,9 +2,6 @@
 
 #include <array>
 #include <shared_mutex>
-#include <boost/serialization/array.hpp>
-#include <boost/serialization/base_object.hpp>
-#include <boost/serialization/export.hpp>
 #include "common/alignment.h"
 #include "common/common_types.h"
 #include "common/file_util.h"
@@ -23,11 +20,6 @@ public:
     virtual std::size_t ReadFile(std::size_t offset, std::size_t length, u8* buffer) = 0;
     virtual bool AllowsCachedReads() const = 0;
     virtual bool CacheReady(std::size_t file_offset, std::size_t length) = 0;
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int file_version) {}
-    friend class boost::serialization::access;
 };
 
 /**
@@ -82,21 +74,6 @@ private:
 
     std::vector<std::pair<std::size_t, std::size_t>> BreakupRead(std::size_t offset,
                                                                  std::size_t length);
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& boost::serialization::base_object<RomFSReader>(*this);
-        ar& is_encrypted;
-        ar& file;
-        ar& key;
-        ar& ctr;
-        ar& file_offset;
-        ar& crypto_offset;
-        ar& data_size;
-    }
-    friend class boost::serialization::access;
 };
 
 } // namespace FileSys
-
-BOOST_CLASS_EXPORT_KEY(FileSys::DirectRomFSReader)
diff --git a/src/core/file_sys/savedata_archive.cpp b/src/core/file_sys/savedata_archive.cpp
index 17380e6ac..739839632 100644
--- a/src/core/file_sys/savedata_archive.cpp
+++ b/src/core/file_sys/savedata_archive.cpp
@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "common/file_util.h"
 #include "core/file_sys/disk_archive.h"
 #include "core/file_sys/errors.h"
@@ -31,8 +30,6 @@ public:
         static constexpr u64 IPCDelayNanoseconds(269082);
         return IPCDelayNanoseconds;
     }
-
-    SERIALIZE_DELAY_GENERATOR
 };
 
 ResultVal<std::unique_ptr<FileBackend>> SaveDataArchive::OpenFile(const Path& path,
@@ -355,6 +352,3 @@ u64 SaveDataArchive::GetFreeBytes() const {
 }
 
 } // namespace FileSys
-
-SERIALIZE_EXPORT_IMPL(FileSys::SaveDataArchive)
-SERIALIZE_EXPORT_IMPL(FileSys::SaveDataDelayGenerator)
diff --git a/src/core/file_sys/savedata_archive.h b/src/core/file_sys/savedata_archive.h
index f72f924f1..2148d3d28 100644
--- a/src/core/file_sys/savedata_archive.h
+++ b/src/core/file_sys/savedata_archive.h
@@ -37,23 +37,9 @@ public:
 protected:
     std::string mount_point;
     bool allow_zero_size_create;
-    SaveDataArchive() = default;
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& boost::serialization::base_object<ArchiveBackend>(*this);
-        ar& mount_point;
-        ar& allow_zero_size_create;
-    }
-    friend class boost::serialization::access;
 };
 
 class SaveDataDelayGenerator;
 class ExtSaveDataArchive;
 
 } // namespace FileSys
-
-BOOST_CLASS_EXPORT_KEY(FileSys::SaveDataArchive)
-BOOST_CLASS_EXPORT_KEY(FileSys::SaveDataDelayGenerator)
-BOOST_CLASS_EXPORT_KEY(FileSys::ExtSaveDataArchive)
diff --git a/src/core/global.h b/src/core/global.h
deleted file mode 100644
index 794d71f94..000000000
--- a/src/core/global.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2020 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#pragma once
-
-namespace Core {
-
-template <class T>
-T& Global();
-
-// Declare explicit specialisation to prevent automatic instantiation
-class System;
-template <>
-System& Global();
-
-class Timing;
-template <>
-Timing& Global();
-
-} // namespace Core
diff --git a/src/core/hle/kernel/address_arbiter.cpp b/src/core/hle/kernel/address_arbiter.cpp
index 893492bcd..b870c45ac 100644
--- a/src/core/hle/kernel/address_arbiter.cpp
+++ b/src/core/hle/kernel/address_arbiter.cpp
@@ -3,11 +3,7 @@
 // Refer to the license.txt file included.
 
 #include <algorithm>
-#include <boost/serialization/base_object.hpp>
-#include <boost/serialization/shared_ptr.hpp>
-#include <boost/serialization/string.hpp>
-#include <boost/serialization/vector.hpp>
-#include "common/archives.h"
+
 #include "common/common_types.h"
 #include "common/logging/log.h"
 #include "core/hle/kernel/address_arbiter.h"
@@ -17,9 +13,6 @@
 #include "core/hle/kernel/thread.h"
 #include "core/memory.h"
 
-SERIALIZE_EXPORT_IMPL(Kernel::AddressArbiter)
-SERIALIZE_EXPORT_IMPL(Kernel::AddressArbiter::Callback)
-
 namespace Kernel {
 
 void AddressArbiter::WaitThread(std::shared_ptr<Thread> thread, VAddr wait_address) {
@@ -98,13 +91,6 @@ public:
                 std::shared_ptr<WaitObject> object) override {
         parent.WakeUp(reason, std::move(thread), std::move(object));
     }
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& boost::serialization::base_object<WakeupCallback>(*this);
-    }
-    friend class boost::serialization::access;
 };
 
 void AddressArbiter::WakeUp(ThreadWakeupReason reason, std::shared_ptr<Thread> thread,
@@ -190,31 +176,4 @@ Result AddressArbiter::ArbitrateAddress(std::shared_ptr<Thread> thread, Arbitrat
     return ResultSuccess;
 }
 
-template <class Archive>
-void AddressArbiter::serialize(Archive& ar, const unsigned int) {
-    ar& boost::serialization::base_object<Object>(*this);
-    ar& name;
-    ar& waiting_threads;
-    ar& timeout_callback;
-    ar& resource_limit;
-}
-SERIALIZE_IMPL(AddressArbiter)
-
 } // namespace Kernel
-
-namespace boost::serialization {
-
-template <class Archive>
-void save_construct_data(Archive& ar, const Kernel::AddressArbiter::Callback* t,
-                         const unsigned int) {
-    ar << Kernel::SharedFrom(&t->parent);
-}
-
-template <class Archive>
-void load_construct_data(Archive& ar, Kernel::AddressArbiter::Callback* t, const unsigned int) {
-    std::shared_ptr<Kernel::AddressArbiter> parent;
-    ar >> parent;
-    ::new (t) Kernel::AddressArbiter::Callback(*parent);
-}
-
-} // namespace boost::serialization
diff --git a/src/core/hle/kernel/address_arbiter.h b/src/core/hle/kernel/address_arbiter.h
index b53a68d9e..06376d6e5 100644
--- a/src/core/hle/kernel/address_arbiter.h
+++ b/src/core/hle/kernel/address_arbiter.h
@@ -6,7 +6,6 @@
 
 #include <memory>
 #include <vector>
-#include <boost/serialization/export.hpp>
 #include "common/common_types.h"
 #include "core/hle/kernel/object.h"
 #include "core/hle/kernel/thread.h"
@@ -75,14 +74,6 @@ private:
 
     void WakeUp(ThreadWakeupReason reason, std::shared_ptr<Thread> thread,
                 std::shared_ptr<WaitObject> object) override;
-
-    friend class boost::serialization::access;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
 };
 
 } // namespace Kernel
-
-BOOST_CLASS_EXPORT_KEY(Kernel::AddressArbiter)
-BOOST_CLASS_EXPORT_KEY(Kernel::AddressArbiter::Callback)
-CONSTRUCT_KERNEL_OBJECT(Kernel::AddressArbiter)
diff --git a/src/core/hle/kernel/client_port.cpp b/src/core/hle/kernel/client_port.cpp
index a2cffe39b..c92a97818 100644
--- a/src/core/hle/kernel/client_port.cpp
+++ b/src/core/hle/kernel/client_port.cpp
@@ -2,11 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <boost/serialization/shared_ptr.hpp>
-#include <boost/serialization/string.hpp>
-#include "common/archives.h"
 #include "common/assert.h"
-#include "core/global.h"
+
 #include "core/hle/kernel/client_port.h"
 #include "core/hle/kernel/client_session.h"
 #include "core/hle/kernel/errors.h"
@@ -15,8 +12,6 @@
 #include "core/hle/kernel/server_port.h"
 #include "core/hle/kernel/server_session.h"
 
-SERIALIZE_EXPORT_IMPL(Kernel::ClientPort)
-
 namespace Kernel {
 
 ClientPort::ClientPort(KernelSystem& kernel) : Object(kernel), kernel(kernel) {}
@@ -50,14 +45,4 @@ void ClientPort::ConnectionClosed() {
     --active_sessions;
 }
 
-template <class Archive>
-void ClientPort::serialize(Archive& ar, const unsigned int) {
-    ar& boost::serialization::base_object<Object>(*this);
-    ar& server_port;
-    ar& max_sessions;
-    ar& active_sessions;
-    ar& name;
-}
-SERIALIZE_IMPL(ClientPort)
-
 } // namespace Kernel
diff --git a/src/core/hle/kernel/client_port.h b/src/core/hle/kernel/client_port.h
index 72ba671b9..3e1af30d6 100644
--- a/src/core/hle/kernel/client_port.h
+++ b/src/core/hle/kernel/client_port.h
@@ -6,7 +6,6 @@
 
 #include <memory>
 #include <string>
-#include <boost/serialization/export.hpp>
 #include "common/common_types.h"
 #include "core/hle/kernel/object.h"
 #include "core/hle/kernel/server_port.h"
@@ -60,14 +59,6 @@ private:
     std::string name;        ///< Name of client port (optional)
 
     friend class KernelSystem;
-
-private:
-    friend class boost::serialization::access;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
 };
 
 } // namespace Kernel
-
-BOOST_CLASS_EXPORT_KEY(Kernel::ClientPort)
-CONSTRUCT_KERNEL_OBJECT(Kernel::ClientPort)
diff --git a/src/core/hle/kernel/client_session.cpp b/src/core/hle/kernel/client_session.cpp
index db21846fb..6bc46e218 100644
--- a/src/core/hle/kernel/client_session.cpp
+++ b/src/core/hle/kernel/client_session.cpp
@@ -2,10 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <boost/serialization/base_object.hpp>
-#include <boost/serialization/shared_ptr.hpp>
-#include <boost/serialization/string.hpp>
-#include "common/archives.h"
 #include "common/assert.h"
 #include "core/hle/kernel/client_session.h"
 #include "core/hle/kernel/errors.h"
@@ -14,8 +10,6 @@
 #include "core/hle/kernel/session.h"
 #include "core/hle/kernel/thread.h"
 
-SERIALIZE_EXPORT_IMPL(Kernel::ClientSession)
-
 namespace Kernel {
 
 ClientSession::ClientSession(KernelSystem& kernel) : Object(kernel) {}
@@ -56,12 +50,4 @@ Result ClientSession::SendSyncRequest(std::shared_ptr<Thread> thread) {
     return server->HandleSyncRequest(std::move(thread));
 }
 
-template <class Archive>
-void ClientSession::serialize(Archive& ar, const unsigned int) {
-    ar& boost::serialization::base_object<Object>(*this);
-    ar& name;
-    ar& parent;
-}
-SERIALIZE_IMPL(ClientSession)
-
 } // namespace Kernel
diff --git a/src/core/hle/kernel/client_session.h b/src/core/hle/kernel/client_session.h
index 9ce9a1e05..e0d09d207 100644
--- a/src/core/hle/kernel/client_session.h
+++ b/src/core/hle/kernel/client_session.h
@@ -6,7 +6,6 @@
 
 #include <memory>
 #include <string>
-#include <boost/serialization/export.hpp>
 #include "common/common_types.h"
 #include "core/hle/kernel/object.h"
 #include "core/hle/result.h"
@@ -47,14 +46,6 @@ public:
 
     /// The parent session, which links to the server endpoint.
     std::shared_ptr<Session> parent;
-
-private:
-    friend class boost::serialization::access;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
 };
 
 } // namespace Kernel
-
-BOOST_CLASS_EXPORT_KEY(Kernel::ClientSession)
-CONSTRUCT_KERNEL_OBJECT(Kernel::ClientSession)
diff --git a/src/core/hle/kernel/config_mem.cpp b/src/core/hle/kernel/config_mem.cpp
index eab8a9f67..5d86bba00 100644
--- a/src/core/hle/kernel/config_mem.cpp
+++ b/src/core/hle/kernel/config_mem.cpp
@@ -3,11 +3,8 @@
 // Refer to the license.txt file included.
 
 #include <cstring>
-#include <boost/serialization/binary_object.hpp>
-#include "common/archives.h"
-#include "core/hle/kernel/config_mem.h"
 
-SERIALIZE_EXPORT_IMPL(ConfigMem::Handler)
+#include "core/hle/kernel/config_mem.h"
 
 namespace ConfigMem {
 
@@ -32,11 +29,4 @@ ConfigMemDef& Handler::GetConfigMem() {
     return config_mem;
 }
 
-template <class Archive>
-void Handler::serialize(Archive& ar, const unsigned int) {
-    ar& boost::serialization::base_object<BackingMem>(*this);
-    ar& boost::serialization::make_binary_object(&config_mem, sizeof(config_mem));
-}
-SERIALIZE_IMPL(Handler)
-
 } // namespace ConfigMem
diff --git a/src/core/hle/kernel/config_mem.h b/src/core/hle/kernel/config_mem.h
index bcadaad54..88340aedc 100644
--- a/src/core/hle/kernel/config_mem.h
+++ b/src/core/hle/kernel/config_mem.h
@@ -9,7 +9,6 @@
 // bootrom. Because we're not emulating this, and essentially just "stubbing" the functionality, I'm
 // putting this as a subset of HLE for now.
 
-#include <boost/serialization/export.hpp>
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "common/memory_ref.h"
@@ -68,12 +67,6 @@ public:
 
 private:
     ConfigMemDef config_mem;
-
-    friend class boost::serialization::access;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
 };
 
 } // namespace ConfigMem
-
-BOOST_CLASS_EXPORT_KEY(ConfigMem::Handler)
diff --git a/src/core/hle/kernel/event.cpp b/src/core/hle/kernel/event.cpp
index 70b3594f7..803c70f36 100644
--- a/src/core/hle/kernel/event.cpp
+++ b/src/core/hle/kernel/event.cpp
@@ -2,17 +2,12 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <boost/serialization/base_object.hpp>
-#include <boost/serialization/string.hpp>
-#include "common/archives.h"
 #include "common/assert.h"
 #include "core/hle/kernel/event.h"
 #include "core/hle/kernel/kernel.h"
 #include "core/hle/kernel/resource_limit.h"
 #include "core/hle/kernel/thread.h"
 
-SERIALIZE_EXPORT_IMPL(Kernel::Event)
-
 namespace Kernel {
 
 Event::Event(KernelSystem& kernel) : WaitObject(kernel) {}
@@ -60,14 +55,4 @@ void Event::WakeupAllWaitingThreads() {
     }
 }
 
-template <class Archive>
-void Event::serialize(Archive& ar, const unsigned int) {
-    ar& boost::serialization::base_object<WaitObject>(*this);
-    ar& reset_type;
-    ar& signaled;
-    ar& name;
-    ar& resource_limit;
-}
-SERIALIZE_IMPL(Event)
-
 } // namespace Kernel
diff --git a/src/core/hle/kernel/event.h b/src/core/hle/kernel/event.h
index 1662027f4..297d27b54 100644
--- a/src/core/hle/kernel/event.h
+++ b/src/core/hle/kernel/event.h
@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include <boost/serialization/export.hpp>
 #include "core/hle/kernel/object.h"
 #include "core/hle/kernel/resource_limit.h"
 #include "core/hle/kernel/wait_object.h"
@@ -52,13 +51,6 @@ private:
     std::string name; ///< Name of event (optional)
 
     friend class KernelSystem;
-
-    friend class boost::serialization::access;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
 };
 
 } // namespace Kernel
-
-BOOST_CLASS_EXPORT_KEY(Kernel::Event)
-CONSTRUCT_KERNEL_OBJECT(Kernel::Event)
diff --git a/src/core/hle/kernel/handle_table.cpp b/src/core/hle/kernel/handle_table.cpp
index 081135368..65ffebb64 100644
--- a/src/core/hle/kernel/handle_table.cpp
+++ b/src/core/hle/kernel/handle_table.cpp
@@ -3,9 +3,7 @@
 // Refer to the license.txt file included.
 
 #include <utility>
-#include <boost/serialization/array.hpp>
-#include <boost/serialization/shared_ptr.hpp>
-#include "common/archives.h"
+
 #include "common/assert.h"
 #include "common/logging/log.h"
 #include "core/hle/kernel/errors.h"
@@ -13,8 +11,6 @@
 #include "core/hle/kernel/process.h"
 #include "core/hle/kernel/thread.h"
 
-SERIALIZE_EXPORT_IMPL(Kernel::HandleTable)
-
 namespace Kernel {
 namespace {
 constexpr u16 GetSlot(Handle handle) {
@@ -99,13 +95,4 @@ void HandleTable::Clear() {
     next_free_slot = 0;
 }
 
-template <class Archive>
-void HandleTable::serialize(Archive& ar, const unsigned int) {
-    ar& objects;
-    ar& generations;
-    ar& next_generation;
-    ar& next_free_slot;
-}
-SERIALIZE_IMPL(HandleTable)
-
 } // namespace Kernel
diff --git a/src/core/hle/kernel/handle_table.h b/src/core/hle/kernel/handle_table.h
index 5bb34ff18..e674c8799 100644
--- a/src/core/hle/kernel/handle_table.h
+++ b/src/core/hle/kernel/handle_table.h
@@ -7,7 +7,6 @@
 #include <array>
 #include <cstddef>
 #include <memory>
-#include <boost/serialization/export.hpp>
 #include "common/common_types.h"
 #include "core/hle/kernel/object.h"
 #include "core/hle/result.h"
@@ -117,13 +116,6 @@ private:
     u16 next_free_slot;
 
     KernelSystem& kernel;
-
-    friend class boost::serialization::access;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
 };
 
 } // namespace Kernel
-
-BOOST_CLASS_EXPORT_KEY(Kernel::HandleTable)
-CONSTRUCT_KERNEL_OBJECT(Kernel::HandleTable)
diff --git a/src/core/hle/kernel/hle_ipc.cpp b/src/core/hle/kernel/hle_ipc.cpp
index c0b4c93e7..8b17c1644 100644
--- a/src/core/hle/kernel/hle_ipc.cpp
+++ b/src/core/hle/kernel/hle_ipc.cpp
@@ -4,11 +4,7 @@
 
 #include <algorithm>
 #include <vector>
-#include <boost/serialization/assume_abstract.hpp>
-#include <boost/serialization/shared_ptr.hpp>
-#include <boost/serialization/unique_ptr.hpp>
-#include <boost/serialization/vector.hpp>
-#include "common/archives.h"
+
 #include "common/assert.h"
 #include "common/common_types.h"
 #include "core/core.h"
@@ -19,12 +15,6 @@
 #include "core/hle/kernel/kernel.h"
 #include "core/hle/kernel/process.h"
 
-SERIALIZE_EXPORT_IMPL(Kernel::SessionRequestHandler)
-SERIALIZE_EXPORT_IMPL(Kernel::SessionRequestHandler::SessionDataBase)
-SERIALIZE_EXPORT_IMPL(Kernel::SessionRequestHandler::SessionInfo)
-SERIALIZE_EXPORT_IMPL(Kernel::HLERequestContext)
-SERIALIZE_EXPORT_IMPL(Kernel::HLERequestContext::ThreadCallback)
-
 namespace Kernel {
 
 class HLERequestContext::ThreadCallback : public Kernel::WakeupCallback {
@@ -57,17 +47,8 @@ public:
     }
 
 private:
-    ThreadCallback() = default;
     std::shared_ptr<HLERequestContext::WakeupCallback> callback{};
     std::shared_ptr<HLERequestContext> context{};
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& boost::serialization::base_object<Kernel::WakeupCallback>(*this);
-        ar& callback;
-        ar& context;
-    }
-    friend class boost::serialization::access;
 };
 
 SessionRequestHandler::SessionInfo::SessionInfo(std::shared_ptr<ServerSession> session,
@@ -87,23 +68,6 @@ void SessionRequestHandler::ClientDisconnected(std::shared_ptr<ServerSession> se
         connected_sessions.end());
 }
 
-template <class Archive>
-void SessionRequestHandler::serialize(Archive& ar, const unsigned int) {
-    ar& connected_sessions;
-}
-SERIALIZE_IMPL(SessionRequestHandler)
-
-template <class Archive>
-void SessionRequestHandler::SessionDataBase::serialize(Archive& ar, const unsigned int) {}
-SERIALIZE_IMPL(SessionRequestHandler::SessionDataBase)
-
-template <class Archive>
-void SessionRequestHandler::SessionInfo::serialize(Archive& ar, const unsigned int) {
-    ar& session;
-    ar& data;
-}
-SERIALIZE_IMPL(SessionRequestHandler::SessionInfo)
-
 std::shared_ptr<Event> HLERequestContext::SleepClientThread(
     const std::string& reason, std::chrono::nanoseconds timeout,
     std::shared_ptr<WakeupCallback> callback) {
@@ -121,8 +85,6 @@ std::shared_ptr<Event> HLERequestContext::SleepClientThread(
     return event;
 }
 
-HLERequestContext::HLERequestContext() : kernel(Core::Global<KernelSystem>()) {}
-
 HLERequestContext::HLERequestContext(KernelSystem& kernel, std::shared_ptr<ServerSession> session,
                                      std::shared_ptr<Thread> thread)
     : kernel(kernel), session(std::move(session)), thread(thread) {
@@ -322,19 +284,6 @@ void HLERequestContext::ReportUnimplemented() const {
     }
 }
 
-template <class Archive>
-void HLERequestContext::serialize(Archive& ar, const unsigned int) {
-    ar& cmd_buf;
-    ar& session;
-    ar& thread;
-    ar& request_handles;
-    ar& static_buffers;
-    ar& request_mapped_buffers;
-}
-SERIALIZE_IMPL(HLERequestContext)
-
-MappedBuffer::MappedBuffer() : memory(&Core::Global<Core::System>().Memory()) {}
-
 MappedBuffer::MappedBuffer(Memory::MemorySystem& memory, std::shared_ptr<Process> process,
                            u32 descriptor, VAddr address, u32 id)
     : memory(&memory), id(id), address(address), process(std::move(process)) {
diff --git a/src/core/hle/kernel/hle_ipc.h b/src/core/hle/kernel/hle_ipc.h
index 5b6ab88b5..bad31ec65 100644
--- a/src/core/hle/kernel/hle_ipc.h
+++ b/src/core/hle/kernel/hle_ipc.h
@@ -12,9 +12,7 @@
 #include <string>
 #include <vector>
 #include <boost/container/small_vector.hpp>
-#include <boost/serialization/export.hpp>
 #include "common/common_types.h"
-#include "common/serialization/boost_small_vector.hpp"
 #include "common/swap.h"
 #include "core/hle/ipc.h"
 #include "core/hle/kernel/object.h"
@@ -71,11 +69,6 @@ public:
     /// in each service must inherit from this.
     struct SessionDataBase {
         virtual ~SessionDataBase() = default;
-
-    private:
-        template <class Archive>
-        void serialize(Archive& ar, const unsigned int);
-        friend class boost::serialization::access;
     };
 
     struct SessionInfo {
@@ -83,12 +76,6 @@ public:
 
         std::shared_ptr<ServerSession> session;
         std::unique_ptr<SessionDataBase> data;
-
-    private:
-        SessionInfo() = default;
-        template <class Archive>
-        void serialize(Archive& ar, const unsigned int);
-        friend class boost::serialization::access;
     };
 
 protected:
@@ -109,15 +96,8 @@ protected:
     /// List of sessions that are connected to this handler. A ServerSession whose server endpoint
     /// is an HLE implementation is kept alive by this list for the duration of the connection.
     std::vector<SessionInfo> connected_sessions;
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
-    friend class boost::serialization::access;
 };
 
-// NOTE: The below classes are ephemeral and don't need serialization
-
 class MappedBuffer {
 public:
     MappedBuffer(Memory::MemorySystem& memory, std::shared_ptr<Process> process, u32 descriptor,
@@ -147,18 +127,6 @@ private:
     std::shared_ptr<Process> process;
     u32 size;
     IPC::MappedBufferPermissions perms;
-
-    MappedBuffer();
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& id;
-        ar& address;
-        ar& process;
-        ar& size;
-        ar& perms;
-    }
-    friend class boost::serialization::access;
 };
 
 /**
@@ -226,11 +194,6 @@ public:
         virtual ~WakeupCallback() = default;
         virtual void WakeUp(std::shared_ptr<Thread> thread, HLERequestContext& context,
                             ThreadWakeupReason reason) = 0;
-
-    private:
-        template <class Archive>
-        void serialize(Archive& ar, const unsigned int) {}
-        friend class boost::serialization::access;
     };
 
     /**
@@ -265,15 +228,6 @@ private:
     private:
         ResultFunctor functor;
         std::future<void> future;
-
-        template <class Archive>
-        void serialize(Archive& ar, const unsigned int) {
-            if (!Archive::is_loading::value && future.valid()) {
-                future.wait();
-            }
-            ar& functor;
-        }
-        friend class boost::serialization::access;
     };
 
 public:
@@ -378,17 +332,6 @@ private:
     std::array<std::vector<u8>, IPC::MAX_STATIC_BUFFERS> static_buffers;
     // The mapped buffers will be created when the IPC request is translated
     boost::container::small_vector<MappedBuffer, 8> request_mapped_buffers;
-
-    HLERequestContext();
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
-    friend class boost::serialization::access;
 };
 
 } // namespace Kernel
-
-BOOST_CLASS_EXPORT_KEY(Kernel::SessionRequestHandler)
-BOOST_CLASS_EXPORT_KEY(Kernel::SessionRequestHandler::SessionDataBase)
-BOOST_CLASS_EXPORT_KEY(Kernel::SessionRequestHandler::SessionInfo)
-BOOST_CLASS_EXPORT_KEY(Kernel::HLERequestContext)
-BOOST_CLASS_EXPORT_KEY(Kernel::HLERequestContext::ThreadCallback)
diff --git a/src/core/hle/kernel/ipc.cpp b/src/core/hle/kernel/ipc.cpp
index dcb8b8acd..1d26df7a2 100644
--- a/src/core/hle/kernel/ipc.cpp
+++ b/src/core/hle/kernel/ipc.cpp
@@ -3,9 +3,8 @@
 // Refer to the license.txt file included.
 
 #include <algorithm>
-#include <boost/serialization/shared_ptr.hpp>
 #include "common/alignment.h"
-#include "common/archives.h"
+
 #include "common/memory_ref.h"
 #include "core/core.h"
 #include "core/hle/ipc.h"
@@ -18,8 +17,6 @@
 #include "core/hle/kernel/thread.h"
 #include "core/memory.h"
 
-SERIALIZE_EXPORT_IMPL(Kernel::MappedBufferContext)
-
 namespace Kernel {
 
 Result TranslateCommandBuffer(Kernel::KernelSystem& kernel, Memory::MemorySystem& memory,
@@ -255,14 +252,4 @@ Result TranslateCommandBuffer(Kernel::KernelSystem& kernel, Memory::MemorySystem
     return ResultSuccess;
 }
 
-template <class Archive>
-void MappedBufferContext::serialize(Archive& ar, const unsigned int) {
-    ar& permissions;
-    ar& size;
-    ar& source_address;
-    ar& target_address;
-    ar& buffer;
-}
-SERIALIZE_IMPL(MappedBufferContext)
-
 } // namespace Kernel
diff --git a/src/core/hle/kernel/ipc.h b/src/core/hle/kernel/ipc.h
index fd69c3ef8..ec2a8e947 100644
--- a/src/core/hle/kernel/ipc.h
+++ b/src/core/hle/kernel/ipc.h
@@ -6,7 +6,6 @@
 
 #include <memory>
 #include <vector>
-#include <boost/serialization/export.hpp>
 #include "common/common_types.h"
 #include "core/hle/ipc.h"
 #include "core/hle/kernel/thread.h"
@@ -26,11 +25,6 @@ struct MappedBufferContext {
     VAddr target_address;
 
     std::shared_ptr<BackingMem> buffer;
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
-    friend class boost::serialization::access;
 };
 
 /// Performs IPC command buffer translation from one process to another.
@@ -40,5 +34,3 @@ Result TranslateCommandBuffer(KernelSystem& system, Memory::MemorySystem& memory
                               VAddr dst_address,
                               std::vector<MappedBufferContext>& mapped_buffer_context, bool reply);
 } // namespace Kernel
-
-BOOST_CLASS_EXPORT_KEY(Kernel::MappedBufferContext)
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp
index 7e685b11d..25f0e0175 100644
--- a/src/core/hle/kernel/kernel.cpp
+++ b/src/core/hle/kernel/kernel.cpp
@@ -2,11 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <boost/serialization/shared_ptr.hpp>
-#include <boost/serialization/unordered_map.hpp>
-#include <boost/serialization/vector.hpp>
-#include "common/archives.h"
-#include "common/serialization/atomic.h"
 #include "core/hle/kernel/client_port.h"
 #include "core/hle/kernel/config_mem.h"
 #include "core/hle/kernel/handle_table.h"
@@ -19,8 +14,6 @@
 #include "core/hle/kernel/thread.h"
 #include "core/hle/kernel/timer.h"
 
-SERIALIZE_EXPORT_IMPL(Kernel::New3dsHwCapabilities)
-
 namespace Kernel {
 
 /// Initialize the kernel
@@ -163,48 +156,4 @@ void KernelSystem::ResetThreadIDs() {
     next_thread_id = 0;
 }
 
-template <class Archive>
-void KernelSystem::serialize(Archive& ar, const unsigned int) {
-    ar& memory_regions;
-    ar& named_ports;
-    // current_cpu set externally
-    // NB: subsystem references and prepare_reschedule_callback are constant
-    ar&* resource_limits.get();
-    ar& next_object_id;
-    ar&* timer_manager.get();
-    ar& next_process_id;
-    ar& process_list;
-    ar& current_process;
-    // NB: core count checked in 'core'
-    for (auto& thread_manager : thread_managers) {
-        ar&* thread_manager.get();
-    }
-    ar& config_mem_handler;
-    ar& shared_page_handler;
-    ar& stored_processes;
-    ar& next_thread_id;
-    ar& memory_mode;
-    ar& n3ds_hw_caps;
-    ar& main_thread_extended_sleep;
-    // Deliberately don't include debugger info to allow debugging through loads
-
-    if (Archive::is_loading::value) {
-        for (auto& memory_region : memory_regions) {
-            memory_region->Unlock();
-        }
-        for (auto& process : process_list) {
-            process->vm_manager.Unlock();
-        }
-    }
-}
-SERIALIZE_IMPL(KernelSystem)
-
-template <class Archive>
-void New3dsHwCapabilities::serialize(Archive& ar, const unsigned int) {
-    ar& enable_l2_cache;
-    ar& enable_804MHz_cpu;
-    ar& memory_mode;
-}
-SERIALIZE_IMPL(New3dsHwCapabilities)
-
 } // namespace Kernel
diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h
index 8a30abe59..d0b4721ab 100644
--- a/src/core/hle/kernel/kernel.h
+++ b/src/core/hle/kernel/kernel.h
@@ -13,7 +13,6 @@
 #include <string>
 #include <unordered_map>
 #include <vector>
-#include <boost/serialization/export.hpp>
 #include "common/common_types.h"
 #include "core/hle/kernel/memory.h"
 #include "core/hle/result.h"
@@ -122,11 +121,6 @@ struct New3dsHwCapabilities {
     bool enable_l2_cache;         ///< Whether extra L2 cache should be enabled.
     bool enable_804MHz_cpu;       ///< Whether the CPU should run at 804MHz.
     New3dsMemoryMode memory_mode; ///< The New 3DS memory mode.
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
-    friend class boost::serialization::access;
 };
 
 class KernelSystem {
@@ -401,12 +395,6 @@ private:
      * to load and setup themselves before the game starts.
      */
     bool main_thread_extended_sleep = false;
-
-    friend class boost::serialization::access;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
 };
 
 } // namespace Kernel
-
-BOOST_CLASS_EXPORT_KEY(Kernel::New3dsHwCapabilities)
diff --git a/src/core/hle/kernel/memory.cpp b/src/core/hle/kernel/memory.cpp
index 006d89804..29aa454b7 100644
--- a/src/core/hle/kernel/memory.cpp
+++ b/src/core/hle/kernel/memory.cpp
@@ -4,10 +4,8 @@
 
 #include <algorithm>
 #include <memory>
-#include <utility>
 #include <vector>
-#include <boost/serialization/set.hpp>
-#include "common/archives.h"
+
 #include "common/assert.h"
 #include "common/common_types.h"
 #include "common/logging/log.h"
@@ -21,8 +19,6 @@
 #include "core/hle/result.h"
 #include "core/memory.h"
 
-SERIALIZE_EXPORT_IMPL(Kernel::MemoryRegionInfo)
-
 namespace Kernel {
 
 /// Size of the APPLICATION, SYSTEM and BASE memory regions (respectively) for each system
@@ -166,8 +162,6 @@ void KernelSystem::MapSharedPages(VMManager& address_space) {
 }
 
 void MemoryRegionInfo::Reset(u32 base, u32 size) {
-    ASSERT(!is_locked);
-
     this->base = base;
     this->size = size;
     used = 0;
@@ -178,8 +172,6 @@ void MemoryRegionInfo::Reset(u32 base, u32 size) {
 }
 
 MemoryRegionInfo::IntervalSet MemoryRegionInfo::HeapAllocate(u32 size) {
-    ASSERT(!is_locked);
-
     IntervalSet result;
     u32 rest = size;
 
@@ -207,8 +199,6 @@ MemoryRegionInfo::IntervalSet MemoryRegionInfo::HeapAllocate(u32 size) {
 }
 
 bool MemoryRegionInfo::LinearAllocate(u32 offset, u32 size) {
-    ASSERT(!is_locked);
-
     Interval interval(offset, offset + size);
     if (!boost::icl::contains(free_blocks, interval)) {
         // The requested range is already allocated
@@ -220,8 +210,6 @@ bool MemoryRegionInfo::LinearAllocate(u32 offset, u32 size) {
 }
 
 std::optional<u32> MemoryRegionInfo::LinearAllocate(u32 size) {
-    ASSERT(!is_locked);
-
     // Find the first sufficient continuous block from the lower address
     for (const auto& interval : free_blocks) {
         ASSERT(interval.bounds() == boost::icl::interval_bounds::right_open());
@@ -238,8 +226,6 @@ std::optional<u32> MemoryRegionInfo::LinearAllocate(u32 size) {
 }
 
 std::optional<u32> MemoryRegionInfo::RLinearAllocate(u32 size) {
-    ASSERT(!is_locked);
-
     // Find the first sufficient continuous block from the upper address
     for (auto iter = free_blocks.rbegin(); iter != free_blocks.rend(); ++iter) {
         auto interval = *iter;
@@ -257,30 +243,10 @@ std::optional<u32> MemoryRegionInfo::RLinearAllocate(u32 size) {
 }
 
 void MemoryRegionInfo::Free(u32 offset, u32 size) {
-    if (is_locked) {
-        return;
-    }
-
     Interval interval(offset, offset + size);
     ASSERT(!boost::icl::intersects(free_blocks, interval)); // must be allocated blocks
     free_blocks += interval;
     used -= size;
 }
 
-void MemoryRegionInfo::Unlock() {
-    is_locked = false;
-}
-
-template <class Archive>
-void MemoryRegionInfo::serialize(Archive& ar, const unsigned int) {
-    ar& base;
-    ar& size;
-    ar& used;
-    ar& free_blocks;
-    if (Archive::is_loading::value) {
-        is_locked = true;
-    }
-}
-SERIALIZE_IMPL(MemoryRegionInfo)
-
 } // namespace Kernel
diff --git a/src/core/hle/kernel/memory.h b/src/core/hle/kernel/memory.h
index 90b2aeee8..2482d6202 100644
--- a/src/core/hle/kernel/memory.h
+++ b/src/core/hle/kernel/memory.h
@@ -6,9 +6,7 @@
 
 #include <optional>
 #include <boost/icl/interval_set.hpp>
-#include <boost/serialization/export.hpp>
 #include "common/common_types.h"
-#include "common/serialization/boost_interval_set.hpp"
 
 namespace Kernel {
 
@@ -26,10 +24,6 @@ struct MemoryRegionInfo {
 
     IntervalSet free_blocks;
 
-    // When locked, Free calls will be ignored, while Allocate calls will hit an assert. A memory
-    // region locks itself after deserialization.
-    bool is_locked{};
-
     /**
      * Reset the allocator state
      * @param base The base offset the beginning of FCRAM.
@@ -74,18 +68,6 @@ struct MemoryRegionInfo {
      * @param size the size of the region to free.
      */
     void Free(u32 offset, u32 size);
-
-    /**
-     * Unlock the MemoryRegion. Used after loading is completed.
-     */
-    void Unlock();
-
-private:
-    friend class boost::serialization::access;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
 };
 
 } // namespace Kernel
-
-BOOST_CLASS_EXPORT_KEY(Kernel::MemoryRegionInfo)
diff --git a/src/core/hle/kernel/mutex.cpp b/src/core/hle/kernel/mutex.cpp
index 80b37666b..0e520945e 100644
--- a/src/core/hle/kernel/mutex.cpp
+++ b/src/core/hle/kernel/mutex.cpp
@@ -2,10 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <boost/serialization/base_object.hpp>
-#include <boost/serialization/shared_ptr.hpp>
-#include <boost/serialization/string.hpp>
-#include "common/archives.h"
 #include "common/assert.h"
 #include "core/core.h"
 #include "core/hle/kernel/errors.h"
@@ -15,8 +11,6 @@
 #include "core/hle/kernel/resource_limit.h"
 #include "core/hle/kernel/thread.h"
 
-SERIALIZE_EXPORT_IMPL(Kernel::Mutex)
-
 namespace Kernel {
 
 void ReleaseThreadMutexes(Thread* thread) {
@@ -130,15 +124,4 @@ void Mutex::UpdatePriority() {
     }
 }
 
-template <class Archive>
-void Mutex::serialize(Archive& ar, const unsigned int) {
-    ar& boost::serialization::base_object<WaitObject>(*this);
-    ar& lock_count;
-    ar& priority;
-    ar& name;
-    ar& holding_thread;
-    ar& resource_limit;
-}
-SERIALIZE_IMPL(Mutex)
-
 } // namespace Kernel
diff --git a/src/core/hle/kernel/mutex.h b/src/core/hle/kernel/mutex.h
index d09e5dcb0..3fdc899f0 100644
--- a/src/core/hle/kernel/mutex.h
+++ b/src/core/hle/kernel/mutex.h
@@ -6,7 +6,6 @@
 
 #include <memory>
 #include <string>
-#include <boost/serialization/export.hpp>
 #include "common/common_types.h"
 #include "core/hle/kernel/kernel.h"
 #include "core/hle/kernel/resource_limit.h"
@@ -61,10 +60,6 @@ public:
 
 private:
     KernelSystem& kernel;
-
-    friend class boost::serialization::access;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
 };
 
 /**
@@ -74,6 +69,3 @@ private:
 void ReleaseThreadMutexes(Thread* thread);
 
 } // namespace Kernel
-
-BOOST_CLASS_EXPORT_KEY(Kernel::Mutex)
-CONSTRUCT_KERNEL_OBJECT(Kernel::Mutex)
diff --git a/src/core/hle/kernel/object.cpp b/src/core/hle/kernel/object.cpp
index 1e32f6125..f9ca68218 100644
--- a/src/core/hle/kernel/object.cpp
+++ b/src/core/hle/kernel/object.cpp
@@ -6,10 +6,6 @@
 #include "core/hle/kernel/kernel.h"
 #include "core/hle/kernel/object.h"
 
-#include "common/archives.h"
-
-SERIALIZE_EXPORT_IMPL(Kernel::Object)
-
 namespace Kernel {
 
 Object::Object(KernelSystem& kernel) : object_id{kernel.GenerateObjectID()} {}
@@ -41,10 +37,4 @@ bool Object::IsWaitable() const {
     UNREACHABLE();
 }
 
-template <class Archive>
-void Object::serialize(Archive& ar, const unsigned int) {
-    ar& object_id;
-}
-SERIALIZE_IMPL(Object)
-
 } // namespace Kernel
diff --git a/src/core/hle/kernel/object.h b/src/core/hle/kernel/object.h
index 571ecd42f..50116cb5c 100644
--- a/src/core/hle/kernel/object.h
+++ b/src/core/hle/kernel/object.h
@@ -7,10 +7,8 @@
 #include <atomic>
 #include <memory>
 #include <string>
-#include <boost/serialization/export.hpp>
 #include "common/common_types.h"
-#include "common/serialization/atomic.h"
-#include "core/global.h"
+
 #include "core/hle/kernel/kernel.h"
 
 namespace Kernel {
@@ -67,10 +65,6 @@ public:
 
 private:
     std::atomic<u32> object_id;
-
-    friend class boost::serialization::access;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
 };
 
 template <typename T>
@@ -94,13 +88,3 @@ inline std::shared_ptr<T> DynamicObjectCast(std::shared_ptr<Object> object) {
 }
 
 } // namespace Kernel
-
-BOOST_CLASS_EXPORT_KEY(Kernel::Object)
-
-#define CONSTRUCT_KERNEL_OBJECT(T)                                                                 \
-    namespace boost::serialization {                                                               \
-    template <class Archive>                                                                       \
-    void load_construct_data(Archive& ar, T* t, const unsigned int file_version) {                 \
-        ::new (t) T(Core::Global<Kernel::KernelSystem>());                                         \
-    }                                                                                              \
-    }
diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp
index 3d0a315ef..5f489b888 100644
--- a/src/core/hle/kernel/process.cpp
+++ b/src/core/hle/kernel/process.cpp
@@ -4,17 +4,10 @@
 
 #include <algorithm>
 #include <memory>
-#include <boost/serialization/array.hpp>
-#include <boost/serialization/base_object.hpp>
-#include <boost/serialization/bitset.hpp>
-#include <boost/serialization/shared_ptr.hpp>
-#include <boost/serialization/string.hpp>
-#include <boost/serialization/vector.hpp>
-#include "common/archives.h"
+
 #include "common/assert.h"
 #include "common/common_funcs.h"
 #include "common/logging/log.h"
-#include "common/serialization/boost_vector.hpp"
 #include "core/core.h"
 #include "core/hle/kernel/errors.h"
 #include "core/hle/kernel/memory.h"
@@ -26,48 +19,8 @@
 #include "core/loader/loader.h"
 #include "core/memory.h"
 
-SERIALIZE_EXPORT_IMPL(Kernel::AddressMapping)
-SERIALIZE_EXPORT_IMPL(Kernel::Process)
-SERIALIZE_EXPORT_IMPL(Kernel::CodeSet)
-SERIALIZE_EXPORT_IMPL(Kernel::CodeSet::Segment)
-
 namespace Kernel {
 
-template <class Archive>
-void AddressMapping::serialize(Archive& ar, const unsigned int) {
-    ar& address;
-    ar& size;
-    ar& read_only;
-    ar& unk_flag;
-}
-SERIALIZE_IMPL(AddressMapping)
-
-template <class Archive>
-void Process::serialize(Archive& ar, const unsigned int) {
-    ar& boost::serialization::base_object<Object>(*this);
-    ar& handle_table;
-    ar& codeset; // TODO: Replace with apploader reference
-    ar& resource_limit;
-    ar& svc_access_mask;
-    ar& handle_table_size;
-    ar&(boost::container::vector<AddressMapping, boost::container::dtl::static_storage_allocator<
-                                                     AddressMapping, 8, 0, true>>&)address_mappings;
-    ar& flags.raw;
-    ar& no_thread_restrictions;
-    ar& kernel_version;
-    ar& ideal_processor;
-    ar& status;
-    ar& process_id;
-    ar& creation_time_ticks;
-    ar& vm_manager;
-    ar& memory_used;
-    ar& memory_region;
-    ar& holding_memory;
-    ar& holding_tls_memory;
-    ar& tls_slots;
-}
-SERIALIZE_IMPL(Process)
-
 std::shared_ptr<CodeSet> KernelSystem::CreateCodeSet(std::string name, u64 program_id) {
     auto codeset{std::make_shared<CodeSet>(*this)};
 
@@ -80,25 +33,6 @@ std::shared_ptr<CodeSet> KernelSystem::CreateCodeSet(std::string name, u64 progr
 CodeSet::CodeSet(KernelSystem& kernel) : Object(kernel) {}
 CodeSet::~CodeSet() {}
 
-template <class Archive>
-void CodeSet::serialize(Archive& ar, const unsigned int) {
-    ar& boost::serialization::base_object<Object>(*this);
-    ar& memory;
-    ar& segments;
-    ar& entrypoint;
-    ar& name;
-    ar& program_id;
-}
-SERIALIZE_IMPL(CodeSet)
-
-template <class Archive>
-void CodeSet::Segment::serialize(Archive& ar, const unsigned int) {
-    ar& offset;
-    ar& addr;
-    ar& size;
-}
-SERIALIZE_IMPL(CodeSet::Segment)
-
 std::shared_ptr<Process> KernelSystem::CreateProcess(std::shared_ptr<CodeSet> code_set) {
     auto process{std::make_shared<Process>(*this)};
 
diff --git a/src/core/hle/kernel/process.h b/src/core/hle/kernel/process.h
index 7ec1adfbb..93f727617 100644
--- a/src/core/hle/kernel/process.h
+++ b/src/core/hle/kernel/process.h
@@ -11,7 +11,6 @@
 #include <string>
 #include <vector>
 #include <boost/container/static_vector.hpp>
-#include <boost/serialization/export.hpp>
 #include "common/bit_field.h"
 #include "common/common_types.h"
 #include "core/hle/kernel/handle_table.h"
@@ -26,11 +25,6 @@ struct AddressMapping {
     u32 size;
     bool read_only;
     bool unk_flag;
-
-private:
-    friend class boost::serialization::access;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
 };
 
 union ProcessFlags {
@@ -65,11 +59,6 @@ public:
         std::size_t offset = 0;
         VAddr addr = 0;
         u32 size = 0;
-
-    private:
-        friend class boost::serialization::access;
-        template <class Archive>
-        void serialize(Archive& ar, const unsigned int);
     };
 
     std::string GetTypeName() const override {
@@ -117,11 +106,6 @@ public:
     std::string name;
     /// Title ID corresponding to the process
     u64 program_id;
-
-private:
-    friend class boost::serialization::access;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
 };
 
 class Process final : public Object {
@@ -230,17 +214,6 @@ private:
     void FreeAllMemory();
 
     KernelSystem& kernel;
-
-    friend class boost::serialization::access;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int file_version);
 };
 
 } // namespace Kernel
-
-BOOST_CLASS_EXPORT_KEY(Kernel::AddressMapping)
-BOOST_CLASS_EXPORT_KEY(Kernel::CodeSet)
-BOOST_CLASS_EXPORT_KEY(Kernel::CodeSet::Segment)
-BOOST_CLASS_EXPORT_KEY(Kernel::Process)
-CONSTRUCT_KERNEL_OBJECT(Kernel::CodeSet)
-CONSTRUCT_KERNEL_OBJECT(Kernel::Process)
diff --git a/src/core/hle/kernel/resource_limit.cpp b/src/core/hle/kernel/resource_limit.cpp
index 4575cab37..83dac992d 100644
--- a/src/core/hle/kernel/resource_limit.cpp
+++ b/src/core/hle/kernel/resource_limit.cpp
@@ -2,18 +2,10 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <boost/serialization/array.hpp>
-#include <boost/serialization/base_object.hpp>
-#include <boost/serialization/shared_ptr.hpp>
-#include <boost/serialization/string.hpp>
-#include "common/archives.h"
 #include "common/assert.h"
 #include "common/settings.h"
 #include "core/hle/kernel/resource_limit.h"
 
-SERIALIZE_EXPORT_IMPL(Kernel::ResourceLimit)
-SERIALIZE_EXPORT_IMPL(Kernel::ResourceLimitList)
-
 namespace Kernel {
 
 ResourceLimit::ResourceLimit(KernelSystem& kernel) : Object(kernel) {}
@@ -66,15 +58,6 @@ bool ResourceLimit::Release(ResourceLimitType type, s32 amount) {
     return true;
 }
 
-template <class Archive>
-void ResourceLimit::serialize(Archive& ar, const unsigned int) {
-    ar& boost::serialization::base_object<Object>(*this);
-    ar& m_name;
-    ar& m_limit_values;
-    ar& m_current_values;
-}
-SERIALIZE_IMPL(ResourceLimit)
-
 ResourceLimitList::ResourceLimitList(KernelSystem& kernel) {
     // PM makes APPMEMALLOC always match app RESLIMIT_COMMIT.
     // See: https://github.com/LumaTeam/Luma3DS/blob/e2778a45/sysmodules/pm/source/reslimit.c#L275
@@ -152,10 +135,4 @@ std::shared_ptr<ResourceLimit> ResourceLimitList::GetForCategory(ResourceLimitCa
     }
 }
 
-template <class Archive>
-void ResourceLimitList::serialize(Archive& ar, const unsigned int) {
-    ar& resource_limits;
-}
-SERIALIZE_IMPL(ResourceLimitList)
-
 } // namespace Kernel
diff --git a/src/core/hle/kernel/resource_limit.h b/src/core/hle/kernel/resource_limit.h
index 48235411e..0a168ca75 100644
--- a/src/core/hle/kernel/resource_limit.h
+++ b/src/core/hle/kernel/resource_limit.h
@@ -6,7 +6,6 @@
 
 #include <array>
 #include <memory>
-#include <boost/serialization/export.hpp>
 #include "common/common_types.h"
 #include "core/hle/kernel/object.h"
 
@@ -69,11 +68,6 @@ private:
     ResourceArray m_limit_values{};
     ResourceArray m_current_values{};
     std::string m_name;
-
-private:
-    friend class boost::serialization::access;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
 };
 
 class ResourceLimitList {
@@ -90,15 +84,6 @@ public:
 
 private:
     std::array<std::shared_ptr<ResourceLimit>, 4> resource_limits;
-
-    friend class boost::serialization::access;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
 };
 
 } // namespace Kernel
-
-BOOST_CLASS_EXPORT_KEY(Kernel::ResourceLimit)
-BOOST_CLASS_EXPORT_KEY(Kernel::ResourceLimitList)
-CONSTRUCT_KERNEL_OBJECT(Kernel::ResourceLimit)
-CONSTRUCT_KERNEL_OBJECT(Kernel::ResourceLimitList)
diff --git a/src/core/hle/kernel/semaphore.cpp b/src/core/hle/kernel/semaphore.cpp
index 5e3129ebb..62d9dd8a2 100644
--- a/src/core/hle/kernel/semaphore.cpp
+++ b/src/core/hle/kernel/semaphore.cpp
@@ -2,9 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <boost/serialization/base_object.hpp>
-#include <boost/serialization/string.hpp>
-#include "common/archives.h"
 #include "core/hle/kernel/errors.h"
 #include "core/hle/kernel/kernel.h"
 #include "core/hle/kernel/process.h"
@@ -12,8 +9,6 @@
 #include "core/hle/kernel/semaphore.h"
 #include "core/hle/kernel/thread.h"
 
-SERIALIZE_EXPORT_IMPL(Kernel::Semaphore)
-
 namespace Kernel {
 
 Semaphore::Semaphore(KernelSystem& kernel) : WaitObject(kernel) {}
@@ -60,14 +55,4 @@ Result Semaphore::Release(s32* out_count, s32 release_count) {
     return ResultSuccess;
 }
 
-template <class Archive>
-void Semaphore::serialize(Archive& ar, const unsigned int) {
-    ar& boost::serialization::base_object<WaitObject>(*this);
-    ar& max_count;
-    ar& available_count;
-    ar& name;
-    ar& resource_limit;
-}
-SERIALIZE_IMPL(Semaphore)
-
 } // namespace Kernel
diff --git a/src/core/hle/kernel/semaphore.h b/src/core/hle/kernel/semaphore.h
index a7d5f819a..203c8519c 100644
--- a/src/core/hle/kernel/semaphore.h
+++ b/src/core/hle/kernel/semaphore.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include <string>
-#include <boost/serialization/export.hpp>
 #include "common/common_types.h"
 #include "core/hle/kernel/object.h"
 #include "core/hle/kernel/wait_object.h"
@@ -46,14 +45,6 @@ public:
      * @return The number of free slots the semaphore had before this call
      */
     Result Release(s32* out_count, s32 release_count);
-
-private:
-    friend class boost::serialization::access;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
 };
 
 } // namespace Kernel
-
-BOOST_CLASS_EXPORT_KEY(Kernel::Semaphore)
-CONSTRUCT_KERNEL_OBJECT(Kernel::Semaphore)
diff --git a/src/core/hle/kernel/server_port.cpp b/src/core/hle/kernel/server_port.cpp
index 827fa0595..830133135 100644
--- a/src/core/hle/kernel/server_port.cpp
+++ b/src/core/hle/kernel/server_port.cpp
@@ -3,11 +3,7 @@
 // Refer to the license.txt file included.
 
 #include <tuple>
-#include <boost/serialization/base_object.hpp>
-#include <boost/serialization/shared_ptr.hpp>
-#include <boost/serialization/string.hpp>
-#include <boost/serialization/vector.hpp>
-#include "common/archives.h"
+
 #include "common/assert.h"
 #include "core/hle/kernel/client_port.h"
 #include "core/hle/kernel/errors.h"
@@ -17,8 +13,6 @@
 #include "core/hle/kernel/server_session.h"
 #include "core/hle/kernel/thread.h"
 
-SERIALIZE_EXPORT_IMPL(Kernel::ServerPort)
-
 namespace Kernel {
 
 ServerPort::ServerPort(KernelSystem& kernel) : WaitObject(kernel) {}
@@ -54,13 +48,4 @@ KernelSystem::PortPair KernelSystem::CreatePortPair(u32 max_sessions, std::strin
     return std::make_pair(std::move(server_port), std::move(client_port));
 }
 
-template <class Archive>
-void ServerPort::serialize(Archive& ar, const unsigned int) {
-    ar& boost::serialization::base_object<WaitObject>(*this);
-    ar& name;
-    ar& pending_sessions;
-    ar& hle_handler;
-}
-SERIALIZE_IMPL(ServerPort)
-
 } // namespace Kernel
diff --git a/src/core/hle/kernel/server_port.h b/src/core/hle/kernel/server_port.h
index 675a80e2b..02430d147 100644
--- a/src/core/hle/kernel/server_port.h
+++ b/src/core/hle/kernel/server_port.h
@@ -7,7 +7,6 @@
 #include <memory>
 #include <string>
 #include <tuple>
-#include <boost/serialization/export.hpp>
 #include "common/common_types.h"
 #include "core/hle/kernel/object.h"
 #include "core/hle/kernel/server_session.h"
@@ -62,14 +61,6 @@ public:
 
     bool ShouldWait(const Thread* thread) const override;
     void Acquire(Thread* thread) override;
-
-private:
-    friend class boost::serialization::access;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
 };
 
 } // namespace Kernel
-
-BOOST_CLASS_EXPORT_KEY(Kernel::ServerPort)
-CONSTRUCT_KERNEL_OBJECT(Kernel::ServerPort)
diff --git a/src/core/hle/kernel/server_session.cpp b/src/core/hle/kernel/server_session.cpp
index 1a5d39226..fb57803b1 100644
--- a/src/core/hle/kernel/server_session.cpp
+++ b/src/core/hle/kernel/server_session.cpp
@@ -3,10 +3,7 @@
 // Refer to the license.txt file included.
 
 #include <tuple>
-#include <boost/serialization/shared_ptr.hpp>
-#include <boost/serialization/string.hpp>
-#include <boost/serialization/vector.hpp>
-#include "common/archives.h"
+
 #include "core/hle/kernel/client_port.h"
 #include "core/hle/kernel/client_session.h"
 #include "core/hle/kernel/hle_ipc.h"
@@ -14,22 +11,8 @@
 #include "core/hle/kernel/session.h"
 #include "core/hle/kernel/thread.h"
 
-SERIALIZE_EXPORT_IMPL(Kernel::ServerSession)
-
 namespace Kernel {
 
-template <class Archive>
-void ServerSession::serialize(Archive& ar, const unsigned int) {
-    ar& boost::serialization::base_object<WaitObject>(*this);
-    ar& name;
-    ar& parent;
-    ar& hle_handler;
-    ar& pending_requesting_threads;
-    ar& currently_handling;
-    ar& mapped_buffer_context;
-}
-SERIALIZE_IMPL(ServerSession)
-
 ServerSession::ServerSession(KernelSystem& kernel) : WaitObject(kernel), kernel(kernel) {}
 ServerSession::~ServerSession() {
     // This destructor will be called automatically when the last ServerSession handle is closed by
diff --git a/src/core/hle/kernel/server_session.h b/src/core/hle/kernel/server_session.h
index 666ffe77b..6b7a31f87 100644
--- a/src/core/hle/kernel/server_session.h
+++ b/src/core/hle/kernel/server_session.h
@@ -6,7 +6,6 @@
 
 #include <memory>
 #include <string>
-#include <boost/serialization/export.hpp>
 #include "common/assert.h"
 #include "common/common_types.h"
 #include "core/hle/kernel/ipc.h"
@@ -105,13 +104,6 @@ private:
 
     friend class KernelSystem;
     KernelSystem& kernel;
-
-    friend class boost::serialization::access;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
 };
 
 } // namespace Kernel
-
-BOOST_CLASS_EXPORT_KEY(Kernel::ServerSession)
-CONSTRUCT_KERNEL_OBJECT(Kernel::ServerSession)
diff --git a/src/core/hle/kernel/session.cpp b/src/core/hle/kernel/session.cpp
index 1f79de1f9..fbb0f3004 100644
--- a/src/core/hle/kernel/session.cpp
+++ b/src/core/hle/kernel/session.cpp
@@ -2,23 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <boost/serialization/shared_ptr.hpp>
-#include "common/archives.h"
 #include "core/hle/kernel/client_port.h"
 #include "core/hle/kernel/client_session.h"
 #include "core/hle/kernel/server_session.h"
 #include "core/hle/kernel/session.h"
 
-SERIALIZE_EXPORT_IMPL(Kernel::Session)
-
-namespace Kernel {
-
-template <class Archive>
-void Session::serialize(Archive& ar, const unsigned int file_version) {
-    ar& client;
-    ar& server;
-    ar& port;
-}
-SERIALIZE_IMPL(Session)
-
-} // namespace Kernel
+namespace Kernel {} // namespace Kernel
diff --git a/src/core/hle/kernel/session.h b/src/core/hle/kernel/session.h
index 11e058914..17bb4d6c6 100644
--- a/src/core/hle/kernel/session.h
+++ b/src/core/hle/kernel/session.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include <memory>
-#include <boost/serialization/export.hpp>
 #include "core/hle/kernel/object.h"
 
 namespace Kernel {
@@ -25,12 +24,5 @@ public:
     ClientSession* client = nullptr;  ///< The client endpoint of the session.
     ServerSession* server = nullptr;  ///< The server endpoint of the session.
     std::shared_ptr<ClientPort> port; ///< The port that this session is associated with (optional).
-
-private:
-    friend class boost::serialization::access;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
 };
 } // namespace Kernel
-
-BOOST_CLASS_EXPORT_KEY(Kernel::Session)
diff --git a/src/core/hle/kernel/shared_memory.cpp b/src/core/hle/kernel/shared_memory.cpp
index 73d60a3c0..3ac901463 100644
--- a/src/core/hle/kernel/shared_memory.cpp
+++ b/src/core/hle/kernel/shared_memory.cpp
@@ -2,11 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <boost/serialization/base_object.hpp>
-#include <boost/serialization/string.hpp>
-#include <boost/serialization/utility.hpp>
-#include <boost/serialization/weak_ptr.hpp>
-#include "common/archives.h"
 #include "common/logging/log.h"
 #include "core/hle/kernel/errors.h"
 #include "core/hle/kernel/memory.h"
@@ -14,8 +9,6 @@
 #include "core/hle/kernel/shared_memory.h"
 #include "core/memory.h"
 
-SERIALIZE_EXPORT_IMPL(Kernel::SharedMemory)
-
 namespace Kernel {
 
 SharedMemory::SharedMemory(KernelSystem& kernel) : Object(kernel), kernel(kernel) {}
@@ -221,20 +214,4 @@ const u8* SharedMemory::GetPointer(u32 offset) const {
     return backing_blocks[0].first + offset;
 }
 
-template <class Archive>
-void SharedMemory::serialize(Archive& ar, const unsigned int) {
-    ar& boost::serialization::base_object<Object>(*this);
-    ar& linear_heap_phys_offset;
-    ar& backing_blocks;
-    ar& size;
-    ar& memory_region;
-    ar& permissions;
-    ar& other_permissions;
-    ar& owner_process;
-    ar& base_address;
-    ar& name;
-    ar& holding_memory;
-}
-SERIALIZE_IMPL(SharedMemory)
-
 } // namespace Kernel
diff --git a/src/core/hle/kernel/shared_memory.h b/src/core/hle/kernel/shared_memory.h
index c2ac11ab3..edbc93869 100644
--- a/src/core/hle/kernel/shared_memory.h
+++ b/src/core/hle/kernel/shared_memory.h
@@ -6,7 +6,6 @@
 
 #include <string>
 #include <utility>
-#include <boost/serialization/export.hpp>
 #include "common/common_types.h"
 #include "common/memory_ref.h"
 #include "core/hle/kernel/object.h"
@@ -108,13 +107,6 @@ private:
 
     friend class KernelSystem;
     KernelSystem& kernel;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
-    friend class boost::serialization::access;
 };
 
 } // namespace Kernel
-
-BOOST_CLASS_EXPORT_KEY(Kernel::SharedMemory)
-CONSTRUCT_KERNEL_OBJECT(Kernel::SharedMemory)
diff --git a/src/core/hle/kernel/shared_page.cpp b/src/core/hle/kernel/shared_page.cpp
index ef7f1690c..e548c425c 100644
--- a/src/core/hle/kernel/shared_page.cpp
+++ b/src/core/hle/kernel/shared_page.cpp
@@ -4,9 +4,7 @@
 
 #include <chrono>
 #include <cstring>
-#include <boost/serialization/base_object.hpp>
-#include <boost/serialization/binary_object.hpp>
-#include "common/archives.h"
+
 #include "common/assert.h"
 #include "common/settings.h"
 #include "core/core.h"
@@ -15,20 +13,6 @@
 #include "core/hle/service/ptm/ptm.h"
 #include "core/movie.h"
 
-SERIALIZE_EXPORT_IMPL(SharedPage::Handler)
-
-namespace boost::serialization {
-
-template <class Archive>
-void load_construct_data(Archive& ar, SharedPage::Handler* t, const unsigned int) {
-    ::new (t) SharedPage::Handler(Core::System::GetInstance().CoreTiming(),
-                                  Core::System::GetInstance().Movie().GetOverrideInitTime());
-}
-template void load_construct_data<iarchive>(iarchive& ar, SharedPage::Handler* t,
-                                            const unsigned int);
-
-} // namespace boost::serialization
-
 namespace SharedPage {
 
 static std::chrono::seconds GetInitTime(u64 override_init_time) {
@@ -174,11 +158,4 @@ SharedPageDef& Handler::GetSharedPage() {
     return shared_page;
 }
 
-template <class Archive>
-void Handler::serialize(Archive& ar, const unsigned int) {
-    ar& boost::serialization::base_object<BackingMem>(*this);
-    ar& boost::serialization::make_binary_object(&shared_page, sizeof(shared_page));
-}
-SERIALIZE_IMPL(Handler)
-
 } // namespace SharedPage
diff --git a/src/core/hle/kernel/shared_page.h b/src/core/hle/kernel/shared_page.h
index d39c4c43d..5528732d3 100644
--- a/src/core/hle/kernel/shared_page.h
+++ b/src/core/hle/kernel/shared_page.h
@@ -13,7 +13,6 @@
 #include <chrono>
 #include <ctime>
 #include <memory>
-#include <boost/serialization/export.hpp>
 #include "common/bit_field.h"
 #include "common/common_funcs.h"
 #include "common/common_types.h"
@@ -137,19 +136,6 @@ private:
     std::chrono::seconds init_time;
 
     SharedPageDef shared_page;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
-    friend class boost::serialization::access;
 };
 
 } // namespace SharedPage
-
-namespace boost::serialization {
-
-template <class Archive>
-void load_construct_data(Archive& ar, SharedPage::Handler* t, const unsigned int);
-
-} // namespace boost::serialization
-
-BOOST_CLASS_EXPORT_KEY(SharedPage::Handler)
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp
index f3204fca1..0429b9741 100644
--- a/src/core/hle/kernel/svc.cpp
+++ b/src/core/hle/kernel/svc.cpp
@@ -6,7 +6,7 @@
 #include <array>
 #include <chrono>
 #include <fmt/format.h>
-#include "common/archives.h"
+
 #include "common/logging/log.h"
 #include "common/microprofile.h"
 #include "common/scm_rev.h"
@@ -696,14 +696,6 @@ public:
 
 private:
     bool do_output;
-
-    SVC_SyncCallback() = default;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& boost::serialization::base_object<Kernel::WakeupCallback>(*this);
-        ar& do_output;
-    }
-    friend class boost::serialization::access;
 };
 
 class SVC_IPCCallback : public Kernel::WakeupCallback {
@@ -729,14 +721,6 @@ public:
 
 private:
     Core::System& system;
-
-    SVC_IPCCallback() : system(Core::Global<Core::System>()) {}
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& boost::serialization::base_object<Kernel::WakeupCallback>(*this);
-    }
-    friend class boost::serialization::access;
 };
 
 /// Wait for a handle to synchronize, timeout after the specified nanoseconds
@@ -2306,6 +2290,3 @@ void SVCContext::CallSVC(u32 immediate) {
 }
 
 } // namespace Kernel
-
-SERIALIZE_EXPORT_IMPL(Kernel::SVC_SyncCallback)
-SERIALIZE_EXPORT_IMPL(Kernel::SVC_IPCCallback)
diff --git a/src/core/hle/kernel/svc.h b/src/core/hle/kernel/svc.h
index 4cf265400..91770b09e 100644
--- a/src/core/hle/kernel/svc.h
+++ b/src/core/hle/kernel/svc.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include <memory>
-#include <boost/serialization/export.hpp>
 #include "common/common_types.h"
 
 namespace Core {
@@ -30,6 +29,3 @@ class SVC_SyncCallback;
 class SVC_IPCCallback;
 
 } // namespace Kernel
-
-BOOST_CLASS_EXPORT_KEY(Kernel::SVC_SyncCallback)
-BOOST_CLASS_EXPORT_KEY(Kernel::SVC_IPCCallback)
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp
index b531ae97f..6ad632cfa 100644
--- a/src/core/hle/kernel/thread.cpp
+++ b/src/core/hle/kernel/thread.cpp
@@ -4,15 +4,10 @@
 
 #include <algorithm>
 #include <climits>
-#include <boost/serialization/string.hpp>
-#include <boost/serialization/unordered_map.hpp>
-#include <boost/serialization/vector.hpp>
-#include <boost/serialization/weak_ptr.hpp>
-#include "common/archives.h"
+
 #include "common/assert.h"
 #include "common/common_types.h"
 #include "common/logging/log.h"
-#include "common/serialization/boost_flat_set.h"
 #include "common/settings.h"
 #include "core/arm/arm_interface.h"
 #include "core/arm/skyeye_common/armstate.h"
@@ -26,47 +21,8 @@
 #include "core/hle/result.h"
 #include "core/memory.h"
 
-SERIALIZE_EXPORT_IMPL(Kernel::Thread)
-SERIALIZE_EXPORT_IMPL(Kernel::WakeupCallback)
-
 namespace Kernel {
 
-template <class Archive>
-void ThreadManager::serialize(Archive& ar, const unsigned int) {
-    ar& current_thread;
-    ar& ready_queue;
-    ar& wakeup_callback_table;
-    ar& thread_list;
-}
-SERIALIZE_IMPL(ThreadManager)
-
-template <class Archive>
-void Thread::serialize(Archive& ar, const unsigned int file_version) {
-    ar& boost::serialization::base_object<WaitObject>(*this);
-    ar& context;
-    ar& thread_id;
-    ar& status;
-    ar& entry_point;
-    ar& stack_top;
-    ar& nominal_priority;
-    ar& current_priority;
-    ar& last_running_ticks;
-    ar& processor_id;
-    ar& tls_address;
-    ar& held_mutexes;
-    ar& pending_mutexes;
-    ar& owner_process;
-    ar& wait_objects;
-    ar& wait_address;
-    ar& name;
-    ar& wakeup_callback;
-}
-SERIALIZE_IMPL(Thread)
-
-template <class Archive>
-void WakeupCallback::serialize(Archive& ar, const unsigned int) {}
-SERIALIZE_IMPL(WakeupCallback)
-
 bool Thread::ShouldWait(const Thread* thread) const {
     return status != ThreadStatus::Dead;
 }
diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h
index 65b1cd7e6..dcd19579d 100644
--- a/src/core/hle/kernel/thread.h
+++ b/src/core/hle/kernel/thread.h
@@ -10,7 +10,6 @@
 #include <unordered_map>
 #include <vector>
 #include <boost/container/flat_set.hpp>
-#include <boost/serialization/export.hpp>
 #include "common/common_types.h"
 #include "common/thread_queue_list.h"
 #include "core/arm/arm_interface.h"
@@ -66,11 +65,6 @@ public:
     virtual ~WakeupCallback() = default;
     virtual void WakeUp(ThreadWakeupReason reason, std::shared_ptr<Thread> thread,
                         std::shared_ptr<WaitObject> object) = 0;
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
-    friend class boost::serialization::access;
 };
 
 class ThreadManager {
@@ -158,10 +152,6 @@ private:
 
     friend class Thread;
     friend class KernelSystem;
-
-    friend class boost::serialization::access;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
 };
 
 class Thread final : public WaitObject {
@@ -325,10 +315,6 @@ public:
 
 private:
     ThreadManager& thread_manager;
-
-    friend class boost::serialization::access;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
 };
 
 /**
@@ -343,22 +329,3 @@ std::shared_ptr<Thread> SetupMainThread(KernelSystem& kernel, u32 entry_point, u
                                         std::shared_ptr<Process> owner_process);
 
 } // namespace Kernel
-
-BOOST_CLASS_EXPORT_KEY(Kernel::Thread)
-BOOST_CLASS_EXPORT_KEY(Kernel::WakeupCallback)
-
-namespace boost::serialization {
-
-template <class Archive>
-void save_construct_data(Archive& ar, const Kernel::Thread* t, const unsigned int) {
-    ar << t->core_id;
-}
-
-template <class Archive>
-void load_construct_data(Archive& ar, Kernel::Thread* t, const unsigned int) {
-    u32 core_id;
-    ar >> core_id;
-    ::new (t) Kernel::Thread(Core::Global<Kernel::KernelSystem>(), core_id);
-}
-
-} // namespace boost::serialization
diff --git a/src/core/hle/kernel/timer.cpp b/src/core/hle/kernel/timer.cpp
index 4274dbc6a..b2930cf80 100644
--- a/src/core/hle/kernel/timer.cpp
+++ b/src/core/hle/kernel/timer.cpp
@@ -2,9 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <boost/serialization/string.hpp>
-#include <boost/serialization/unordered_map.hpp>
-#include "common/archives.h"
 #include "common/assert.h"
 #include "common/logging/log.h"
 #include "core/core.h"
@@ -15,8 +12,6 @@
 #include "core/hle/kernel/thread.h"
 #include "core/hle/kernel/timer.h"
 
-SERIALIZE_EXPORT_IMPL(Kernel::Timer)
-
 namespace Kernel {
 
 Timer::Timer(KernelSystem& kernel)
@@ -99,19 +94,6 @@ void Timer::Signal(s64 cycles_late) {
     }
 }
 
-template <class Archive>
-void Timer::serialize(Archive& ar, const unsigned int) {
-    ar& boost::serialization::base_object<WaitObject>(*this);
-    ar& reset_type;
-    ar& initial_delay;
-    ar& interval_delay;
-    ar& signaled;
-    ar& name;
-    ar& callback_id;
-    ar& resource_limit;
-}
-SERIALIZE_IMPL(Timer)
-
 /// The timer callback event, called when a timer is fired
 void TimerManager::TimerCallback(u64 callback_id, s64 cycles_late) {
     std::shared_ptr<Timer> timer = SharedFrom(timer_callback_table.at(callback_id));
@@ -131,11 +113,4 @@ TimerManager::TimerManager(Core::Timing& timing) : timing(timing) {
         });
 }
 
-template <class Archive>
-void TimerManager::serialize(Archive& ar, const unsigned int) {
-    ar& next_timer_callback_id;
-    ar& timer_callback_table;
-}
-SERIALIZE_IMPL(TimerManager)
-
 } // namespace Kernel
diff --git a/src/core/hle/kernel/timer.h b/src/core/hle/kernel/timer.h
index 890d69339..1627ba3d3 100644
--- a/src/core/hle/kernel/timer.h
+++ b/src/core/hle/kernel/timer.h
@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include <boost/serialization/export.hpp>
 #include "common/common_types.h"
 #include "core/core_timing.h"
 #include "core/hle/kernel/object.h"
@@ -34,10 +33,6 @@ private:
 
     friend class Timer;
     friend class KernelSystem;
-
-    friend class boost::serialization::access;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
 };
 
 class ResourceLimit;
@@ -112,13 +107,6 @@ private:
     TimerManager& timer_manager;
 
     friend class KernelSystem;
-
-    friend class boost::serialization::access;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
 };
 
 } // namespace Kernel
-
-BOOST_CLASS_EXPORT_KEY(Kernel::Timer)
-CONSTRUCT_KERNEL_OBJECT(Kernel::Timer)
diff --git a/src/core/hle/kernel/vm_manager.cpp b/src/core/hle/kernel/vm_manager.cpp
index 1df94d89e..89abc813d 100644
--- a/src/core/hle/kernel/vm_manager.cpp
+++ b/src/core/hle/kernel/vm_manager.cpp
@@ -4,10 +4,7 @@
 
 #include <algorithm>
 #include <iterator>
-#include <boost/serialization/map.hpp>
-#include <boost/serialization/shared_ptr.hpp>
-#include <boost/serialization/split_member.hpp>
-#include "common/archives.h"
+
 #include "common/assert.h"
 #include "core/core.h"
 #include "core/hle/kernel/errors.h"
@@ -15,8 +12,6 @@
 #include "core/hle/service/plgldr/plgldr.h"
 #include "core/memory.h"
 
-SERIALIZE_EXPORT_IMPL(Kernel::VirtualMemoryArea)
-
 namespace Kernel {
 
 static const char* GetMemoryStateName(MemoryState state) {
@@ -41,17 +36,6 @@ bool VirtualMemoryArea::CanBeMergedWith(const VirtualMemoryArea& next) const {
     return true;
 }
 
-template <class Archive>
-void VirtualMemoryArea::serialize(Archive& ar, const unsigned int) {
-    ar& base;
-    ar& size;
-    ar& type;
-    ar& permissions;
-    ar& meminfo_state;
-    ar& backing_memory;
-}
-SERIALIZE_IMPL(VirtualMemoryArea)
-
 VMManager::VMManager(Memory::MemorySystem& memory, Kernel::Process& proc)
     : page_table(std::make_shared<Memory::PageTable>()), memory(memory), process(proc) {
     Reset();
@@ -60,8 +44,6 @@ VMManager::VMManager(Memory::MemorySystem& memory, Kernel::Process& proc)
 VMManager::~VMManager() = default;
 
 void VMManager::Reset() {
-    ASSERT(!is_locked);
-
     vma_map.clear();
 
     // Initialize the map with a single free region covering the entire managed space.
@@ -84,8 +66,6 @@ VMManager::VMAHandle VMManager::FindVMA(VAddr target) const {
 
 ResultVal<VAddr> VMManager::MapBackingMemoryToBase(VAddr base, u32 region_size, MemoryRef memory,
                                                    u32 size, MemoryState state) {
-    ASSERT(!is_locked);
-
     // Find the first Free VMA.
     VMAHandle vma_handle = std::find_if(vma_map.begin(), vma_map.end(), [&](const auto& vma) {
         if (vma.second.type != VMAType::Free)
@@ -114,7 +94,6 @@ ResultVal<VAddr> VMManager::MapBackingMemoryToBase(VAddr base, u32 region_size,
 
 ResultVal<VMManager::VMAHandle> VMManager::MapBackingMemory(VAddr target, MemoryRef memory,
                                                             u32 size, MemoryState state) {
-    ASSERT(!is_locked);
     ASSERT(memory.GetPtr() != nullptr);
 
     // This is the appropriately sized VMA that will turn into our allocation.
@@ -134,10 +113,6 @@ ResultVal<VMManager::VMAHandle> VMManager::MapBackingMemory(VAddr target, Memory
 Result VMManager::ChangeMemoryState(VAddr target, u32 size, MemoryState expected_state,
                                     VMAPermission expected_perms, MemoryState new_state,
                                     VMAPermission new_perms) {
-    if (is_locked) {
-        return ResultSuccess;
-    }
-
     VAddr target_end = target + size;
     VMAIter begin_vma = StripIterConstness(FindVMA(target));
     VMAIter i_end = vma_map.lower_bound(target_end);
@@ -172,8 +147,6 @@ Result VMManager::ChangeMemoryState(VAddr target, u32 size, MemoryState expected
 }
 
 VMManager::VMAIter VMManager::Unmap(VMAIter vma_handle) {
-    ASSERT(!is_locked);
-
     VirtualMemoryArea& vma = vma_handle->second;
     vma.type = VMAType::Free;
     vma.permissions = VMAPermission::None;
@@ -186,8 +159,6 @@ VMManager::VMAIter VMManager::Unmap(VMAIter vma_handle) {
 }
 
 Result VMManager::UnmapRange(VAddr target, u32 size) {
-    ASSERT(!is_locked);
-
     CASCADE_RESULT(VMAIter vma, CarveVMARange(target, size));
     const VAddr target_end = target + size;
 
@@ -203,8 +174,6 @@ Result VMManager::UnmapRange(VAddr target, u32 size) {
 }
 
 VMManager::VMAHandle VMManager::Reprotect(VMAHandle vma_handle, VMAPermission new_perms) {
-    ASSERT(!is_locked);
-
     VMAIter iter = StripIterConstness(vma_handle);
 
     VirtualMemoryArea& vma = iter->second;
@@ -215,8 +184,6 @@ VMManager::VMAHandle VMManager::Reprotect(VMAHandle vma_handle, VMAPermission ne
 }
 
 Result VMManager::ReprotectRange(VAddr target, u32 size, VMAPermission new_perms) {
-    ASSERT(!is_locked);
-
     CASCADE_RESULT(VMAIter vma, CarveVMARange(target, size));
     const VAddr target_end = target + size;
 
@@ -242,10 +209,6 @@ void VMManager::LogLayout(Common::Log::Level log_level) const {
     }
 }
 
-void VMManager::Unlock() {
-    is_locked = false;
-}
-
 VMManager::VMAIter VMManager::StripIterConstness(const VMAHandle& iter) {
     // This uses a neat C++ trick to convert a const_iterator to a regular iterator, given
     // non-const access to its container.
@@ -397,14 +360,4 @@ ResultVal<std::vector<std::pair<MemoryRef, u32>>> VMManager::GetBackingBlocksFor
     return backing_blocks;
 }
 
-template <class Archive>
-void VMManager::serialize(Archive& ar, const unsigned int) {
-    ar& vma_map;
-    ar& page_table;
-    if (Archive::is_loading::value) {
-        is_locked = true;
-    }
-}
-SERIALIZE_IMPL(VMManager)
-
 } // namespace Kernel
diff --git a/src/core/hle/kernel/vm_manager.h b/src/core/hle/kernel/vm_manager.h
index c1b696664..8ce61c384 100644
--- a/src/core/hle/kernel/vm_manager.h
+++ b/src/core/hle/kernel/vm_manager.h
@@ -6,7 +6,6 @@
 
 #include <map>
 #include <memory>
-#include <boost/serialization/export.hpp>
 #include "common/common_types.h"
 #include "common/memory_ref.h"
 #include "core/hle/kernel/memory.h"
@@ -73,11 +72,6 @@ struct VirtualMemoryArea {
 
     /// Tests if this area can be merged to the right with `next`.
     bool CanBeMergedWith(const VirtualMemoryArea& next) const;
-
-private:
-    friend class boost::serialization::access;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
 };
 
 /**
@@ -223,15 +217,5 @@ private:
 
     Memory::MemorySystem& memory;
     Kernel::Process& process;
-
-    // When locked, ChangeMemoryState calls will be ignored, other modification calls will hit an
-    // assert. VMManager locks itself after deserialization.
-    bool is_locked{};
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
-    friend class boost::serialization::access;
 };
 } // namespace Kernel
-
-BOOST_CLASS_EXPORT_KEY(Kernel::VirtualMemoryArea)
diff --git a/src/core/hle/kernel/wait_object.cpp b/src/core/hle/kernel/wait_object.cpp
index f528d9073..08d874934 100644
--- a/src/core/hle/kernel/wait_object.cpp
+++ b/src/core/hle/kernel/wait_object.cpp
@@ -4,10 +4,7 @@
 
 #include <algorithm>
 #include <utility>
-#include <boost/serialization/base_object.hpp>
-#include <boost/serialization/shared_ptr.hpp>
-#include <boost/serialization/vector.hpp>
-#include "common/archives.h"
+
 #include "common/assert.h"
 #include "common/logging/log.h"
 #include "core/hle/kernel/errors.h"
@@ -18,19 +15,8 @@
 #include "core/hle/kernel/thread.h"
 #include "core/hle/kernel/timer.h"
 
-SERIALIZE_EXPORT_IMPL(Kernel::WaitObject)
-
 namespace Kernel {
 
-template <class Archive>
-void WaitObject::serialize(Archive& ar, const unsigned int) {
-    ar& boost::serialization::base_object<Object>(*this);
-    ar& waiting_threads;
-    // NB: hle_notifier *not* serialized since it's a callback!
-    // Fortunately it's only used in one place (DSP) so we can reconstruct it there
-}
-SERIALIZE_IMPL(WaitObject)
-
 void WaitObject::AddWaitingThread(std::shared_ptr<Thread> thread) {
     auto itr = std::find(waiting_threads.begin(), waiting_threads.end(), thread);
     if (itr == waiting_threads.end())
diff --git a/src/core/hle/kernel/wait_object.h b/src/core/hle/kernel/wait_object.h
index 9215a2ea1..41e803515 100644
--- a/src/core/hle/kernel/wait_object.h
+++ b/src/core/hle/kernel/wait_object.h
@@ -62,11 +62,6 @@ private:
 
     /// Function to call when this object becomes available
     std::function<void()> hle_notifier;
-
-private:
-    friend class boost::serialization::access;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
 };
 
 // Specialization of DynamicObjectCast for WaitObjects
@@ -79,5 +74,3 @@ inline std::shared_ptr<WaitObject> DynamicObjectCast<WaitObject>(std::shared_ptr
 }
 
 } // namespace Kernel
-
-BOOST_CLASS_EXPORT_KEY(Kernel::WaitObject)
diff --git a/src/core/hle/mii.cpp b/src/core/hle/mii.cpp
index 8862b491a..23c6ec540 100644
--- a/src/core/hle/mii.cpp
+++ b/src/core/hle/mii.cpp
@@ -3,28 +3,14 @@
 // Refer to the license.txt file included.
 
 #include <boost/crc.hpp>
-#include <boost/serialization/binary_object.hpp>
-#include "common/archives.h"
+
 #include "core/hle/mii.h"
 
-SERIALIZE_EXPORT_IMPL(Mii::MiiData)
-SERIALIZE_EXPORT_IMPL(Mii::ChecksummedMiiData)
-
 namespace Mii {
-template <class Archive>
-void MiiData::serialize(Archive& ar, const unsigned int) {
-    ar& boost::serialization::make_binary_object(this, sizeof(MiiData));
-}
-SERIALIZE_IMPL(MiiData)
-
-template <class Archive>
-void ChecksummedMiiData::serialize(Archive& ar, const unsigned int) {
-    ar& boost::serialization::make_binary_object(this, sizeof(ChecksummedMiiData));
-}
-SERIALIZE_IMPL(ChecksummedMiiData)
 
 u16 ChecksummedMiiData::CalculateChecksum() {
     // Calculate the checksum of the selected Mii, see https://www.3dbrew.org/wiki/Mii#Checksum
     return boost::crc<16, 0x1021, 0, 0, false, false>(this, offsetof(ChecksummedMiiData, crc16));
 }
+
 } // namespace Mii
diff --git a/src/core/hle/mii.h b/src/core/hle/mii.h
index c7bc0e5ee..7df865fdf 100644
--- a/src/core/hle/mii.h
+++ b/src/core/hle/mii.h
@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include <boost/serialization/export.hpp>
 #include "common/bit_field.h"
 #include "common/common_types.h"
 
@@ -175,10 +174,6 @@ struct MiiData {
     } mole_details;
 
     Nickname author_name; ///< Name of Mii's author (Encoded using UTF16)
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
-    friend class boost::serialization::access;
 };
 
 static_assert(sizeof(MiiData) == 0x5C, "MiiData structure has incorrect size");
@@ -224,11 +219,6 @@ public:
     void FixChecksum() {
         crc16 = CalculateChecksum();
     }
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
-    friend class boost::serialization::access;
 };
 #pragma pack(pop)
 static_assert(sizeof(ChecksummedMiiData) == 0x60,
@@ -237,6 +227,3 @@ static_assert(std::is_trivial_v<ChecksummedMiiData>, "ChecksummedMiiData must be
 static_assert(std::is_trivially_copyable_v<ChecksummedMiiData>,
               "ChecksummedMiiData must be trivially copyable.");
 } // namespace Mii
-
-BOOST_CLASS_EXPORT_KEY(Mii::MiiData)
-BOOST_CLASS_EXPORT_KEY(Mii::ChecksummedMiiData)
diff --git a/src/core/hle/result.h b/src/core/hle/result.h
index 3c7a9c855..b3e154af0 100644
--- a/src/core/hle/result.h
+++ b/src/core/hle/result.h
@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include <boost/serialization/access.hpp>
 #include "common/assert.h"
 #include "common/bit_field.h"
 #include "common/common_funcs.h"
@@ -225,13 +224,6 @@ union Result {
     constexpr bool IsError() const {
         return is_error.ExtractValue(raw) == 1;
     }
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& raw;
-    }
-    friend class boost::serialization::access;
 };
 
 constexpr bool operator==(const Result& a, const Result& b) {
diff --git a/src/core/hle/service/ac/ac.cpp b/src/core/hle/service/ac/ac.cpp
index a71903028..7914ad4b0 100644
--- a/src/core/hle/service/ac/ac.cpp
+++ b/src/core/hle/service/ac/ac.cpp
@@ -3,7 +3,7 @@
 // Refer to the license.txt file included.
 
 #include <vector>
-#include "common/archives.h"
+
 #include "common/common_types.h"
 #include "common/logging/log.h"
 #include "common/settings.h"
@@ -20,9 +20,6 @@
 #include "core/hle/service/soc/soc_u.h"
 #include "core/memory.h"
 
-SERIALIZE_EXPORT_IMPL(Service::AC::Module)
-SERVICE_CONSTRUCT_IMPL(Service::AC::Module)
-
 namespace Service::AC {
 void Module::Interface::CreateDefaultConfig(Kernel::HLERequestContext& ctx) {
     IPC::RequestParser rp(ctx);
@@ -204,14 +201,4 @@ void InstallInterfaces(Core::System& system) {
 
 Module::Module(Core::System& system_) : system(system_) {}
 
-template <class Archive>
-void Module::serialize(Archive& ar, const unsigned int) {
-    ar& ac_connected;
-    ar& close_event;
-    ar& connect_event;
-    ar& disconnect_event;
-    // default_config is never written to
-}
-SERIALIZE_IMPL(Module)
-
 } // namespace Service::AC
diff --git a/src/core/hle/service/ac/ac.h b/src/core/hle/service/ac/ac.h
index 2b0d2e5ce..473b0d60b 100644
--- a/src/core/hle/service/ac/ac.h
+++ b/src/core/hle/service/ac/ac.h
@@ -173,15 +173,8 @@ protected:
 
 private:
     Core::System& system;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
-    friend class boost::serialization::access;
 };
 
 void InstallInterfaces(Core::System& system);
 
 } // namespace Service::AC
-
-BOOST_CLASS_EXPORT_KEY(Service::AC::Module)
-SERVICE_CONSTRUCT(Service::AC::Module)
diff --git a/src/core/hle/service/ac/ac_i.cpp b/src/core/hle/service/ac/ac_i.cpp
index f7766b324..a3cae61c9 100644
--- a/src/core/hle/service/ac/ac_i.cpp
+++ b/src/core/hle/service/ac/ac_i.cpp
@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/ac/ac_i.h"
 
 namespace Service::AC {
@@ -37,5 +36,3 @@ AC_I::AC_I(std::shared_ptr<Module> ac) : Module::Interface(std::move(ac), "ac:i"
 }
 
 } // namespace Service::AC
-
-SERIALIZE_EXPORT_IMPL(Service::AC::AC_I)
diff --git a/src/core/hle/service/ac/ac_i.h b/src/core/hle/service/ac/ac_i.h
index 8e852fb9b..bca91aabe 100644
--- a/src/core/hle/service/ac/ac_i.h
+++ b/src/core/hle/service/ac/ac_i.h
@@ -12,12 +12,6 @@ namespace Service::AC {
 class AC_I final : public Module::Interface {
 public:
     explicit AC_I(std::shared_ptr<Module> ac);
-
-private:
-    SERVICE_SERIALIZATION(AC_I, ac, Module)
 };
 
 } // namespace Service::AC
-
-BOOST_CLASS_EXPORT_KEY(Service::AC::AC_I)
-BOOST_SERIALIZATION_CONSTRUCT(Service::AC::AC_I)
diff --git a/src/core/hle/service/ac/ac_u.cpp b/src/core/hle/service/ac/ac_u.cpp
index 12506962c..d24c5ca50 100644
--- a/src/core/hle/service/ac/ac_u.cpp
+++ b/src/core/hle/service/ac/ac_u.cpp
@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/ac/ac_u.h"
 
 namespace Service::AC {
@@ -37,5 +36,3 @@ AC_U::AC_U(std::shared_ptr<Module> ac) : Module::Interface(std::move(ac), "ac:u"
 }
 
 } // namespace Service::AC
-
-SERIALIZE_EXPORT_IMPL(Service::AC::AC_U)
diff --git a/src/core/hle/service/ac/ac_u.h b/src/core/hle/service/ac/ac_u.h
index 117269f1f..18efcd1e6 100644
--- a/src/core/hle/service/ac/ac_u.h
+++ b/src/core/hle/service/ac/ac_u.h
@@ -12,12 +12,6 @@ namespace Service::AC {
 class AC_U final : public Module::Interface {
 public:
     explicit AC_U(std::shared_ptr<Module> ac);
-
-private:
-    SERVICE_SERIALIZATION(AC_U, ac, Module)
 };
 
 } // namespace Service::AC
-
-BOOST_CLASS_EXPORT_KEY(Service::AC::AC_U)
-BOOST_SERIALIZATION_CONSTRUCT(Service::AC::AC_U)
diff --git a/src/core/hle/service/act/act.h b/src/core/hle/service/act/act.h
index cbd5e6eb1..4f719d1b9 100644
--- a/src/core/hle/service/act/act.h
+++ b/src/core/hle/service/act/act.h
@@ -50,11 +50,6 @@ public:
          */
         void GetAccountDataBlock(Kernel::HLERequestContext& ctx);
     };
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int file_version) {}
-    friend class boost::serialization::access;
 };
 
 void InstallInterfaces(Core::System& system);
diff --git a/src/core/hle/service/act/act_a.cpp b/src/core/hle/service/act/act_a.cpp
index 41d8da4a4..dae72ce6c 100644
--- a/src/core/hle/service/act/act_a.cpp
+++ b/src/core/hle/service/act/act_a.cpp
@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/act/act_a.h"
 
 namespace Service::ACT {
@@ -27,5 +26,3 @@ ACT_A::ACT_A(std::shared_ptr<Module> act) : Module::Interface(std::move(act), "a
 }
 
 } // namespace Service::ACT
-
-SERIALIZE_EXPORT_IMPL(Service::ACT::ACT_A)
diff --git a/src/core/hle/service/act/act_a.h b/src/core/hle/service/act/act_a.h
index 1454441d5..48a79aab7 100644
--- a/src/core/hle/service/act/act_a.h
+++ b/src/core/hle/service/act/act_a.h
@@ -11,12 +11,6 @@ namespace Service::ACT {
 class ACT_A final : public Module::Interface {
 public:
     explicit ACT_A(std::shared_ptr<Module> act);
-
-private:
-    SERVICE_SERIALIZATION(ACT_A, act, Module)
 };
 
 } // namespace Service::ACT
-
-BOOST_CLASS_EXPORT_KEY(Service::ACT::ACT_A)
-BOOST_SERIALIZATION_CONSTRUCT(Service::ACT::ACT_A)
diff --git a/src/core/hle/service/act/act_u.cpp b/src/core/hle/service/act/act_u.cpp
index d28c3b07f..5f68bc480 100644
--- a/src/core/hle/service/act/act_u.cpp
+++ b/src/core/hle/service/act/act_u.cpp
@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/act/act_u.h"
 
 namespace Service::ACT {
@@ -21,5 +20,3 @@ ACT_U::ACT_U(std::shared_ptr<Module> act) : Module::Interface(std::move(act), "a
 }
 
 } // namespace Service::ACT
-
-SERIALIZE_EXPORT_IMPL(Service::ACT::ACT_U)
diff --git a/src/core/hle/service/act/act_u.h b/src/core/hle/service/act/act_u.h
index bcd2d653e..3aca428e6 100644
--- a/src/core/hle/service/act/act_u.h
+++ b/src/core/hle/service/act/act_u.h
@@ -11,12 +11,6 @@ namespace Service::ACT {
 class ACT_U final : public Module::Interface {
 public:
     explicit ACT_U(std::shared_ptr<Module> act);
-
-private:
-    SERVICE_SERIALIZATION(ACT_U, act, Module)
 };
 
 } // namespace Service::ACT
-
-BOOST_CLASS_EXPORT_KEY(Service::ACT::ACT_U)
-BOOST_SERIALIZATION_CONSTRUCT(Service::ACT::ACT_U)
diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp
index 1807fc185..6db423eeb 100644
--- a/src/core/hle/service/am/am.cpp
+++ b/src/core/hle/service/am/am.cpp
@@ -9,7 +9,7 @@
 #include <cryptopp/modes.h>
 #include <fmt/format.h>
 #include "common/alignment.h"
-#include "common/archives.h"
+
 #include "common/common_paths.h"
 #include "common/file_util.h"
 #include "common/logging/log.h"
@@ -34,9 +34,6 @@
 #include "core/loader/smdh.h"
 #include "core/nus_download.h"
 
-SERIALIZE_EXPORT_IMPL(Service::AM::Module)
-SERVICE_CONSTRUCT_IMPL(Service::AM::Module)
-
 namespace Service::AM {
 
 constexpr u16 PLATFORM_CTR = 0x0004;
@@ -533,10 +530,10 @@ InstallStatus InstallCIA(const std::string& path,
     return InstallStatus::ErrorInvalid;
 }
 
-InstallStatus InstallFromNus(u64 title_id, int version) {
+InstallStatus InstallFromNus(Core::System& system, u64 title_id, int version) {
     LOG_DEBUG(Service_AM, "Downloading {:X}", title_id);
 
-    CIAFile install_file{Core::System::GetInstance(), GetTitleMediaType(title_id)};
+    CIAFile install_file{system, GetTitleMediaType(title_id)};
 
     std::string path = fmt::format("/ccs/download/{:016X}/tmd", title_id);
     if (version != -1) {
@@ -1838,14 +1835,6 @@ void Module::Interface::EndImportTicket(Kernel::HLERequestContext& ctx) {
     LOG_WARNING(Service_AM, "(STUBBED) called");
 }
 
-template <class Archive>
-void Module::serialize(Archive& ar, const unsigned int) {
-    ar& cia_installing;
-    ar& am_title_list;
-    ar& system_updater_mutex;
-}
-SERIALIZE_IMPL(Module)
-
 void Module::Interface::GetDeviceCert(Kernel::HLERequestContext& ctx) {
     IPC::RequestParser rp(ctx);
     [[maybe_unused]] u32 size = rp.Pop<u32>();
diff --git a/src/core/hle/service/am/am.h b/src/core/hle/service/am/am.h
index 26b9b1056..65e6f900c 100644
--- a/src/core/hle/service/am/am.h
+++ b/src/core/hle/service/am/am.h
@@ -9,14 +9,12 @@
 #include <memory>
 #include <string>
 #include <vector>
-#include <boost/serialization/array.hpp>
-#include <boost/serialization/shared_ptr.hpp>
 #include "common/common_types.h"
-#include "common/construct.h"
+
 #include "common/swap.h"
 #include "core/file_sys/cia_container.h"
 #include "core/file_sys/file_backend.h"
-#include "core/global.h"
+
 #include "core/hle/kernel/mutex.h"
 #include "core/hle/result.h"
 #include "core/hle/service/service.h"
@@ -172,7 +170,7 @@ InstallStatus InstallCIA(const std::string& path,
  * @param title_id the title_id to download
  * @returns  whether the install was successful or error code
  */
-InstallStatus InstallFromNus(u64 title_id, int version = -1);
+InstallStatus InstallFromNus(Core::System& system, u64 title_id, int version = -1);
 
 /**
  * Get the update title ID for a title
@@ -784,10 +782,6 @@ private:
     std::array<std::vector<u64_le>, 3> am_title_list;
     std::shared_ptr<Kernel::Mutex> system_updater_mutex;
     CTCert ct_cert{};
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
-    friend class boost::serialization::access;
 };
 
 std::shared_ptr<Module> GetModule(Core::System& system);
@@ -795,6 +789,3 @@ std::shared_ptr<Module> GetModule(Core::System& system);
 void InstallInterfaces(Core::System& system);
 
 } // namespace Service::AM
-
-BOOST_CLASS_EXPORT_KEY(Service::AM::Module)
-SERVICE_CONSTRUCT(Service::AM::Module)
diff --git a/src/core/hle/service/am/am_app.cpp b/src/core/hle/service/am/am_app.cpp
index 27f3f6e61..fe1865c63 100644
--- a/src/core/hle/service/am/am_app.cpp
+++ b/src/core/hle/service/am/am_app.cpp
@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/am/am_app.h"
 
 namespace Service::AM {
@@ -29,5 +28,3 @@ AM_APP::AM_APP(std::shared_ptr<Module> am) : Module::Interface(std::move(am), "a
 }
 
 } // namespace Service::AM
-
-SERIALIZE_EXPORT_IMPL(Service::AM::AM_APP)
diff --git a/src/core/hle/service/am/am_app.h b/src/core/hle/service/am/am_app.h
index b8e858cb4..67cf8ba2e 100644
--- a/src/core/hle/service/am/am_app.h
+++ b/src/core/hle/service/am/am_app.h
@@ -11,12 +11,6 @@ namespace Service::AM {
 class AM_APP final : public Module::Interface {
 public:
     explicit AM_APP(std::shared_ptr<Module> am);
-
-private:
-    SERVICE_SERIALIZATION(AM_APP, am, Module)
 };
 
 } // namespace Service::AM
-
-BOOST_CLASS_EXPORT_KEY(Service::AM::AM_APP)
-BOOST_SERIALIZATION_CONSTRUCT(Service::AM::AM_APP)
diff --git a/src/core/hle/service/am/am_net.cpp b/src/core/hle/service/am/am_net.cpp
index eb9470752..1b13d9a47 100644
--- a/src/core/hle/service/am/am_net.cpp
+++ b/src/core/hle/service/am/am_net.cpp
@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/am/am_net.h"
 
 namespace Service::AM {
@@ -126,5 +125,3 @@ AM_NET::AM_NET(std::shared_ptr<Module> am) : Module::Interface(std::move(am), "a
 }
 
 } // namespace Service::AM
-
-SERIALIZE_EXPORT_IMPL(Service::AM::AM_NET)
diff --git a/src/core/hle/service/am/am_net.h b/src/core/hle/service/am/am_net.h
index b73610df9..a5adbd7e5 100644
--- a/src/core/hle/service/am/am_net.h
+++ b/src/core/hle/service/am/am_net.h
@@ -11,12 +11,6 @@ namespace Service::AM {
 class AM_NET final : public Module::Interface {
 public:
     explicit AM_NET(std::shared_ptr<Module> am);
-
-private:
-    SERVICE_SERIALIZATION(AM_NET, am, Module)
 };
 
 } // namespace Service::AM
-
-BOOST_CLASS_EXPORT_KEY(Service::AM::AM_NET)
-BOOST_SERIALIZATION_CONSTRUCT(Service::AM::AM_NET)
diff --git a/src/core/hle/service/am/am_sys.cpp b/src/core/hle/service/am/am_sys.cpp
index a4e39e6d7..7bb7f9467 100644
--- a/src/core/hle/service/am/am_sys.cpp
+++ b/src/core/hle/service/am/am_sys.cpp
@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/am/am_sys.h"
 
 namespace Service::AM {
@@ -74,5 +73,3 @@ AM_SYS::AM_SYS(std::shared_ptr<Module> am) : Module::Interface(std::move(am), "a
 }
 
 } // namespace Service::AM
-
-SERIALIZE_EXPORT_IMPL(Service::AM::AM_SYS)
diff --git a/src/core/hle/service/am/am_sys.h b/src/core/hle/service/am/am_sys.h
index fdee63b13..b142916ca 100644
--- a/src/core/hle/service/am/am_sys.h
+++ b/src/core/hle/service/am/am_sys.h
@@ -11,12 +11,6 @@ namespace Service::AM {
 class AM_SYS final : public Module::Interface {
 public:
     explicit AM_SYS(std::shared_ptr<Module> am);
-
-private:
-    SERVICE_SERIALIZATION(AM_SYS, am, Module)
 };
 
 } // namespace Service::AM
-
-BOOST_CLASS_EXPORT_KEY(Service::AM::AM_SYS)
-BOOST_SERIALIZATION_CONSTRUCT(Service::AM::AM_SYS)
diff --git a/src/core/hle/service/am/am_u.cpp b/src/core/hle/service/am/am_u.cpp
index 79a8fad95..6c6173382 100644
--- a/src/core/hle/service/am/am_u.cpp
+++ b/src/core/hle/service/am/am_u.cpp
@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/am/am_u.h"
 
 namespace Service::AM {
@@ -86,5 +85,3 @@ AM_U::AM_U(std::shared_ptr<Module> am) : Module::Interface(std::move(am), "am:u"
 }
 
 } // namespace Service::AM
-
-SERIALIZE_EXPORT_IMPL(Service::AM::AM_U)
diff --git a/src/core/hle/service/am/am_u.h b/src/core/hle/service/am/am_u.h
index d71bf722c..1d732c90a 100644
--- a/src/core/hle/service/am/am_u.h
+++ b/src/core/hle/service/am/am_u.h
@@ -11,12 +11,6 @@ namespace Service::AM {
 class AM_U final : public Module::Interface {
 public:
     explicit AM_U(std::shared_ptr<Module> am);
-
-private:
-    SERVICE_SERIALIZATION(AM_U, am, Module)
 };
 
 } // namespace Service::AM
-
-BOOST_CLASS_EXPORT_KEY(Service::AM::AM_U)
-BOOST_SERIALIZATION_CONSTRUCT(Service::AM::AM_U)
diff --git a/src/core/hle/service/apt/applet_manager.cpp b/src/core/hle/service/apt/applet_manager.cpp
index 368d2b7ae..e59f909ca 100644
--- a/src/core/hle/service/apt/applet_manager.cpp
+++ b/src/core/hle/service/apt/applet_manager.cpp
@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "common/file_util.h"
 #include "common/settings.h"
 #include "core/core.h"
@@ -20,8 +19,6 @@
 #include "core/hle/service/gsp/gsp_gpu.h"
 #include "video_core/utils.h"
 
-SERVICE_CONSTRUCT_IMPL(Service::APT::AppletManager)
-
 namespace Service::APT {
 
 /// The interval at which the home button update callback will be called, 16.6ms
diff --git a/src/core/hle/service/apt/applet_manager.h b/src/core/hle/service/apt/applet_manager.h
index dee8afa4e..aef0dcbe0 100644
--- a/src/core/hle/service/apt/applet_manager.h
+++ b/src/core/hle/service/apt/applet_manager.h
@@ -9,12 +9,8 @@
 #include <memory>
 #include <optional>
 #include <vector>
-#include <boost/serialization/array.hpp>
-#include <boost/serialization/optional.hpp>
-#include <boost/serialization/shared_ptr.hpp>
-#include <boost/serialization/vector.hpp>
 #include "core/frontend/input.h"
-#include "core/global.h"
+
 #include "core/hle/kernel/event.h"
 #include "core/hle/result.h"
 #include "core/hle/service/fs/archive.h"
@@ -125,17 +121,6 @@ struct MessageParameter {
     SignalType signal = SignalType::None;
     std::shared_ptr<Kernel::Object> object = nullptr;
     std::vector<u8> buffer;
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& sender_id;
-        ar& destination_id;
-        ar& signal;
-        ar& object;
-        ar& buffer;
-    }
-    friend class boost::serialization::access;
 };
 
 enum class AppletPos : u32 {
@@ -169,15 +154,6 @@ struct DeliverArg {
     std::vector<u8> param;
     std::vector<u8> hmac;
     u64 source_program_id = std::numeric_limits<u64>::max();
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& param;
-        ar& hmac;
-        ar& source_program_id;
-    }
-    friend class boost::serialization::access;
 };
 
 struct ApplicationJumpParameters {
@@ -187,30 +163,11 @@ struct ApplicationJumpParameters {
 
     u64 current_title_id;
     FS::MediaType current_media_type;
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int file_version) {
-        ar& next_title_id;
-        ar& next_media_type;
-        ar& flags;
-        ar& current_title_id;
-        ar& current_media_type;
-    }
-    friend class boost::serialization::access;
 };
 
 struct ApplicationStartParameters {
     u64 next_title_id;
     FS::MediaType next_media_type;
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& next_title_id;
-        ar& next_media_type;
-    }
-    friend class boost::serialization::access;
 };
 
 enum class DisplayBufferMode : u32_le {
@@ -233,20 +190,6 @@ struct CaptureBufferInfo {
     u32_le bottom_screen_left_offset;
     u32_le bottom_screen_right_offset;
     DisplayBufferMode bottom_screen_format;
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& size;
-        ar& is_3d;
-        ar& top_screen_left_offset;
-        ar& top_screen_right_offset;
-        ar& top_screen_format;
-        ar& bottom_screen_left_offset;
-        ar& bottom_screen_right_offset;
-        ar& bottom_screen_format;
-    }
-    friend class boost::serialization::access;
 };
 static_assert(sizeof(CaptureBufferInfo) == 0x20, "CaptureBufferInfo struct has incorrect size");
 
@@ -330,12 +273,12 @@ public:
                                       ApplicationJumpFlags flags);
     Result DoApplicationJump(const DeliverArg& arg);
 
-    boost::optional<DeliverArg> ReceiveDeliverArg() {
+    std::optional<DeliverArg> ReceiveDeliverArg() {
         auto arg = deliver_arg;
-        deliver_arg = boost::none;
+        deliver_arg = std::nullopt;
         return arg;
     }
-    void SetDeliverArg(boost::optional<DeliverArg> arg) {
+    void SetDeliverArg(std::optional<DeliverArg> arg) {
         deliver_arg = std::move(arg);
     }
 
@@ -343,7 +286,7 @@ public:
         std::vector<u8> buffer;
         if (capture_info) {
             buffer.resize(sizeof(CaptureBufferInfo));
-            std::memcpy(buffer.data(), &capture_info.get(), sizeof(CaptureBufferInfo));
+            std::memcpy(buffer.data(), &capture_info.value(), sizeof(CaptureBufferInfo));
         }
         return buffer;
     }
@@ -351,14 +294,14 @@ public:
         ASSERT_MSG(buffer.size() >= sizeof(CaptureBufferInfo), "CaptureBufferInfo is too small.");
 
         capture_info.emplace();
-        std::memcpy(&capture_info.get(), buffer.data(), sizeof(CaptureBufferInfo));
+        std::memcpy(&capture_info.value(), buffer.data(), sizeof(CaptureBufferInfo));
     }
 
     std::vector<u8> ReceiveCaptureBufferInfo() {
         std::vector<u8> buffer;
         if (capture_buffer_info) {
             buffer.resize(sizeof(CaptureBufferInfo));
-            std::memcpy(buffer.data(), &capture_buffer_info.get(), sizeof(CaptureBufferInfo));
+            std::memcpy(buffer.data(), &capture_buffer_info.value(), sizeof(CaptureBufferInfo));
             capture_buffer_info.reset();
         }
         return buffer;
@@ -367,7 +310,7 @@ public:
         ASSERT_MSG(buffer.size() >= sizeof(CaptureBufferInfo), "CaptureBufferInfo is too small.");
 
         capture_buffer_info.emplace();
-        std::memcpy(&capture_buffer_info.get(), buffer.data(), sizeof(CaptureBufferInfo));
+        std::memcpy(&capture_buffer_info.value(), buffer.data(), sizeof(CaptureBufferInfo));
     }
 
     Result PrepareToStartApplication(u64 title_id, FS::MediaType media_type);
@@ -407,19 +350,18 @@ private:
     std::shared_ptr<Kernel::Mutex> lock;
 
     /// Parameter data to be returned in the next call to Glance/ReceiveParameter.
-    // NOTE: A bug in gcc prevents serializing std::optional
-    boost::optional<MessageParameter> next_parameter;
+    std::optional<MessageParameter> next_parameter;
 
     /// This parameter will be sent to the application/applet once they register themselves by using
     /// APT::Initialize.
-    boost::optional<MessageParameter> delayed_parameter;
+    std::optional<MessageParameter> delayed_parameter;
 
     ApplicationJumpParameters app_jump_parameters{};
-    boost::optional<ApplicationStartParameters> app_start_parameters{};
-    boost::optional<DeliverArg> deliver_arg{};
+    std::optional<ApplicationStartParameters> app_start_parameters{};
+    std::optional<DeliverArg> deliver_arg{};
 
-    boost::optional<CaptureBufferInfo> capture_info;
-    boost::optional<CaptureBufferInfo> capture_buffer_info;
+    std::optional<CaptureBufferInfo> capture_info;
+    std::optional<CaptureBufferInfo> capture_buffer_info;
 
     static constexpr std::size_t NumAppletSlot = 4;
 
@@ -450,21 +392,6 @@ private:
             title_id = 0;
             attributes.raw = 0;
         }
-
-    private:
-        template <class Archive>
-        void serialize(Archive& ar, const unsigned int) {
-            ar& applet_id;
-            ar& slot;
-            ar& title_id;
-            ar& registered;
-            ar& loaded;
-            ar& attributes.raw;
-            ar& notification;
-            ar& notification_event;
-            ar& parameter_event;
-        }
-        friend class boost::serialization::access;
     };
 
     // Holds data about the concurrently running applets in the system.
@@ -524,41 +451,6 @@ private:
 
     void LoadInputDevices();
     void ButtonUpdateEvent(std::uintptr_t user_data, s64 cycles_late);
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int file_version) {
-        ar& next_parameter;
-        ar& app_jump_parameters;
-        ar& delayed_parameter;
-        ar& app_start_parameters;
-        ar& deliver_arg;
-        ar& capture_info;
-        ar& capture_buffer_info;
-        ar& active_slot;
-        ar& last_library_launcher_slot;
-        ar& last_prepared_library_applet;
-        ar& last_system_launcher_slot;
-        ar& last_jump_to_home_slot;
-        ar& ordered_to_close_sys_applet;
-        ar& ordered_to_close_application;
-        ar& application_cancelled;
-        ar& application_close_target;
-        ar& new_3ds_mode_blocked;
-        ar& lock;
-        ar& capture_info;
-        ar& applet_slots;
-        ar& library_applet_closing_command;
-
-        if (Archive::is_loading::value) {
-            LoadInputDevices();
-        }
-    }
-    friend class boost::serialization::access;
 };
 
 } // namespace Service::APT
-
-BOOST_CLASS_VERSION(Service::APT::ApplicationJumpParameters, 1)
-BOOST_CLASS_VERSION(Service::APT::AppletManager, 1)
-
-SERVICE_CONSTRUCT(Service::APT::AppletManager)
diff --git a/src/core/hle/service/apt/apt.cpp b/src/core/hle/service/apt/apt.cpp
index a3befffd8..7da936aa7 100644
--- a/src/core/hle/service/apt/apt.cpp
+++ b/src/core/hle/service/apt/apt.cpp
@@ -2,9 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <boost/serialization/shared_ptr.hpp>
-#include <boost/serialization/vector.hpp>
-#include "common/archives.h"
 #include "common/common_paths.h"
 #include "common/file_util.h"
 #include "common/logging/log.h"
@@ -36,23 +33,8 @@
 #include "core/loader/loader.h"
 #include "core/telemetry_session.h"
 
-SERVICE_CONSTRUCT_IMPL(Service::APT::Module)
-
 namespace Service::APT {
 
-template <class Archive>
-void Module::serialize(Archive& ar, const unsigned int file_version) {
-    ar& shared_font_mem;
-    ar& shared_font_loaded;
-    ar& shared_font_relocated;
-    ar& cpu_percent;
-    ar& screen_capture_post_permission;
-    ar& applet_manager;
-    ar& wireless_reboot_info;
-}
-
-SERIALIZE_IMPL(Module)
-
 Module::NSInterface::NSInterface(std::shared_ptr<Module> apt, const char* name, u32 max_session)
     : ServiceFramework(name, max_session), apt(std::move(apt)) {}
 
diff --git a/src/core/hle/service/apt/apt.h b/src/core/hle/service/apt/apt.h
index 81cb4ce4e..5d157d2ce 100644
--- a/src/core/hle/service/apt/apt.h
+++ b/src/core/hle/service/apt/apt.h
@@ -7,11 +7,11 @@
 #include <array>
 #include <memory>
 #include <vector>
-#include "common/archives.h"
+
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "common/swap.h"
-#include "core/global.h"
+
 #include "core/hle/kernel/kernel.h"
 #include "core/hle/service/service.h"
 
@@ -1051,13 +1051,6 @@ public:
     protected:
         bool application_reset_prepared{};
         std::shared_ptr<Module> apt;
-
-    private:
-        template <class Archive>
-        void serialize(Archive& ar, const unsigned int) {
-            ar& application_reset_prepared;
-        }
-        friend class boost::serialization::access;
     };
 
 private:
@@ -1081,10 +1074,6 @@ private:
     std::shared_ptr<AppletManager> applet_manager;
 
     std::vector<u8> wireless_reboot_info;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
-    friend class boost::serialization::access;
 };
 
 std::shared_ptr<Module> GetModule(Core::System& system);
@@ -1092,6 +1081,3 @@ std::shared_ptr<Module> GetModule(Core::System& system);
 void InstallInterfaces(Core::System& system);
 
 } // namespace Service::APT
-
-SERVICE_CONSTRUCT(Service::APT::Module)
-BOOST_CLASS_VERSION(Service::APT::Module, 1)
diff --git a/src/core/hle/service/apt/apt_a.cpp b/src/core/hle/service/apt/apt_a.cpp
index dc4c72c90..4f36f8107 100644
--- a/src/core/hle/service/apt/apt_a.cpp
+++ b/src/core/hle/service/apt/apt_a.cpp
@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/apt/apt_a.h"
 
 namespace Service::APT {
@@ -110,5 +109,3 @@ APT_A::APT_A(std::shared_ptr<Module> apt)
 }
 
 } // namespace Service::APT
-
-SERIALIZE_EXPORT_IMPL(Service::APT::APT_A)
diff --git a/src/core/hle/service/apt/apt_a.h b/src/core/hle/service/apt/apt_a.h
index e17e2f323..f481fa1c9 100644
--- a/src/core/hle/service/apt/apt_a.h
+++ b/src/core/hle/service/apt/apt_a.h
@@ -11,12 +11,6 @@ namespace Service::APT {
 class APT_A final : public Module::APTInterface {
 public:
     explicit APT_A(std::shared_ptr<Module> apt);
-
-private:
-    SERVICE_SERIALIZATION(APT_A, apt, Module)
 };
 
 } // namespace Service::APT
-
-BOOST_CLASS_EXPORT_KEY(Service::APT::APT_A)
-BOOST_SERIALIZATION_CONSTRUCT(Service::APT::APT_A)
diff --git a/src/core/hle/service/apt/apt_s.cpp b/src/core/hle/service/apt/apt_s.cpp
index 9bd6d81ed..1b855550c 100644
--- a/src/core/hle/service/apt/apt_s.cpp
+++ b/src/core/hle/service/apt/apt_s.cpp
@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/apt/apt_s.h"
 
 namespace Service::APT {
@@ -110,5 +109,3 @@ APT_S::APT_S(std::shared_ptr<Module> apt)
 }
 
 } // namespace Service::APT
-
-SERIALIZE_EXPORT_IMPL(Service::APT::APT_S)
diff --git a/src/core/hle/service/apt/apt_s.h b/src/core/hle/service/apt/apt_s.h
index d1dd27ff1..7e041cbda 100644
--- a/src/core/hle/service/apt/apt_s.h
+++ b/src/core/hle/service/apt/apt_s.h
@@ -18,12 +18,6 @@ namespace Service::APT {
 class APT_S final : public Module::APTInterface {
 public:
     explicit APT_S(std::shared_ptr<Module> apt);
-
-private:
-    SERVICE_SERIALIZATION(APT_S, apt, Module)
 };
 
 } // namespace Service::APT
-
-BOOST_CLASS_EXPORT_KEY(Service::APT::APT_S)
-BOOST_SERIALIZATION_CONSTRUCT(Service::APT::APT_S)
diff --git a/src/core/hle/service/apt/apt_u.cpp b/src/core/hle/service/apt/apt_u.cpp
index fd302ab4e..035f5897d 100644
--- a/src/core/hle/service/apt/apt_u.cpp
+++ b/src/core/hle/service/apt/apt_u.cpp
@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/apt/apt_u.h"
 
 namespace Service::APT {
@@ -110,5 +109,3 @@ APT_U::APT_U(std::shared_ptr<Module> apt)
 }
 
 } // namespace Service::APT
-
-SERIALIZE_EXPORT_IMPL(Service::APT::APT_U)
diff --git a/src/core/hle/service/apt/apt_u.h b/src/core/hle/service/apt/apt_u.h
index b8a8fe205..3b342ed55 100644
--- a/src/core/hle/service/apt/apt_u.h
+++ b/src/core/hle/service/apt/apt_u.h
@@ -18,12 +18,6 @@ namespace Service::APT {
 class APT_U final : public Module::APTInterface {
 public:
     explicit APT_U(std::shared_ptr<Module> apt);
-
-private:
-    SERVICE_SERIALIZATION(APT_U, apt, Module)
 };
 
 } // namespace Service::APT
-
-BOOST_CLASS_EXPORT_KEY(Service::APT::APT_U)
-BOOST_SERIALIZATION_CONSTRUCT(Service::APT::APT_U)
diff --git a/src/core/hle/service/apt/ns_c.cpp b/src/core/hle/service/apt/ns_c.cpp
index 76074c057..2fae416f3 100644
--- a/src/core/hle/service/apt/ns_c.cpp
+++ b/src/core/hle/service/apt/ns_c.cpp
@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/apt/ns_c.h"
 
 namespace Service::NS {
@@ -19,5 +18,3 @@ NS_C::NS_C(std::shared_ptr<Service::APT::Module> apt)
 }
 
 } // namespace Service::NS
-
-SERIALIZE_EXPORT_IMPL(Service::NS::NS_C)
diff --git a/src/core/hle/service/apt/ns_c.h b/src/core/hle/service/apt/ns_c.h
index 1fe91fad4..e142b7679 100644
--- a/src/core/hle/service/apt/ns_c.h
+++ b/src/core/hle/service/apt/ns_c.h
@@ -14,12 +14,6 @@ namespace Service::NS {
 class NS_C final : public Service::APT::Module::NSInterface {
 public:
     explicit NS_C(std::shared_ptr<Service::APT::Module> apt);
-
-private:
-    SERVICE_SERIALIZATION(NS_C, apt, Service::APT::Module)
 };
 
 } // namespace Service::NS
-
-BOOST_CLASS_EXPORT_KEY(Service::NS::NS_C)
-BOOST_SERIALIZATION_CONSTRUCT(Service::NS::NS_C)
diff --git a/src/core/hle/service/apt/ns_s.cpp b/src/core/hle/service/apt/ns_s.cpp
index dfb178d7b..9e83b67ac 100644
--- a/src/core/hle/service/apt/ns_s.cpp
+++ b/src/core/hle/service/apt/ns_s.cpp
@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/apt/ns_s.h"
 
 namespace Service::NS {
@@ -32,5 +31,3 @@ NS_S::NS_S(std::shared_ptr<Service::APT::Module> apt)
 }
 
 } // namespace Service::NS
-
-SERIALIZE_EXPORT_IMPL(Service::NS::NS_S)
diff --git a/src/core/hle/service/apt/ns_s.h b/src/core/hle/service/apt/ns_s.h
index eaa0ad9d3..5a5b311b0 100644
--- a/src/core/hle/service/apt/ns_s.h
+++ b/src/core/hle/service/apt/ns_s.h
@@ -14,12 +14,6 @@ namespace Service::NS {
 class NS_S final : public Service::APT::Module::NSInterface {
 public:
     explicit NS_S(std::shared_ptr<Service::APT::Module> apt);
-
-private:
-    SERVICE_SERIALIZATION(NS_S, apt, Service::APT::Module)
 };
 
 } // namespace Service::NS
-
-BOOST_CLASS_EXPORT_KEY(Service::NS::NS_S)
-BOOST_SERIALIZATION_CONSTRUCT(Service::NS::NS_S)
diff --git a/src/core/hle/service/boss/boss.cpp b/src/core/hle/service/boss/boss.cpp
index 7643494bc..b14d3379d 100644
--- a/src/core/hle/service/boss/boss.cpp
+++ b/src/core/hle/service/boss/boss.cpp
@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "common/logging/log.h"
 #include "core/core.h"
 #include "core/hle/ipc_helpers.h"
@@ -11,29 +10,8 @@
 #include "core/hle/service/boss/boss_p.h"
 #include "core/hle/service/boss/boss_u.h"
 
-SERVICE_CONSTRUCT_IMPL(Service::BOSS::Module)
-SERIALIZE_EXPORT_IMPL(Service::BOSS::Module)
-SERIALIZE_EXPORT_IMPL(Service::BOSS::Module::SessionData)
-
 namespace Service::BOSS {
 
-template <class Archive>
-void Module::serialize(Archive& ar, const unsigned int) {
-    ar& task_finish_event;
-    ar& new_arrival_flag;
-    ar& ns_data_new_flag;
-    ar& ns_data_new_flag_privileged;
-    ar& output_flag;
-}
-SERIALIZE_IMPL(Module)
-
-template <class Archive>
-void Module::SessionData::serialize(Archive& ar, const unsigned int) {
-    ar& boost::serialization::base_object<Kernel::SessionRequestHandler::SessionDataBase>(*this);
-    ar& online_service;
-}
-SERIALIZE_IMPL(Module::SessionData)
-
 std::shared_ptr<OnlineService> Module::Interface::GetSessionService(Kernel::HLERequestContext& ctx,
                                                                     IPC::RequestParser& rp) {
     const auto session_data = GetSessionData(ctx.Session());
diff --git a/src/core/hle/service/boss/boss.h b/src/core/hle/service/boss/boss.h
index ce1df770a..af07b4193 100644
--- a/src/core/hle/service/boss/boss.h
+++ b/src/core/hle/service/boss/boss.h
@@ -5,8 +5,7 @@
 #pragma once
 
 #include <memory>
-#include <boost/serialization/export.hpp>
-#include "core/global.h"
+
 #include "core/hle/kernel/event.h"
 #include "core/hle/kernel/resource_limit.h"
 #include "core/hle/service/boss/online_service.h"
@@ -29,11 +28,6 @@ public:
 
     struct SessionData : public Kernel::SessionRequestHandler::SessionDataBase {
         std::shared_ptr<OnlineService> online_service{};
-
-    private:
-        template <class Archive>
-        void serialize(Archive& ar, const unsigned int);
-        friend class boost::serialization::access;
     };
 
     class Interface : public ServiceFramework<Interface, SessionData> {
@@ -984,16 +978,8 @@ private:
     u8 ns_data_new_flag;
     u8 ns_data_new_flag_privileged;
     u8 output_flag;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
-    friend class boost::serialization::access;
 };
 
 void InstallInterfaces(Core::System& system);
 
 } // namespace Service::BOSS
-
-SERVICE_CONSTRUCT(Service::BOSS::Module)
-BOOST_CLASS_EXPORT_KEY(Service::BOSS::Module)
-BOOST_CLASS_EXPORT_KEY(Service::BOSS::Module::SessionData)
diff --git a/src/core/hle/service/boss/boss_p.cpp b/src/core/hle/service/boss/boss_p.cpp
index b9109f7e7..bf3c5c662 100644
--- a/src/core/hle/service/boss/boss_p.cpp
+++ b/src/core/hle/service/boss/boss_p.cpp
@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/boss/boss_p.h"
 
 namespace Service::BOSS {
@@ -85,5 +84,3 @@ BOSS_P::BOSS_P(std::shared_ptr<Module> boss)
 }
 
 } // namespace Service::BOSS
-
-SERIALIZE_EXPORT_IMPL(Service::BOSS::BOSS_P)
diff --git a/src/core/hle/service/boss/boss_p.h b/src/core/hle/service/boss/boss_p.h
index 56f0cd4fc..9c84a1e9d 100644
--- a/src/core/hle/service/boss/boss_p.h
+++ b/src/core/hle/service/boss/boss_p.h
@@ -11,12 +11,6 @@ namespace Service::BOSS {
 class BOSS_P final : public Module::Interface {
 public:
     explicit BOSS_P(std::shared_ptr<Module> boss);
-
-private:
-    SERVICE_SERIALIZATION(BOSS_P, boss, Module)
 };
 
 } // namespace Service::BOSS
-
-BOOST_CLASS_EXPORT_KEY(Service::BOSS::BOSS_P)
-BOOST_SERIALIZATION_CONSTRUCT(Service::BOSS::BOSS_P)
diff --git a/src/core/hle/service/boss/boss_u.cpp b/src/core/hle/service/boss/boss_u.cpp
index 080dbf99a..9f4ca8c48 100644
--- a/src/core/hle/service/boss/boss_u.cpp
+++ b/src/core/hle/service/boss/boss_u.cpp
@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/boss/boss_u.h"
 
 namespace Service::BOSS {
@@ -73,5 +72,3 @@ BOSS_U::BOSS_U(std::shared_ptr<Module> boss)
 }
 
 } // namespace Service::BOSS
-
-SERIALIZE_EXPORT_IMPL(Service::BOSS::BOSS_U)
diff --git a/src/core/hle/service/boss/boss_u.h b/src/core/hle/service/boss/boss_u.h
index 195783b40..a93b4e502 100644
--- a/src/core/hle/service/boss/boss_u.h
+++ b/src/core/hle/service/boss/boss_u.h
@@ -11,12 +11,6 @@ namespace Service::BOSS {
 class BOSS_U final : public Module::Interface {
 public:
     explicit BOSS_U(std::shared_ptr<Module> boss);
-
-private:
-    SERVICE_SERIALIZATION(BOSS_U, boss, Module)
 };
 
 } // namespace Service::BOSS
-
-BOOST_CLASS_EXPORT_KEY(Service::BOSS::BOSS_U)
-BOOST_SERIALIZATION_CONSTRUCT(Service::BOSS::BOSS_U)
diff --git a/src/core/hle/service/boss/online_service.cpp b/src/core/hle/service/boss/online_service.cpp
index d289c910b..37ef33d72 100644
--- a/src/core/hle/service/boss/online_service.cpp
+++ b/src/core/hle/service/boss/online_service.cpp
@@ -2,10 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <boost/serialization/map.hpp>
-#include "common/archives.h"
 #include "common/file_util.h"
-#include "common/serialization/boost_std_variant.hpp"
 #include "common/string_util.h"
 #include "core/core.h"
 #include "core/file_sys/archive_backend.h"
@@ -30,22 +27,6 @@ enum {
 OnlineService::OnlineService(u64 program_id_, u64 extdata_id_)
     : program_id(program_id_), extdata_id(extdata_id_) {}
 
-template <class Archive>
-void OnlineService::serialize(Archive& ar, const unsigned int) {
-    ar& current_props;
-    ar& task_id_list;
-    ar& program_id;
-    ar& extdata_id;
-}
-SERIALIZE_IMPL(OnlineService)
-
-template <class Archive>
-void BossTaskProperties::serialize(Archive& ar, const unsigned int) {
-    ar& task_result;
-    ar& properties;
-}
-SERIALIZE_IMPL(BossTaskProperties)
-
 Result OnlineService::InitializeSession(u64 init_program_id) {
     // The BOSS service uses three databases:
     // BOSS_A: Archive? A list of program ids and some properties that are keyed on program
diff --git a/src/core/hle/service/boss/online_service.h b/src/core/hle/service/boss/online_service.h
index a79aac955..cb2806836 100644
--- a/src/core/hle/service/boss/online_service.h
+++ b/src/core/hle/service/boss/online_service.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <map>
 #include <string>
 #include <variant>
 #include <vector>
@@ -170,10 +171,6 @@ struct BossTaskProperties {
         {static_cast<PropertyID>(0x3E), std::vector<u8>(0x200)},
         {static_cast<PropertyID>(0x3F), u8()},
     };
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
-    friend class boost::serialization::access;
 };
 
 class OnlineService final {
@@ -204,13 +201,6 @@ private:
 
     u64 program_id;
     u64 extdata_id;
-
-    // For serialization
-    explicit OnlineService() = default;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
-    friend class boost::serialization::access;
 };
 
 } // namespace Service::BOSS
diff --git a/src/core/hle/service/cam/cam.cpp b/src/core/hle/service/cam/cam.cpp
index 46ff98916..5a03165ff 100644
--- a/src/core/hle/service/cam/cam.cpp
+++ b/src/core/hle/service/cam/cam.cpp
@@ -3,7 +3,7 @@
 // Refer to the license.txt file included.
 
 #include <algorithm>
-#include "common/archives.h"
+
 #include "common/bit_set.h"
 #include "common/logging/log.h"
 #include "common/settings.h"
@@ -20,33 +20,8 @@
 #include "core/hle/service/cam/cam_u.h"
 #include "core/memory.h"
 
-SERVICE_CONSTRUCT_IMPL(Service::CAM::Module)
-
 namespace Service::CAM {
 
-template <class Archive>
-void Module::serialize(Archive& ar, const unsigned int file_version) {
-    ar& cameras;
-    ar& ports;
-    ar& is_camera_reload_pending;
-    ar& initialized;
-    if (Archive::is_loading::value && initialized) {
-        for (int i = 0; i < NumCameras; i++) {
-            LoadCameraImplementation(cameras[i], i);
-        }
-        for (std::size_t i = 0; i < ports.size(); i++) {
-            if (ports[i].is_busy) {
-                cameras[ports[i].camera_id].impl->StartCapture();
-            }
-            if (ports[i].is_receiving) {
-                StartReceiving(static_cast<int>(i));
-            }
-        }
-    }
-}
-
-SERIALIZE_IMPL(Module)
-
 // built-in resolution parameters
 constexpr std::array<Resolution, 8> PRESET_RESOLUTION{{
     {640, 480, 0, 0, 639, 479},  // VGA
diff --git a/src/core/hle/service/cam/cam.h b/src/core/hle/service/cam/cam.h
index 47439466f..de445184f 100644
--- a/src/core/hle/service/cam/cam.h
+++ b/src/core/hle/service/cam/cam.h
@@ -9,14 +9,9 @@
 #include <future>
 #include <memory>
 #include <vector>
-#include <boost/serialization/array.hpp>
-#include <boost/serialization/deque.hpp>
-#include <boost/serialization/shared_ptr.hpp>
-#include <boost/serialization/unique_ptr.hpp>
-#include <boost/serialization/version.hpp>
 #include "common/common_types.h"
 #include "common/swap.h"
-#include "core/global.h"
+
 #include "core/hle/result.h"
 #include "core/hle/service/cam/cam_params.h"
 #include "core/hle/service/service.h"
@@ -73,18 +68,6 @@ struct Resolution {
     u16 crop_y0;
     u16 crop_x1;
     u16 crop_y1;
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& width;
-        ar& height;
-        ar& crop_x0;
-        ar& crop_y0;
-        ar& crop_x1;
-        ar& crop_y1;
-    }
-    friend class boost::serialization::access;
 };
 
 struct PackageParameterWithoutContext {
@@ -660,16 +643,6 @@ private:
         Effect effect{Effect::None};
         OutputFormat format{OutputFormat::YUV422};
         Resolution resolution = {0, 0, 0, 0, 0, 0};
-
-    private:
-        template <class Archive>
-        void serialize(Archive& ar, const unsigned int) {
-            ar& flip;
-            ar& effect;
-            ar& format;
-            ar& resolution;
-        }
-        friend class boost::serialization::access;
     };
 
     struct CameraConfig {
@@ -677,15 +650,6 @@ private:
         std::array<ContextConfig, 2> contexts;
         int current_context{0};
         FrameRate frame_rate{FrameRate::Rate_15};
-
-    private:
-        template <class Archive>
-        void serialize(Archive& ar, const unsigned int file_version) {
-            ar& contexts;
-            ar& current_context;
-            ar& frame_rate;
-        }
-        friend class boost::serialization::access;
     };
 
     struct PortConfig {
@@ -722,31 +686,6 @@ private:
         u32 dest_size{0}; // the destination size of the receiving process
 
         void Clear();
-
-    private:
-        template <class Archive>
-        void serialize(Archive& ar, const unsigned int) {
-            ar& camera_id;
-            ar& is_active;
-            ar& is_pending_receiving;
-            ar& is_busy;
-            ar& is_receiving;
-            ar& is_trimming;
-            ar& x0;
-            ar& y0;
-            ar& x1;
-            ar& y1;
-            ar& transfer_bytes;
-            ar& completion_event;
-            ar& buffer_error_interrupt_event;
-            ar& vsync_interrupt_event;
-            ar& vsync_timings;
-            // Ignore capture_result. In-progress captures might be affected but this is OK.
-            ar& dest_process;
-            ar& dest;
-            ar& dest_size;
-        }
-        friend class boost::serialization::access;
     };
 
     void LoadCameraImplementation(CameraConfig& camera, int camera_id);
@@ -758,10 +697,6 @@ private:
     Core::TimingEventType* completion_event_callback;
     Core::TimingEventType* vsync_interrupt_event_callback;
     std::atomic<bool> is_camera_reload_pending{false};
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int file_version);
-    friend class boost::serialization::access;
 };
 
 std::shared_ptr<Module> GetModule(Core::System& system);
@@ -769,7 +704,3 @@ std::shared_ptr<Module> GetModule(Core::System& system);
 void InstallInterfaces(Core::System& system);
 
 } // namespace Service::CAM
-
-SERVICE_CONSTRUCT(Service::CAM::Module)
-BOOST_CLASS_VERSION(Service::CAM::Module, 1)
-BOOST_CLASS_VERSION(Service::CAM::Module::CameraConfig, 1)
diff --git a/src/core/hle/service/cam/cam_c.cpp b/src/core/hle/service/cam/cam_c.cpp
index 13243ab03..698472c70 100644
--- a/src/core/hle/service/cam/cam_c.cpp
+++ b/src/core/hle/service/cam/cam_c.cpp
@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/cam/cam.h"
 #include "core/hle/service/cam/cam_c.h"
 
@@ -79,5 +78,3 @@ CAM_C::CAM_C(std::shared_ptr<Module> cam) : Module::Interface(std::move(cam), "c
 }
 
 } // namespace Service::CAM
-
-SERIALIZE_EXPORT_IMPL(Service::CAM::CAM_C)
diff --git a/src/core/hle/service/cam/cam_c.h b/src/core/hle/service/cam/cam_c.h
index c1ed355ac..d6dfcd6c5 100644
--- a/src/core/hle/service/cam/cam_c.h
+++ b/src/core/hle/service/cam/cam_c.h
@@ -11,12 +11,6 @@ namespace Service::CAM {
 class CAM_C final : public Module::Interface {
 public:
     explicit CAM_C(std::shared_ptr<Module> cam);
-
-private:
-    SERVICE_SERIALIZATION(CAM_C, cam, Module)
 };
 
 } // namespace Service::CAM
-
-BOOST_CLASS_EXPORT_KEY(Service::CAM::CAM_C)
-BOOST_SERIALIZATION_CONSTRUCT(Service::CAM::CAM_C)
diff --git a/src/core/hle/service/cam/cam_q.cpp b/src/core/hle/service/cam/cam_q.cpp
index 6f0c04598..71fc127d2 100644
--- a/src/core/hle/service/cam/cam_q.cpp
+++ b/src/core/hle/service/cam/cam_q.cpp
@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/cam/cam_q.h"
 
 namespace Service::CAM {
@@ -14,5 +13,3 @@ CAM_Q::CAM_Q() : ServiceFramework("cam:q", 1 /*TODO: find the true value*/) {
 }
 
 } // namespace Service::CAM
-
-SERIALIZE_EXPORT_IMPL(Service::CAM::CAM_Q)
diff --git a/src/core/hle/service/cam/cam_q.h b/src/core/hle/service/cam/cam_q.h
index 992b38390..d1124493b 100644
--- a/src/core/hle/service/cam/cam_q.h
+++ b/src/core/hle/service/cam/cam_q.h
@@ -11,11 +11,6 @@ namespace Service::CAM {
 class CAM_Q : public ServiceFramework<CAM_Q> {
 public:
     CAM_Q();
-
-private:
-    SERVICE_SERIALIZATION_SIMPLE
 };
 
 } // namespace Service::CAM
-
-BOOST_CLASS_EXPORT_KEY(Service::CAM::CAM_Q)
diff --git a/src/core/hle/service/cam/cam_s.cpp b/src/core/hle/service/cam/cam_s.cpp
index 05dcabd98..b87f5b124 100644
--- a/src/core/hle/service/cam/cam_s.cpp
+++ b/src/core/hle/service/cam/cam_s.cpp
@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/cam/cam.h"
 #include "core/hle/service/cam/cam_s.h"
 
@@ -79,5 +78,3 @@ CAM_S::CAM_S(std::shared_ptr<Module> cam) : Module::Interface(std::move(cam), "c
 }
 
 } // namespace Service::CAM
-
-SERIALIZE_EXPORT_IMPL(Service::CAM::CAM_S)
diff --git a/src/core/hle/service/cam/cam_s.h b/src/core/hle/service/cam/cam_s.h
index cceb99b87..0c9d26644 100644
--- a/src/core/hle/service/cam/cam_s.h
+++ b/src/core/hle/service/cam/cam_s.h
@@ -11,12 +11,6 @@ namespace Service::CAM {
 class CAM_S final : public Module::Interface {
 public:
     explicit CAM_S(std::shared_ptr<Module> cam);
-
-private:
-    SERVICE_SERIALIZATION(CAM_S, cam, Module)
 };
 
 } // namespace Service::CAM
-
-BOOST_CLASS_EXPORT_KEY(Service::CAM::CAM_S)
-BOOST_SERIALIZATION_CONSTRUCT(Service::CAM::CAM_S)
diff --git a/src/core/hle/service/cam/cam_u.cpp b/src/core/hle/service/cam/cam_u.cpp
index 2e6ff26ac..d67fe3b26 100644
--- a/src/core/hle/service/cam/cam_u.cpp
+++ b/src/core/hle/service/cam/cam_u.cpp
@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/cam/cam.h"
 #include "core/hle/service/cam/cam_u.h"
 
@@ -79,5 +78,3 @@ CAM_U::CAM_U(std::shared_ptr<Module> cam) : Module::Interface(std::move(cam), "c
 }
 
 } // namespace Service::CAM
-
-SERIALIZE_EXPORT_IMPL(Service::CAM::CAM_U)
diff --git a/src/core/hle/service/cam/cam_u.h b/src/core/hle/service/cam/cam_u.h
index 2b775a035..85b12559a 100644
--- a/src/core/hle/service/cam/cam_u.h
+++ b/src/core/hle/service/cam/cam_u.h
@@ -11,12 +11,6 @@ namespace Service::CAM {
 class CAM_U final : public Module::Interface {
 public:
     explicit CAM_U(std::shared_ptr<Module> cam);
-
-private:
-    SERVICE_SERIALIZATION(CAM_U, cam, Module)
 };
 
 } // namespace Service::CAM
-
-BOOST_CLASS_EXPORT_KEY(Service::CAM::CAM_U)
-BOOST_SERIALIZATION_CONSTRUCT(Service::CAM::CAM_U)
diff --git a/src/core/hle/service/cam/y2r_u.cpp b/src/core/hle/service/cam/y2r_u.cpp
index 266cf2e92..20d32ae17 100644
--- a/src/core/hle/service/cam/y2r_u.cpp
+++ b/src/core/hle/service/cam/y2r_u.cpp
@@ -4,7 +4,7 @@
 
 #include <array>
 #include <cstring>
-#include "common/archives.h"
+
 #include "common/common_funcs.h"
 #include "common/logging/log.h"
 #include "core/core.h"
@@ -14,22 +14,8 @@
 #include "core/hle/service/cam/y2r_u.h"
 #include "core/hw/y2r.h"
 
-SERVICE_CONSTRUCT_IMPL(Service::Y2R::Y2R_U)
-SERIALIZE_EXPORT_IMPL(Service::Y2R::Y2R_U)
-
 namespace Service::Y2R {
 
-template <class Archive>
-void Y2R_U::serialize(Archive& ar, const unsigned int) {
-    ar& boost::serialization::base_object<Kernel::SessionRequestHandler>(*this);
-    ar& completion_event;
-    ar& conversion;
-    ar& dithering_weight_params;
-    ar& temporal_dithering_enabled;
-    ar& transfer_end_interrupt_enabled;
-    ar& spacial_dithering_enabled;
-}
-
 constexpr std::array<CoefficientSet, 4> standard_coefficients{{
     {{0x100, 0x166, 0xB6, 0x58, 0x1C5, -0x166F, 0x10EE, -0x1C5B}}, // ITU_Rec601
     {{0x100, 0x193, 0x77, 0x2F, 0x1DB, -0x1933, 0xA7C, -0x1D51}},  // ITU_Rec709
diff --git a/src/core/hle/service/cam/y2r_u.h b/src/core/hle/service/cam/y2r_u.h
index b8757cd77..17b7427cb 100644
--- a/src/core/hle/service/cam/y2r_u.h
+++ b/src/core/hle/service/cam/y2r_u.h
@@ -7,7 +7,6 @@
 #include <array>
 #include <memory>
 #include <string>
-#include <boost/serialization/array.hpp>
 #include "common/common_types.h"
 #include "core/hle/result.h"
 #include "core/hle/service/service.h"
@@ -92,16 +91,6 @@ struct ConversionBuffer {
     u16 transfer_unit;
     /// Amount of bytes to be skipped between copying each `transfer_unit` bytes.
     u16 gap;
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& address;
-        ar& image_size;
-        ar& transfer_unit;
-        ar& gap;
-    }
-    friend class boost::serialization::access;
 };
 
 struct ConversionConfiguration {
@@ -123,26 +112,6 @@ struct ConversionConfiguration {
     Result SetInputLineWidth(u16 width);
     Result SetInputLines(u16 lines);
     Result SetStandardCoefficient(StandardCoefficient standard_coefficient);
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& input_format;
-        ar& output_format;
-        ar& rotation;
-        ar& block_alignment;
-        ar& input_line_width;
-        ar& input_lines;
-        ar& coefficients;
-        ar& padding;
-        ar& alpha;
-        ar& src_Y;
-        ar& src_U;
-        ar& src_V;
-        ar& src_YUYV;
-        ar& dst;
-    }
-    friend class boost::serialization::access;
 };
 
 struct DitheringWeightParams {
@@ -162,28 +131,6 @@ struct DitheringWeightParams {
     u16 w3_xOdd_yEven;
     u16 w3_xEven_yOdd;
     u16 w3_xOdd_yOdd;
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& w0_xEven_yEven;
-        ar& w0_xOdd_yEven;
-        ar& w0_xEven_yOdd;
-        ar& w0_xOdd_yOdd;
-        ar& w1_xEven_yEven;
-        ar& w1_xOdd_yEven;
-        ar& w1_xEven_yOdd;
-        ar& w1_xOdd_yOdd;
-        ar& w2_xEven_yEven;
-        ar& w2_xOdd_yEven;
-        ar& w2_xEven_yOdd;
-        ar& w2_xOdd_yOdd;
-        ar& w3_xEven_yEven;
-        ar& w3_xOdd_yEven;
-        ar& w3_xEven_yOdd;
-        ar& w3_xOdd_yOdd;
-    }
-    friend class boost::serialization::access;
 };
 
 struct ConversionParameters {
@@ -354,15 +301,8 @@ private:
     bool temporal_dithering_enabled = false;
     bool transfer_end_interrupt_enabled = false;
     bool spacial_dithering_enabled = false;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
-    friend class boost::serialization::access;
 };
 
 void InstallInterfaces(Core::System& system);
 
 } // namespace Service::Y2R
-
-SERVICE_CONSTRUCT(Service::Y2R::Y2R_U)
-BOOST_CLASS_EXPORT_KEY(Service::Y2R::Y2R_U)
diff --git a/src/core/hle/service/cecd/cecd.cpp b/src/core/hle/service/cecd/cecd.cpp
index bbd4cc0a2..390aedf7b 100644
--- a/src/core/hle/service/cecd/cecd.cpp
+++ b/src/core/hle/service/cecd/cecd.cpp
@@ -2,13 +2,11 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <boost/serialization/shared_ptr.hpp>
-#include <boost/serialization/unique_ptr.hpp>
 #include <cryptopp/base64.h>
 #include <cryptopp/hmac.h>
 #include <cryptopp/sha.h>
 #include <fmt/format.h>
-#include "common/archives.h"
+
 #include "common/common_paths.h"
 #include "common/file_util.h"
 #include "common/logging/log.h"
@@ -27,21 +25,8 @@
 #include "core/hle/service/cecd/cecd_u.h"
 #include "core/hle/service/cfg/cfg.h"
 
-SERVICE_CONSTRUCT_IMPL(Service::CECD::Module)
-SERIALIZE_EXPORT_IMPL(Service::CECD::Module)
-SERIALIZE_EXPORT_IMPL(Service::CECD::Module::SessionData)
-
 namespace Service::CECD {
 
-template <class Archive>
-void Module::serialize(Archive& ar, const unsigned int) {
-    ar& cecd_system_save_data_archive;
-    ar& cecinfo_event;
-    ar& cecinfosys_event;
-    ar& change_state_event;
-}
-SERIALIZE_IMPL(Module)
-
 using CecDataPathType = Module::CecDataPathType;
 using CecOpenMode = Module::CecOpenMode;
 using CecSystemInfoType = Module::CecSystemInfoType;
diff --git a/src/core/hle/service/cecd/cecd.h b/src/core/hle/service/cecd/cecd.h
index 5f3787296..2f60374e0 100644
--- a/src/core/hle/service/cecd/cecd.h
+++ b/src/core/hle/service/cecd/cecd.h
@@ -249,19 +249,6 @@ public:
         FileSys::Path path;
 
         std::unique_ptr<FileSys::FileBackend> file;
-
-    private:
-        template <class Archive>
-        void serialize(Archive& ar, const unsigned int) {
-            ar& boost::serialization::base_object<Kernel::SessionRequestHandler::SessionDataBase>(
-                *this);
-            ar& ncch_program_id;
-            ar& data_path_type;
-            ar& open_mode.raw;
-            ar& path;
-            ar& file;
-        }
-        friend class boost::serialization::access;
     };
 
     class Interface : public ServiceFramework<Interface, SessionData> {
@@ -629,17 +616,9 @@ private:
     std::shared_ptr<Kernel::Event> change_state_event;
 
     Core::System& system;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
-    friend class boost::serialization::access;
 };
 
 /// Initialize CECD service(s)
 void InstallInterfaces(Core::System& system);
 
 } // namespace Service::CECD
-
-SERVICE_CONSTRUCT(Service::CECD::Module)
-BOOST_CLASS_EXPORT_KEY(Service::CECD::Module)
-BOOST_CLASS_EXPORT_KEY(Service::CECD::Module::SessionData)
diff --git a/src/core/hle/service/cecd/cecd_ndm.cpp b/src/core/hle/service/cecd/cecd_ndm.cpp
index f393bd655..55d2bf7f5 100644
--- a/src/core/hle/service/cecd/cecd_ndm.cpp
+++ b/src/core/hle/service/cecd/cecd_ndm.cpp
@@ -2,11 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/cecd/cecd_ndm.h"
 
-SERIALIZE_EXPORT_IMPL(Service::CECD::CECD_NDM)
-
 namespace Service::CECD {
 
 CECD_NDM::CECD_NDM(std::shared_ptr<Module> cecd)
diff --git a/src/core/hle/service/cecd/cecd_ndm.h b/src/core/hle/service/cecd/cecd_ndm.h
index 9fd282585..a9fabb1a1 100644
--- a/src/core/hle/service/cecd/cecd_ndm.h
+++ b/src/core/hle/service/cecd/cecd_ndm.h
@@ -11,12 +11,6 @@ namespace Service::CECD {
 class CECD_NDM final : public Module::Interface {
 public:
     explicit CECD_NDM(std::shared_ptr<Module> cecd);
-
-private:
-    SERVICE_SERIALIZATION(CECD_NDM, cecd, Module)
 };
 
 } // namespace Service::CECD
-
-BOOST_CLASS_EXPORT_KEY(Service::CECD::CECD_NDM)
-BOOST_SERIALIZATION_CONSTRUCT(Service::CECD::CECD_NDM)
diff --git a/src/core/hle/service/cecd/cecd_s.cpp b/src/core/hle/service/cecd/cecd_s.cpp
index 3b76c738c..a784deb98 100644
--- a/src/core/hle/service/cecd/cecd_s.cpp
+++ b/src/core/hle/service/cecd/cecd_s.cpp
@@ -2,11 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/cecd/cecd_s.h"
 
-SERIALIZE_EXPORT_IMPL(Service::CECD::CECD_S)
-
 namespace Service::CECD {
 
 CECD_S::CECD_S(std::shared_ptr<Module> cecd)
diff --git a/src/core/hle/service/cecd/cecd_s.h b/src/core/hle/service/cecd/cecd_s.h
index 9c6a7afec..6c50b13ba 100644
--- a/src/core/hle/service/cecd/cecd_s.h
+++ b/src/core/hle/service/cecd/cecd_s.h
@@ -11,12 +11,6 @@ namespace Service::CECD {
 class CECD_S final : public Module::Interface {
 public:
     explicit CECD_S(std::shared_ptr<Module> cecd);
-
-private:
-    SERVICE_SERIALIZATION(CECD_S, cecd, Module)
 };
 
 } // namespace Service::CECD
-
-BOOST_CLASS_EXPORT_KEY(Service::CECD::CECD_S)
-BOOST_SERIALIZATION_CONSTRUCT(Service::CECD::CECD_S)
diff --git a/src/core/hle/service/cecd/cecd_u.cpp b/src/core/hle/service/cecd/cecd_u.cpp
index 75104a664..803f2d8f9 100644
--- a/src/core/hle/service/cecd/cecd_u.cpp
+++ b/src/core/hle/service/cecd/cecd_u.cpp
@@ -2,11 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/cecd/cecd_u.h"
 
-SERIALIZE_EXPORT_IMPL(Service::CECD::CECD_U)
-
 namespace Service::CECD {
 
 CECD_U::CECD_U(std::shared_ptr<Module> cecd)
diff --git a/src/core/hle/service/cecd/cecd_u.h b/src/core/hle/service/cecd/cecd_u.h
index 31e7a2367..49ddadb69 100644
--- a/src/core/hle/service/cecd/cecd_u.h
+++ b/src/core/hle/service/cecd/cecd_u.h
@@ -11,12 +11,6 @@ namespace Service::CECD {
 class CECD_U final : public Module::Interface {
 public:
     explicit CECD_U(std::shared_ptr<Module> cecd);
-
-private:
-    SERVICE_SERIALIZATION(CECD_U, cecd, Module)
 };
 
 } // namespace Service::CECD
-
-BOOST_CLASS_EXPORT_KEY(Service::CECD::CECD_U)
-BOOST_SERIALIZATION_CONSTRUCT(Service::CECD::CECD_U)
diff --git a/src/core/hle/service/cfg/cfg.cpp b/src/core/hle/service/cfg/cfg.cpp
index d118250ba..698101124 100644
--- a/src/core/hle/service/cfg/cfg.cpp
+++ b/src/core/hle/service/cfg/cfg.cpp
@@ -5,12 +5,10 @@
 #include <algorithm>
 #include <array>
 #include <tuple>
-#include <boost/serialization/array.hpp>
-#include <boost/serialization/unique_ptr.hpp>
 #include <cryptopp/osrng.h>
 #include <cryptopp/sha.h>
 #include <fmt/format.h>
-#include "common/archives.h"
+
 #include "common/file_util.h"
 #include "common/logging/log.h"
 #include "common/settings.h"
@@ -30,20 +28,8 @@
 #include "core/hle/service/cfg/cfg_u.h"
 #include "core/loader/loader.h"
 
-SERVICE_CONSTRUCT_IMPL(Service::CFG::Module)
-SERIALIZE_EXPORT_IMPL(Service::CFG::Module)
-
 namespace Service::CFG {
 
-template <class Archive>
-void Module::serialize(Archive& ar, const unsigned int) {
-    ar& cfg_config_file_buffer;
-    ar& cfg_system_save_data_archive;
-    ar& preferred_region_code;
-    ar& preferred_region_chosen;
-}
-SERIALIZE_IMPL(Module)
-
 /// The maximum number of block entries that can exist in the config file
 constexpr u32 CONFIG_FILE_MAX_BLOCK_ENTRIES = 1479;
 
diff --git a/src/core/hle/service/cfg/cfg.h b/src/core/hle/service/cfg/cfg.h
index 7bd6a1310..96cf95df8 100644
--- a/src/core/hle/service/cfg/cfg.h
+++ b/src/core/hle/service/cfg/cfg.h
@@ -679,10 +679,6 @@ private:
     LocalFriendCodeSeedB local_friend_code_seed_b;
     bool preferred_region_chosen = false;
     MCUData mcu_data{};
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
-    friend class boost::serialization::access;
 };
 
 std::shared_ptr<Module> GetModule(Core::System& system);
@@ -693,6 +689,3 @@ void InstallInterfaces(Core::System& system);
 std::string GetConsoleIdHash(Core::System& system);
 
 } // namespace Service::CFG
-
-SERVICE_CONSTRUCT(Service::CFG::Module)
-BOOST_CLASS_EXPORT_KEY(Service::CFG::Module)
diff --git a/src/core/hle/service/cfg/cfg_i.cpp b/src/core/hle/service/cfg/cfg_i.cpp
index aa7c17c3b..2d078de60 100644
--- a/src/core/hle/service/cfg/cfg_i.cpp
+++ b/src/core/hle/service/cfg/cfg_i.cpp
@@ -2,11 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/cfg/cfg_i.h"
 
-SERIALIZE_EXPORT_IMPL(Service::CFG::CFG_I)
-
 namespace Service::CFG {
 
 CFG_I::CFG_I(std::shared_ptr<Module> cfg) : Module::Interface(std::move(cfg), "cfg:i", 23) {
diff --git a/src/core/hle/service/cfg/cfg_i.h b/src/core/hle/service/cfg/cfg_i.h
index ac8ffb990..704eb4a71 100644
--- a/src/core/hle/service/cfg/cfg_i.h
+++ b/src/core/hle/service/cfg/cfg_i.h
@@ -11,12 +11,6 @@ namespace Service::CFG {
 class CFG_I final : public Module::Interface {
 public:
     explicit CFG_I(std::shared_ptr<Module> cfg);
-
-private:
-    SERVICE_SERIALIZATION(CFG_I, cfg, Module)
 };
 
 } // namespace Service::CFG
-
-BOOST_CLASS_EXPORT_KEY(Service::CFG::CFG_I)
-BOOST_SERIALIZATION_CONSTRUCT(Service::CFG::CFG_I)
diff --git a/src/core/hle/service/cfg/cfg_nor.cpp b/src/core/hle/service/cfg/cfg_nor.cpp
index aebed257c..6ecf1c563 100644
--- a/src/core/hle/service/cfg/cfg_nor.cpp
+++ b/src/core/hle/service/cfg/cfg_nor.cpp
@@ -2,11 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/cfg/cfg_nor.h"
 
-SERIALIZE_EXPORT_IMPL(Service::CFG::CFG_NOR)
-
 namespace Service::CFG {
 
 CFG_NOR::CFG_NOR() : ServiceFramework("cfg:nor", 23) {
diff --git a/src/core/hle/service/cfg/cfg_nor.h b/src/core/hle/service/cfg/cfg_nor.h
index 7e0a1a2b8..3dace92bd 100644
--- a/src/core/hle/service/cfg/cfg_nor.h
+++ b/src/core/hle/service/cfg/cfg_nor.h
@@ -11,11 +11,6 @@ namespace Service::CFG {
 class CFG_NOR final : public ServiceFramework<CFG_NOR> {
 public:
     CFG_NOR();
-
-private:
-    SERVICE_SERIALIZATION_SIMPLE
 };
 
 } // namespace Service::CFG
-
-BOOST_CLASS_EXPORT_KEY(Service::CFG::CFG_NOR)
diff --git a/src/core/hle/service/cfg/cfg_s.cpp b/src/core/hle/service/cfg/cfg_s.cpp
index 81aa5f487..372c05a20 100644
--- a/src/core/hle/service/cfg/cfg_s.cpp
+++ b/src/core/hle/service/cfg/cfg_s.cpp
@@ -2,11 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/cfg/cfg_s.h"
 
-SERIALIZE_EXPORT_IMPL(Service::CFG::CFG_S)
-
 namespace Service::CFG {
 
 CFG_S::CFG_S(std::shared_ptr<Module> cfg) : Module::Interface(std::move(cfg), "cfg:s", 23) {
diff --git a/src/core/hle/service/cfg/cfg_s.h b/src/core/hle/service/cfg/cfg_s.h
index d0cbc7a18..7f135b357 100644
--- a/src/core/hle/service/cfg/cfg_s.h
+++ b/src/core/hle/service/cfg/cfg_s.h
@@ -11,12 +11,6 @@ namespace Service::CFG {
 class CFG_S final : public Module::Interface {
 public:
     explicit CFG_S(std::shared_ptr<Module> cfg);
-
-private:
-    SERVICE_SERIALIZATION(CFG_S, cfg, Module)
 };
 
 } // namespace Service::CFG
-
-BOOST_CLASS_EXPORT_KEY(Service::CFG::CFG_S)
-BOOST_SERIALIZATION_CONSTRUCT(Service::CFG::CFG_S)
diff --git a/src/core/hle/service/cfg/cfg_u.cpp b/src/core/hle/service/cfg/cfg_u.cpp
index 57db9d45a..3291ce1db 100644
--- a/src/core/hle/service/cfg/cfg_u.cpp
+++ b/src/core/hle/service/cfg/cfg_u.cpp
@@ -2,11 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/cfg/cfg_u.h"
 
-SERIALIZE_EXPORT_IMPL(Service::CFG::CFG_U)
-
 namespace Service::CFG {
 
 CFG_U::CFG_U(std::shared_ptr<Module> cfg) : Module::Interface(std::move(cfg), "cfg:u", 23) {
diff --git a/src/core/hle/service/cfg/cfg_u.h b/src/core/hle/service/cfg/cfg_u.h
index 906377124..8b48e963e 100644
--- a/src/core/hle/service/cfg/cfg_u.h
+++ b/src/core/hle/service/cfg/cfg_u.h
@@ -11,12 +11,6 @@ namespace Service::CFG {
 class CFG_U final : public Module::Interface {
 public:
     explicit CFG_U(std::shared_ptr<Module> cfg);
-
-private:
-    SERVICE_SERIALIZATION(CFG_U, cfg, Module)
 };
 
 } // namespace Service::CFG
-
-BOOST_CLASS_EXPORT_KEY(Service::CFG::CFG_U)
-BOOST_SERIALIZATION_CONSTRUCT(Service::CFG::CFG_U)
diff --git a/src/core/hle/service/csnd/csnd_snd.cpp b/src/core/hle/service/csnd/csnd_snd.cpp
index cfd367ab3..ff11ba798 100644
--- a/src/core/hle/service/csnd/csnd_snd.cpp
+++ b/src/core/hle/service/csnd/csnd_snd.cpp
@@ -3,16 +3,13 @@
 // Refer to the license.txt file included.
 
 #include "common/alignment.h"
-#include "common/archives.h"
+
 #include "core/core.h"
 #include "core/hle/ipc_helpers.h"
 #include "core/hle/kernel/resource_limit.h"
 #include "core/hle/result.h"
 #include "core/hle/service/csnd/csnd_snd.h"
 
-SERVICE_CONSTRUCT_IMPL(Service::CSND::CSND_SND)
-SERIALIZE_EXPORT_IMPL(Service::CSND::CSND_SND)
-
 namespace Service::CSND {
 
 enum class CommandId : u16 {
diff --git a/src/core/hle/service/csnd/csnd_snd.h b/src/core/hle/service/csnd/csnd_snd.h
index 0b4cd4331..afdc3b1a8 100644
--- a/src/core/hle/service/csnd/csnd_snd.h
+++ b/src/core/hle/service/csnd/csnd_snd.h
@@ -5,8 +5,6 @@
 #pragma once
 
 #include <memory>
-#include <boost/serialization/array.hpp>
-#include <boost/serialization/shared_ptr.hpp>
 #include "core/hle/kernel/mutex.h"
 #include "core/hle/kernel/shared_memory.h"
 #include "core/hle/service/service.h"
@@ -35,14 +33,6 @@ enum class LoopMode : u8 {
 struct AdpcmState {
     s16 predictor = 0;
     u8 step_index = 0;
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& predictor;
-        ar& step_index;
-    }
-    friend class boost::serialization::access;
 };
 
 struct Channel {
@@ -62,28 +52,6 @@ struct Channel {
     LoopMode loop_mode = LoopMode::Manual;
     Encoding encoding = Encoding::Pcm8;
     u8 psg_duty = 0;
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& block1_address;
-        ar& block2_address;
-        ar& block1_size;
-        ar& block2_size;
-        ar& block1_adpcm_state;
-        ar& block2_adpcm_state;
-        ar& block2_adpcm_reload;
-        ar& left_channel_volume;
-        ar& right_channel_volume;
-        ar& left_capture_volume;
-        ar& right_capture_volume;
-        ar& sample_rate;
-        ar& linear_interpolation;
-        ar& loop_mode;
-        ar& encoding;
-        ar& psg_duty;
-    }
-    friend class boost::serialization::access;
 };
 
 class CSND_SND final : public ServiceFramework<CSND_SND> {
@@ -254,27 +222,9 @@ private:
     u32 type1_command_offset = 0;
 
     u32 acquired_channel_mask = 0;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& boost::serialization::base_object<Kernel::SessionRequestHandler>(*this);
-        ar& mutex;
-        ar& shared_memory;
-        ar& capture_units;
-        ar& channels;
-        ar& master_state_offset;
-        ar& channel_state_offset;
-        ar& capture_state_offset;
-        ar& type1_command_offset;
-        ar& acquired_channel_mask;
-    }
-    friend class boost::serialization::access;
 };
 
 /// Initializes the CSND_SND Service
 void InstallInterfaces(Core::System& system);
 
 } // namespace Service::CSND
-
-BOOST_CLASS_EXPORT_KEY(Service::CSND::CSND_SND)
-SERVICE_CONSTRUCT(Service::CSND::CSND_SND)
diff --git a/src/core/hle/service/dlp/dlp_clnt.cpp b/src/core/hle/service/dlp/dlp_clnt.cpp
index 8d79e9709..1b0d5a7e3 100644
--- a/src/core/hle/service/dlp/dlp_clnt.cpp
+++ b/src/core/hle/service/dlp/dlp_clnt.cpp
@@ -2,12 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/ipc_helpers.h"
 #include "core/hle/service/dlp/dlp_clnt.h"
 
-SERIALIZE_EXPORT_IMPL(Service::DLP::DLP_CLNT)
-
 namespace Service::DLP {
 
 DLP_CLNT::DLP_CLNT() : ServiceFramework("dlp:CLNT", 1) {
diff --git a/src/core/hle/service/dlp/dlp_clnt.h b/src/core/hle/service/dlp/dlp_clnt.h
index ac6933e7e..db506b985 100644
--- a/src/core/hle/service/dlp/dlp_clnt.h
+++ b/src/core/hle/service/dlp/dlp_clnt.h
@@ -12,11 +12,6 @@ class DLP_CLNT final : public ServiceFramework<DLP_CLNT> {
 public:
     DLP_CLNT();
     ~DLP_CLNT() = default;
-
-private:
-    SERVICE_SERIALIZATION_SIMPLE
 };
 
 } // namespace Service::DLP
-
-BOOST_CLASS_EXPORT_KEY(Service::DLP::DLP_CLNT)
diff --git a/src/core/hle/service/dlp/dlp_fkcl.cpp b/src/core/hle/service/dlp/dlp_fkcl.cpp
index ed247427d..685d20528 100644
--- a/src/core/hle/service/dlp/dlp_fkcl.cpp
+++ b/src/core/hle/service/dlp/dlp_fkcl.cpp
@@ -2,12 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/ipc_helpers.h"
 #include "core/hle/service/dlp/dlp_fkcl.h"
 
-SERIALIZE_EXPORT_IMPL(Service::DLP::DLP_FKCL)
-
 namespace Service::DLP {
 
 DLP_FKCL::DLP_FKCL() : ServiceFramework("dlp:FKCL", 1) {
diff --git a/src/core/hle/service/dlp/dlp_fkcl.h b/src/core/hle/service/dlp/dlp_fkcl.h
index c05a77b49..a3b2ac86d 100644
--- a/src/core/hle/service/dlp/dlp_fkcl.h
+++ b/src/core/hle/service/dlp/dlp_fkcl.h
@@ -12,11 +12,6 @@ class DLP_FKCL final : public ServiceFramework<DLP_FKCL> {
 public:
     DLP_FKCL();
     ~DLP_FKCL() = default;
-
-private:
-    SERVICE_SERIALIZATION_SIMPLE
 };
 
 } // namespace Service::DLP
-
-BOOST_CLASS_EXPORT_KEY(Service::DLP::DLP_FKCL)
diff --git a/src/core/hle/service/dlp/dlp_srvr.cpp b/src/core/hle/service/dlp/dlp_srvr.cpp
index b82d3e286..d1bc78237 100644
--- a/src/core/hle/service/dlp/dlp_srvr.cpp
+++ b/src/core/hle/service/dlp/dlp_srvr.cpp
@@ -2,15 +2,12 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "common/common_types.h"
 #include "common/logging/log.h"
 #include "core/hle/ipc_helpers.h"
 #include "core/hle/result.h"
 #include "core/hle/service/dlp/dlp_srvr.h"
 
-SERIALIZE_EXPORT_IMPL(Service::DLP::DLP_SRVR)
-
 namespace Service::DLP {
 
 void DLP_SRVR::IsChild(Kernel::HLERequestContext& ctx) {
diff --git a/src/core/hle/service/dlp/dlp_srvr.h b/src/core/hle/service/dlp/dlp_srvr.h
index 625740d2f..50d8d92b2 100644
--- a/src/core/hle/service/dlp/dlp_srvr.h
+++ b/src/core/hle/service/dlp/dlp_srvr.h
@@ -15,10 +15,6 @@ public:
 
 private:
     void IsChild(Kernel::HLERequestContext& ctx);
-
-    SERVICE_SERIALIZATION_SIMPLE
 };
 
 } // namespace Service::DLP
-
-BOOST_CLASS_EXPORT_KEY(Service::DLP::DLP_SRVR)
diff --git a/src/core/hle/service/dsp/dsp_dsp.cpp b/src/core/hle/service/dsp/dsp_dsp.cpp
index 9b4a9c27b..fc930c44b 100644
--- a/src/core/hle/service/dsp/dsp_dsp.cpp
+++ b/src/core/hle/service/dsp/dsp_dsp.cpp
@@ -3,7 +3,7 @@
 // Refer to the license.txt file included.
 
 #include "audio_core/audio_types.h"
-#include "common/archives.h"
+
 #include "common/assert.h"
 #include "common/logging/log.h"
 #include "core/core.h"
@@ -14,9 +14,6 @@
 using DspPipe = AudioCore::DspPipe;
 using InterruptType = Service::DSP::InterruptType;
 
-SERIALIZE_EXPORT_IMPL(Service::DSP::DSP_DSP)
-SERVICE_CONSTRUCT_IMPL(Service::DSP::DSP_DSP)
-
 namespace AudioCore {
 enum class DspPipe;
 }
diff --git a/src/core/hle/service/dsp/dsp_dsp.h b/src/core/hle/service/dsp/dsp_dsp.h
index 1eecb29cc..f22982946 100644
--- a/src/core/hle/service/dsp/dsp_dsp.h
+++ b/src/core/hle/service/dsp/dsp_dsp.h
@@ -5,9 +5,6 @@
 #pragma once
 
 #include <memory>
-#include <boost/serialization/array.hpp>
-#include <boost/serialization/base_object.hpp>
-#include <boost/serialization/shared_ptr.hpp>
 #include "audio_core/dsp_interface.h"
 #include "core/hle/kernel/event.h"
 #include "core/hle/result.h"
@@ -266,22 +263,8 @@ private:
 
     /// Each DSP pipe has an associated interrupt
     std::array<std::shared_ptr<Kernel::Event>, AudioCore::num_dsp_pipe> pipes = {{}};
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& boost::serialization::base_object<Kernel::SessionRequestHandler>(*this);
-        ar& semaphore_event;
-        ar& preset_semaphore;
-        ar& interrupt_zero;
-        ar& interrupt_one;
-        ar& pipes;
-    }
-    friend class boost::serialization::access;
 };
 
 void InstallInterfaces(Core::System& system);
 
 } // namespace Service::DSP
-
-BOOST_CLASS_EXPORT_KEY(Service::DSP::DSP_DSP)
-SERVICE_CONSTRUCT(Service::DSP::DSP_DSP)
diff --git a/src/core/hle/service/err/err_f.cpp b/src/core/hle/service/err/err_f.cpp
index c503a08ec..e7bb4a87b 100644
--- a/src/core/hle/service/err/err_f.cpp
+++ b/src/core/hle/service/err/err_f.cpp
@@ -6,7 +6,7 @@
 #include <chrono>
 #include <iomanip>
 #include <sstream>
-#include "common/archives.h"
+
 #include "common/bit_field.h"
 #include "common/common_types.h"
 #include "common/logging/log.h"
@@ -18,18 +18,6 @@
 #undef exception_info // We use 'exception_info' as a plain identifier, but MSVC defines this in one
                       // of its many headers.
 
-SERIALIZE_EXPORT_IMPL(Service::ERR::ERR_F)
-
-namespace boost::serialization {
-template <class Archive>
-void load_construct_data(Archive& ar, Service::ERR::ERR_F* t, const unsigned int) {
-    ::new (t) Service::ERR::ERR_F(Core::Global<Core::System>());
-}
-
-template void load_construct_data<iarchive>(iarchive& ar, Service::ERR::ERR_F* t,
-                                            const unsigned int);
-} // namespace boost::serialization
-
 namespace Service::ERR {
 
 enum class FatalErrType : u32 {
diff --git a/src/core/hle/service/err/err_f.h b/src/core/hle/service/err/err_f.h
index 1b9fad452..4a1684caf 100644
--- a/src/core/hle/service/err/err_f.h
+++ b/src/core/hle/service/err/err_f.h
@@ -34,17 +34,8 @@ private:
     void ThrowFatalError(Kernel::HLERequestContext& ctx);
 
     Core::System& system;
-
-    SERVICE_SERIALIZATION_SIMPLE
 };
 
 void InstallInterfaces(Core::System& system);
 
 } // namespace Service::ERR
-
-BOOST_CLASS_EXPORT_KEY(Service::ERR::ERR_F)
-
-namespace boost::serialization {
-template <class Archive>
-void load_construct_data(Archive& ar, Service::ERR::ERR_F* t, const unsigned int);
-}
diff --git a/src/core/hle/service/frd/frd.cpp b/src/core/hle/service/frd/frd.cpp
index 2b0c0d876..c09cf1662 100644
--- a/src/core/hle/service/frd/frd.cpp
+++ b/src/core/hle/service/frd/frd.cpp
@@ -5,7 +5,7 @@
 #include <array>
 #include <cstring>
 #include <vector>
-#include "common/archives.h"
+
 #include "common/assert.h"
 #include "common/logging/log.h"
 #include "core/core.h"
@@ -19,8 +19,6 @@
 #include "core/hle/service/frd/frd_a.h"
 #include "core/hle/service/frd/frd_u.h"
 
-SERVICE_CONSTRUCT_IMPL(Service::FRD::Module)
-
 namespace Service::FRD {
 
 Module::Interface::Interface(std::shared_ptr<Module> frd, const char* name, u32 max_session)
diff --git a/src/core/hle/service/frd/frd.h b/src/core/hle/service/frd/frd.h
index bb5199cb7..2a0e170d3 100644
--- a/src/core/hle/service/frd/frd.h
+++ b/src/core/hle/service/frd/frd.h
@@ -22,26 +22,10 @@ struct FriendKey {
     u32 friend_id;
     u32 unknown;
     u64 friend_code;
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& friend_id;
-        ar& unknown;
-        ar& friend_code;
-    }
-    friend class boost::serialization::access;
 };
 
 struct MyPresence {
     u8 unknown[0x12C];
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& unknown;
-    }
-    friend class boost::serialization::access;
 };
 
 struct Profile {
@@ -268,18 +252,8 @@ private:
     std::shared_ptr<Kernel::Event> login_event;
     Core::TimingEventType* login_delay_event;
     Core::System& system;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& my_friend_key;
-        ar& my_presence;
-        ar& logged_in;
-    }
-    friend class boost::serialization::access;
 };
 
 void InstallInterfaces(Core::System& system);
 
 } // namespace Service::FRD
-
-SERVICE_CONSTRUCT(Service::FRD::Module)
diff --git a/src/core/hle/service/frd/frd_a.cpp b/src/core/hle/service/frd/frd_a.cpp
index 64ea53dc6..7976febf6 100644
--- a/src/core/hle/service/frd/frd_a.cpp
+++ b/src/core/hle/service/frd/frd_a.cpp
@@ -2,11 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/frd/frd_a.h"
 
-SERIALIZE_EXPORT_IMPL(Service::FRD::FRD_A)
-
 namespace Service::FRD {
 
 FRD_A::FRD_A(std::shared_ptr<Module> frd) : Module::Interface(std::move(frd), "frd:a", 8) {
diff --git a/src/core/hle/service/frd/frd_a.h b/src/core/hle/service/frd/frd_a.h
index 0bdd87525..97657a072 100644
--- a/src/core/hle/service/frd/frd_a.h
+++ b/src/core/hle/service/frd/frd_a.h
@@ -11,12 +11,6 @@ namespace Service::FRD {
 class FRD_A final : public Module::Interface {
 public:
     explicit FRD_A(std::shared_ptr<Module> frd);
-
-private:
-    SERVICE_SERIALIZATION(FRD_A, frd, Module)
 };
 
 } // namespace Service::FRD
-
-BOOST_CLASS_EXPORT_KEY(Service::FRD::FRD_A)
-BOOST_SERIALIZATION_CONSTRUCT(Service::FRD::FRD_A)
diff --git a/src/core/hle/service/frd/frd_u.cpp b/src/core/hle/service/frd/frd_u.cpp
index ed545c808..c7ac87b61 100644
--- a/src/core/hle/service/frd/frd_u.cpp
+++ b/src/core/hle/service/frd/frd_u.cpp
@@ -2,11 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/frd/frd_u.h"
 
-SERIALIZE_EXPORT_IMPL(Service::FRD::FRD_U)
-
 namespace Service::FRD {
 
 FRD_U::FRD_U(std::shared_ptr<Module> frd) : Module::Interface(std::move(frd), "frd:u", 8) {
diff --git a/src/core/hle/service/frd/frd_u.h b/src/core/hle/service/frd/frd_u.h
index e6adc37fb..5704d5e11 100644
--- a/src/core/hle/service/frd/frd_u.h
+++ b/src/core/hle/service/frd/frd_u.h
@@ -11,12 +11,6 @@ namespace Service::FRD {
 class FRD_U final : public Module::Interface {
 public:
     explicit FRD_U(std::shared_ptr<Module> frd);
-
-private:
-    SERVICE_SERIALIZATION(FRD_U, frd, Module)
 };
 
 } // namespace Service::FRD
-
-BOOST_CLASS_EXPORT_KEY(Service::FRD::FRD_U)
-BOOST_SERIALIZATION_CONSTRUCT(Service::FRD::FRD_U)
diff --git a/src/core/hle/service/fs/archive.h b/src/core/hle/service/fs/archive.h
index 245e929f9..8f1200529 100644
--- a/src/core/hle/service/fs/archive.h
+++ b/src/core/hle/service/fs/archive.h
@@ -8,8 +8,6 @@
 #include <span>
 #include <string>
 #include <unordered_map>
-#include <boost/serialization/unique_ptr.hpp>
-#include <boost/serialization/unordered_map.hpp>
 #include "common/common_types.h"
 #include "core/file_sys/archive_backend.h"
 #include "core/hle/result.h"
@@ -284,14 +282,6 @@ private:
      */
     std::unordered_map<ArchiveHandle, std::unique_ptr<ArchiveBackend>> handle_map;
     ArchiveHandle next_handle = 1;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& id_code_map;
-        ar& handle_map;
-        ar& next_handle;
-    }
-    friend class boost::serialization::access;
 };
 
 } // namespace Service::FS
diff --git a/src/core/hle/service/fs/directory.cpp b/src/core/hle/service/fs/directory.cpp
index e83649a1d..a2448c8b3 100644
--- a/src/core/hle/service/fs/directory.cpp
+++ b/src/core/hle/service/fs/directory.cpp
@@ -2,33 +2,16 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <boost/serialization/base_object.hpp>
-#include <boost/serialization/unique_ptr.hpp>
-#include "common/archives.h"
 #include "common/logging/log.h"
 #include "core/file_sys/directory_backend.h"
 #include "core/hle/ipc_helpers.h"
 #include "core/hle/service/fs/directory.h"
 
-SERIALIZE_EXPORT_IMPL(Service::FS::Directory)
-
 namespace Service::FS {
 
-template <class Archive>
-void Directory::serialize(Archive& ar, const unsigned int) {
-    ar& boost::serialization::base_object<Kernel::SessionRequestHandler>(*this);
-    ar& path;
-    ar& backend;
-}
-
 Directory::Directory(std::unique_ptr<FileSys::DirectoryBackend>&& backend,
                      const FileSys::Path& path)
-    : Directory() {
-    this->backend = std::move(backend);
-    this->path = path;
-}
-
-Directory::Directory() : ServiceFramework("", 1), path(""), backend(nullptr) {
+    : ServiceFramework("", 1) {
     static const FunctionInfo functions[] = {
         // clang-format off
         {0x0801, &Directory::Read, "Read"},
@@ -36,6 +19,8 @@ Directory::Directory() : ServiceFramework("", 1), path(""), backend(nullptr) {
         // clang-format on
     };
     RegisterHandlers(functions);
+    this->backend = std::move(backend);
+    this->path = path;
 }
 
 Directory::~Directory() {}
diff --git a/src/core/hle/service/fs/directory.h b/src/core/hle/service/fs/directory.h
index 77956b166..8cd146a44 100644
--- a/src/core/hle/service/fs/directory.h
+++ b/src/core/hle/service/fs/directory.h
@@ -19,21 +19,12 @@ public:
         return "Directory: " + path.DebugStr();
     }
 
-    FileSys::Path path;                                 ///< Path of the directory
-    std::unique_ptr<FileSys::DirectoryBackend> backend; ///< File backend interface
+    FileSys::Path path = "";                              ///< Path of the directory
+    std::unique_ptr<FileSys::DirectoryBackend> backend{}; ///< File backend interface
 
 protected:
     void Read(Kernel::HLERequestContext& ctx);
     void Close(Kernel::HLERequestContext& ctx);
-
-private:
-    Directory();
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
-    friend class boost::serialization::access;
 };
 
 } // namespace Service::FS
-
-BOOST_CLASS_EXPORT_KEY(Service::FS::Directory)
diff --git a/src/core/hle/service/fs/file.cpp b/src/core/hle/service/fs/file.cpp
index 702e2018e..3b57927ee 100644
--- a/src/core/hle/service/fs/file.cpp
+++ b/src/core/hle/service/fs/file.cpp
@@ -2,8 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <boost/serialization/unique_ptr.hpp>
-#include "common/archives.h"
 #include "common/logging/log.h"
 #include "core/core.h"
 #include "core/file_sys/errors.h"
@@ -11,33 +9,14 @@
 #include "core/hle/ipc_helpers.h"
 #include "core/hle/kernel/client_port.h"
 #include "core/hle/kernel/client_session.h"
-#include "core/hle/kernel/event.h"
 #include "core/hle/kernel/server_session.h"
 #include "core/hle/service/fs/file.h"
 
-SERIALIZE_EXPORT_IMPL(Service::FS::File)
-SERIALIZE_EXPORT_IMPL(Service::FS::FileSessionSlot)
-
 namespace Service::FS {
 
-template <class Archive>
-void File::serialize(Archive& ar, const unsigned int) {
-    ar& boost::serialization::base_object<Kernel::SessionRequestHandler>(*this);
-    ar& path;
-    ar& backend;
-}
-
-File::File() : File(Core::Global<Kernel::KernelSystem>()) {}
-
 File::File(Kernel::KernelSystem& kernel, std::unique_ptr<FileSys::FileBackend>&& backend,
            const FileSys::Path& path)
-    : File(kernel) {
-    this->backend = std::move(backend);
-    this->path = path;
-}
-
-File::File(Kernel::KernelSystem& kernel)
-    : ServiceFramework("", 1), path(""), backend(nullptr), kernel(kernel) {
+    : ServiceFramework("", 1), kernel(kernel) {
     static const FunctionInfo functions[] = {
         {0x0801, &File::OpenSubFile, "OpenSubFile"},
         {0x0802, &File::Read, "Read"},
@@ -51,6 +30,8 @@ File::File(Kernel::KernelSystem& kernel)
         {0x080C, &File::OpenLinkFile, "OpenLinkFile"},
     };
     RegisterHandlers(functions);
+    this->backend = std::move(backend);
+    this->path = path;
 }
 
 void File::Read(Kernel::HLERequestContext& ctx) {
diff --git a/src/core/hle/service/fs/file.h b/src/core/hle/service/fs/file.h
index a6ef69304..9fad4fbd1 100644
--- a/src/core/hle/service/fs/file.h
+++ b/src/core/hle/service/fs/file.h
@@ -5,9 +5,8 @@
 #pragma once
 
 #include <memory>
-#include <boost/serialization/base_object.hpp>
 #include "core/file_sys/archive_backend.h"
-#include "core/global.h"
+
 #include "core/hle/service/service.h"
 
 namespace Core {
@@ -21,18 +20,6 @@ struct FileSessionSlot : public Kernel::SessionRequestHandler::SessionDataBase {
     u64 offset;   ///< Offset that this session will start reading from.
     u64 size;     ///< Max size of the file that this session is allowed to access
     bool subfile; ///< Whether this file was opened via OpenSubFile or not.
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& boost::serialization::base_object<Kernel::SessionRequestHandler::SessionDataBase>(
-            *this);
-        ar& priority;
-        ar& offset;
-        ar& size;
-        ar& subfile;
-    }
-    friend class boost::serialization::access;
 };
 
 // TODO: File is not a real service, but it can still utilize ServiceFramework::RegisterHandlers.
@@ -47,8 +34,8 @@ public:
         return "Path: " + path.DebugStr();
     }
 
-    FileSys::Path path;                            ///< Path of the file
-    std::unique_ptr<FileSys::FileBackend> backend; ///< File backend interface
+    FileSys::Path path = "";                         ///< Path of the file
+    std::unique_ptr<FileSys::FileBackend> backend{}; ///< File backend interface
 
     /// Creates a new session to this File and returns the ClientSession part of the connection.
     std::shared_ptr<Kernel::ClientSession> Connect();
@@ -73,17 +60,8 @@ private:
     void OpenLinkFile(Kernel::HLERequestContext& ctx);
     void OpenSubFile(Kernel::HLERequestContext& ctx);
 
+private:
     Kernel::KernelSystem& kernel;
-
-    File(Kernel::KernelSystem& kernel);
-    File();
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
-    friend class boost::serialization::access;
 };
 
 } // namespace Service::FS
-
-BOOST_CLASS_EXPORT_KEY(Service::FS::FileSessionSlot)
-BOOST_CLASS_EXPORT_KEY(Service::FS::File)
diff --git a/src/core/hle/service/fs/fs_user.cpp b/src/core/hle/service/fs/fs_user.cpp
index 855378184..3a10de2b4 100644
--- a/src/core/hle/service/fs/fs_user.cpp
+++ b/src/core/hle/service/fs/fs_user.cpp
@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "common/assert.h"
 #include "common/common_types.h"
 #include "common/file_util.h"
@@ -26,10 +25,6 @@
 #include "core/hle/service/fs/archive.h"
 #include "core/hle/service/fs/fs_user.h"
 
-SERVICE_CONSTRUCT_IMPL(Service::FS::FS_USER)
-SERIALIZE_EXPORT_IMPL(Service::FS::FS_USER)
-SERIALIZE_EXPORT_IMPL(Service::FS::ClientSlot)
-
 using Kernel::ClientSession;
 using Kernel::ServerSession;
 
diff --git a/src/core/hle/service/fs/fs_user.h b/src/core/hle/service/fs/fs_user.h
index 57285995a..eeb83e48d 100644
--- a/src/core/hle/service/fs/fs_user.h
+++ b/src/core/hle/service/fs/fs_user.h
@@ -6,7 +6,6 @@
 
 #include <optional>
 #include <unordered_map>
-#include <boost/serialization/base_object.hpp>
 #include "common/common_types.h"
 #include "core/file_sys/errors.h"
 #include "core/hle/service/fs/archive.h"
@@ -34,15 +33,6 @@ struct ClientSlot : public Kernel::SessionRequestHandler::SessionDataBase {
     // behaviour is modified. Since we don't emulate fs:REG mechanism, we assume the program ID is
     // the same as codeset ID and fetch from there directly.
     u64 program_id = 0;
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& boost::serialization::base_object<Kernel::SessionRequestHandler::SessionDataBase>(
-            *this);
-        ar& program_id;
-    }
-    friend class boost::serialization::access;
 };
 
 class FS_USER final : public ServiceFramework<FS_USER, ClientSlot> {
@@ -721,19 +711,8 @@ private:
 
     Core::System& system;
     ArchiveManager& archives;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& boost::serialization::base_object<Kernel::SessionRequestHandler>(*this);
-        ar& priority;
-    }
-    friend class boost::serialization::access;
 };
 
 void InstallInterfaces(Core::System& system);
 
 } // namespace Service::FS
-
-SERVICE_CONSTRUCT(Service::FS::FS_USER)
-BOOST_CLASS_EXPORT_KEY(Service::FS::FS_USER)
-BOOST_CLASS_EXPORT_KEY(Service::FS::ClientSlot)
diff --git a/src/core/hle/service/gsp/gsp_gpu.cpp b/src/core/hle/service/gsp/gsp_gpu.cpp
index 374bbe3c6..7b69e2612 100644
--- a/src/core/hle/service/gsp/gsp_gpu.cpp
+++ b/src/core/hle/service/gsp/gsp_gpu.cpp
@@ -4,10 +4,7 @@
 
 #include <span>
 #include <vector>
-#include <boost/serialization/base_object.hpp>
-#include <boost/serialization/optional.hpp>
-#include <boost/serialization/shared_ptr.hpp>
-#include "common/archives.h"
+
 #include "common/bit_field.h"
 #include "core/core.h"
 #include "core/hle/ipc_helpers.h"
@@ -20,10 +17,6 @@
 #include "video_core/gpu_debugger.h"
 #include "video_core/pica/regs_lcd.h"
 
-SERIALIZE_EXPORT_IMPL(Service::GSP::SessionData)
-SERIALIZE_EXPORT_IMPL(Service::GSP::GSP_GPU)
-SERVICE_CONSTRUCT_IMPL(Service::GSP::GSP_GPU)
-
 namespace Service::GSP {
 
 // Beginning address of HW regs
@@ -671,17 +664,6 @@ SessionData* GSP_GPU::FindRegisteredThreadData(u32 thread_id) {
     return nullptr;
 }
 
-template <class Archive>
-void GSP_GPU::serialize(Archive& ar, const unsigned int) {
-    ar& boost::serialization::base_object<Kernel::SessionRequestHandler>(*this);
-    ar& shared_memory;
-    ar& active_thread_id;
-    ar& first_initialization;
-    ar& used_thread_ids;
-    ar& saved_vram;
-}
-SERIALIZE_IMPL(GSP_GPU)
-
 GSP_GPU::GSP_GPU(Core::System& system) : ServiceFramework("gsp::Gpu", 4), system(system) {
     static const FunctionInfo functions[] = {
         // clang-format off
@@ -734,16 +716,6 @@ std::unique_ptr<Kernel::SessionRequestHandler::SessionDataBase> GSP_GPU::MakeSes
     return std::make_unique<SessionData>(this);
 }
 
-template <class Archive>
-void SessionData::serialize(Archive& ar, const unsigned int) {
-    ar& boost::serialization::base_object<Kernel::SessionRequestHandler::SessionDataBase>(*this);
-    ar& gsp;
-    ar& interrupt_event;
-    ar& thread_id;
-    ar& registered;
-}
-SERIALIZE_IMPL(SessionData)
-
 SessionData::SessionData(GSP_GPU* gsp) : gsp(gsp) {
     // Assign a new thread id to this session when it connects. Note: In the real GSP service this
     // is done through a real thread (svcCreateThread) but we have to simulate it since our HLE
diff --git a/src/core/hle/service/gsp/gsp_gpu.h b/src/core/hle/service/gsp/gsp_gpu.h
index e1bc5eb4f..c57ecdf3b 100644
--- a/src/core/hle/service/gsp/gsp_gpu.h
+++ b/src/core/hle/service/gsp/gsp_gpu.h
@@ -8,7 +8,6 @@
 #include <memory>
 #include <string>
 #include <boost/optional/optional.hpp>
-#include <boost/serialization/export.hpp>
 #include "common/bit_field.h"
 #include "common/common_types.h"
 #include "core/hle/kernel/event.h"
@@ -80,11 +79,6 @@ public:
     u32 thread_id;
     /// Whether RegisterInterruptRelayQueue was called for this session
     bool registered = false;
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
-    friend class boost::serialization::access;
 };
 
 class GSP_GPU final : public ServiceFramework<GSP_GPU, SessionData> {
@@ -390,14 +384,6 @@ private:
     std::array<bool, MaxGSPThreads> used_thread_ids{};
 
     friend class SessionData;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
-    friend class boost::serialization::access;
 };
 
 } // namespace Service::GSP
-
-BOOST_CLASS_EXPORT_KEY(Service::GSP::SessionData)
-BOOST_CLASS_EXPORT_KEY(Service::GSP::GSP_GPU)
-SERVICE_CONSTRUCT(Service::GSP::GSP_GPU)
diff --git a/src/core/hle/service/gsp/gsp_lcd.cpp b/src/core/hle/service/gsp/gsp_lcd.cpp
index 4c155990b..0d4add49a 100644
--- a/src/core/hle/service/gsp/gsp_lcd.cpp
+++ b/src/core/hle/service/gsp/gsp_lcd.cpp
@@ -2,12 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/ipc_helpers.h"
 #include "core/hle/service/gsp/gsp_lcd.h"
 
-SERIALIZE_EXPORT_IMPL(Service::GSP::GSP_LCD)
-
 namespace Service::GSP {
 
 GSP_LCD::GSP_LCD() : ServiceFramework("gsp::Lcd") {
diff --git a/src/core/hle/service/gsp/gsp_lcd.h b/src/core/hle/service/gsp/gsp_lcd.h
index 31d17f540..24e57fb42 100644
--- a/src/core/hle/service/gsp/gsp_lcd.h
+++ b/src/core/hle/service/gsp/gsp_lcd.h
@@ -12,11 +12,6 @@ class GSP_LCD final : public ServiceFramework<GSP_LCD> {
 public:
     GSP_LCD();
     ~GSP_LCD() = default;
-
-private:
-    SERVICE_SERIALIZATION_SIMPLE
 };
 
 } // namespace Service::GSP
-
-BOOST_CLASS_EXPORT_KEY(Service::GSP::GSP_LCD)
diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp
index 9013fd4b1..13490840a 100644
--- a/src/core/hle/service/hid/hid.cpp
+++ b/src/core/hle/service/hid/hid.cpp
@@ -5,10 +5,7 @@
 #include <algorithm>
 #include <cmath>
 #include <numeric>
-#include <boost/serialization/array.hpp>
-#include <boost/serialization/shared_ptr.hpp>
-#include <boost/serialization/unique_ptr.hpp>
-#include "common/archives.h"
+
 #include "common/logging/log.h"
 #include "core/3ds.h"
 #include "core/core.h"
@@ -23,36 +20,8 @@
 #include "core/hle/service/service.h"
 #include "core/movie.h"
 
-SERVICE_CONSTRUCT_IMPL(Service::HID::Module)
-SERIALIZE_EXPORT_IMPL(Service::HID::Module)
-
 namespace Service::HID {
 
-template <class Archive>
-void Module::serialize(Archive& ar, const unsigned int file_version) {
-    ar& shared_mem;
-    ar& event_pad_or_touch_1;
-    ar& event_pad_or_touch_2;
-    ar& event_accelerometer;
-    ar& event_gyroscope;
-    ar& event_debug_pad;
-    ar& next_pad_index;
-    ar& next_touch_index;
-    ar& next_accelerometer_index;
-    ar& next_gyroscope_index;
-    ar& enable_accelerometer_count;
-    ar& enable_gyroscope_count;
-    if (Archive::is_loading::value) {
-        LoadInputDevices();
-    }
-    ar& state.hex;
-    ar& circle_pad_old_x;
-    ar& circle_pad_old_y;
-    // Update events are set in the constructor
-    // Devices are set from the implementation (and are stateless afaik)
-}
-SERIALIZE_IMPL(Module)
-
 constexpr float accelerometer_coef = 512.0f; // measured from hw test result
 constexpr float gyroscope_coef = 14.375f; // got from hwtest GetGyroscopeLowRawToDpsCoefficient call
 
diff --git a/src/core/hle/service/hid/hid.h b/src/core/hle/service/hid/hid.h
index 609cb9276..14cd4309f 100644
--- a/src/core/hle/service/hid/hid.h
+++ b/src/core/hle/service/hid/hid.h
@@ -9,7 +9,6 @@
 #include <cstddef>
 #include <memory>
 #include <vector>
-#include <boost/serialization/version.hpp>
 #include "common/bit_field.h"
 #include "common/common_funcs.h"
 #include "common/common_types.h"
@@ -354,17 +353,9 @@ private:
     std::unique_ptr<Input::MotionDevice> motion_device;
     std::unique_ptr<Input::TouchDevice> touch_device;
     std::unique_ptr<Input::TouchDevice> touch_btn_device;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
-    friend class boost::serialization::access;
 };
 
 std::shared_ptr<Module> GetModule(Core::System& system);
 
 void InstallInterfaces(Core::System& system);
 } // namespace Service::HID
-
-SERVICE_CONSTRUCT(Service::HID::Module)
-BOOST_CLASS_EXPORT_KEY(Service::HID::Module)
-BOOST_CLASS_VERSION(Service::HID::Module, 1)
diff --git a/src/core/hle/service/hid/hid_spvr.cpp b/src/core/hle/service/hid/hid_spvr.cpp
index a82c9795b..20f6ac400 100644
--- a/src/core/hle/service/hid/hid_spvr.cpp
+++ b/src/core/hle/service/hid/hid_spvr.cpp
@@ -2,11 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/hid/hid_spvr.h"
 
-SERIALIZE_EXPORT_IMPL(Service::HID::Spvr)
-
 namespace Service::HID {
 
 Spvr::Spvr(std::shared_ptr<Module> hid) : Module::Interface(std::move(hid), "hid:SPVR", 6) {
diff --git a/src/core/hle/service/hid/hid_spvr.h b/src/core/hle/service/hid/hid_spvr.h
index 749bd36b8..e2346dda5 100644
--- a/src/core/hle/service/hid/hid_spvr.h
+++ b/src/core/hle/service/hid/hid_spvr.h
@@ -11,12 +11,6 @@ namespace Service::HID {
 class Spvr final : public Module::Interface {
 public:
     explicit Spvr(std::shared_ptr<Module> hid);
-
-private:
-    SERVICE_SERIALIZATION(Spvr, hid, Module)
 };
 
 } // namespace Service::HID
-
-BOOST_CLASS_EXPORT_KEY(Service::HID::Spvr)
-BOOST_SERIALIZATION_CONSTRUCT(Service::HID::Spvr)
diff --git a/src/core/hle/service/hid/hid_user.cpp b/src/core/hle/service/hid/hid_user.cpp
index c5b17f180..88e1044b2 100644
--- a/src/core/hle/service/hid/hid_user.cpp
+++ b/src/core/hle/service/hid/hid_user.cpp
@@ -2,11 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/hid/hid_user.h"
 
-SERIALIZE_EXPORT_IMPL(Service::HID::User)
-
 namespace Service::HID {
 
 User::User(std::shared_ptr<Module> hid) : Module::Interface(std::move(hid), "hid:USER", 6) {
diff --git a/src/core/hle/service/hid/hid_user.h b/src/core/hle/service/hid/hid_user.h
index 8a6763ea6..813f09504 100644
--- a/src/core/hle/service/hid/hid_user.h
+++ b/src/core/hle/service/hid/hid_user.h
@@ -14,12 +14,6 @@ namespace Service::HID {
 class User final : public Module::Interface {
 public:
     explicit User(std::shared_ptr<Module> hid);
-
-private:
-    SERVICE_SERIALIZATION(User, hid, Module)
 };
 
 } // namespace Service::HID
-
-BOOST_CLASS_EXPORT_KEY(Service::HID::User)
-BOOST_SERIALIZATION_CONSTRUCT(Service::HID::User)
diff --git a/src/core/hle/service/http/http_c.cpp b/src/core/hle/service/http/http_c.cpp
index 3337580a5..afd8cf4ef 100644
--- a/src/core/hle/service/http/http_c.cpp
+++ b/src/core/hle/service/http/http_c.cpp
@@ -9,7 +9,7 @@
 #include <cryptopp/aes.h>
 #include <cryptopp/modes.h>
 #include <fmt/format.h>
-#include "common/archives.h"
+
 #include "common/assert.h"
 #include "common/scope_exit.h"
 #include "common/string_util.h"
@@ -23,9 +23,6 @@
 #include "core/hle/service/http/http_c.h"
 #include "core/hw/aes/key.h"
 
-SERIALIZE_EXPORT_IMPL(Service::HTTP::HTTP_C)
-SERIALIZE_EXPORT_IMPL(Service::HTTP::SessionData)
-
 namespace Service::HTTP {
 
 namespace ErrCodes {
diff --git a/src/core/hle/service/http/http_c.h b/src/core/hle/service/http/http_c.h
index 7f71aebcd..6366e30fd 100644
--- a/src/core/hle/service/http/http_c.h
+++ b/src/core/hle/service/http/http_c.h
@@ -11,12 +11,6 @@
 #include <unordered_map>
 #include <vector>
 #include <boost/optional.hpp>
-#include <boost/serialization/optional.hpp>
-#include <boost/serialization/shared_ptr.hpp>
-#include <boost/serialization/string.hpp>
-#include <boost/serialization/unordered_map.hpp>
-#include <boost/serialization/vector.hpp>
-#include <boost/serialization/weak_ptr.hpp>
 #include <httplib.h>
 #include "common/thread.h"
 #include "core/hle/ipc_helpers.h"
@@ -89,17 +83,6 @@ struct ClientCertContext {
     u8 cert_id;
     std::vector<u8> certificate;
     std::vector<u8> private_key;
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& handle;
-        ar& session_id;
-        ar& cert_id;
-        ar& certificate;
-        ar& private_key;
-    }
-    friend class boost::serialization::access;
 };
 
 /// Represents a root certificate chain, it contains a list of DER-encoded certificates for
@@ -111,30 +94,12 @@ struct RootCertChain {
         Handle handle;
         u32 session_id;
         std::vector<u8> certificate;
-
-    private:
-        template <class Archive>
-        void serialize(Archive& ar, const unsigned int) {
-            ar& handle;
-            ar& session_id;
-            ar& certificate;
-        }
-        friend class boost::serialization::access;
     };
 
     using Handle = u32;
     Handle handle;
     u32 session_id;
     std::vector<RootCACert> certificates;
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& handle;
-        ar& session_id;
-        ar& certificates;
-    }
-    friend class boost::serialization::access;
 };
 
 struct ClCertAData {
@@ -157,58 +122,23 @@ public:
         std::string username;
         std::string password;
         u16 port;
-
-    private:
-        template <class Archive>
-        void serialize(Archive& ar, const unsigned int) {
-            ar& url;
-            ar& username;
-            ar& password;
-            ar& port;
-        }
-        friend class boost::serialization::access;
     };
 
     struct BasicAuth {
         std::string username;
         std::string password;
-
-    private:
-        template <class Archive>
-        void serialize(Archive& ar, const unsigned int) {
-            ar& username;
-            ar& password;
-        }
-        friend class boost::serialization::access;
     };
 
     struct RequestHeader {
         RequestHeader(std::string name, std::string value) : name(name), value(value){};
         std::string name;
         std::string value;
-
-    private:
-        template <class Archive>
-        void serialize(Archive& ar, const unsigned int) {
-            ar& name;
-            ar& value;
-        }
-        friend class boost::serialization::access;
     };
 
     struct SSLConfig {
         u32 options;
         std::weak_ptr<ClientCertContext> client_cert_ctx;
         std::weak_ptr<RootCertChain> root_ca_chain;
-
-    private:
-        template <class Archive>
-        void serialize(Archive& ar, const unsigned int) {
-            ar& options;
-            ar& client_cert_ctx;
-            ar& root_ca_chain;
-        }
-        friend class boost::serialization::access;
     };
 
     struct Param {
@@ -233,15 +163,6 @@ public:
 
             return form;
         }
-
-    private:
-        template <class Archive>
-        void serialize(Archive& ar, const unsigned int) {
-            ar& name;
-            ar& value;
-            ar& is_binary;
-        }
-        friend class boost::serialization::access;
     };
 
     using Params = std::multimap<std::string, Param>;
@@ -302,19 +223,6 @@ struct SessionData : public Kernel::SessionRequestHandler::SessionDataBase {
     /// Whether this session has been initialized in some way, be it via Initialize or
     /// InitializeConnectionSession.
     bool initialized = false;
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& boost::serialization::base_object<Kernel::SessionRequestHandler::SessionDataBase>(
-            *this);
-        ar& current_http_context;
-        ar& session_id;
-        ar& num_http_contexts;
-        ar& num_client_certs;
-        ar& initialized;
-    }
-    friend class boost::serialization::access;
 };
 
 class HTTP_C final : public ServiceFramework<HTTP_C, SessionData> {
@@ -872,24 +780,6 @@ private:
     std::unordered_map<ClientCertContext::Handle, std::shared_ptr<ClientCertContext>> client_certs;
 
     ClCertAData ClCertA;
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        // NOTE: Serialization of the HTTP service is on a 'best effort' basis.
-        // There is a very good chance that saving/loading during a network connection will break,
-        // regardless!
-        ar& boost::serialization::base_object<Kernel::SessionRequestHandler>(*this);
-        ar& ClCertA.certificate;
-        ar& ClCertA.private_key;
-        ar& ClCertA.init;
-        ar& context_counter;
-        ar& client_certs_counter;
-        ar& client_certs;
-        // NOTE: `contexts` is not serialized because it contains non-serializable data. (i.e.
-        // handles to ongoing HTTP requests.) Serializing across HTTP contexts will break.
-    }
-    friend class boost::serialization::access;
 };
 
 std::shared_ptr<HTTP_C> GetService(Core::System& system);
@@ -897,6 +787,3 @@ std::shared_ptr<HTTP_C> GetService(Core::System& system);
 void InstallInterfaces(Core::System& system);
 
 } // namespace Service::HTTP
-
-BOOST_CLASS_EXPORT_KEY(Service::HTTP::HTTP_C)
-BOOST_CLASS_EXPORT_KEY(Service::HTTP::SessionData)
diff --git a/src/core/hle/service/ir/extra_hid.h b/src/core/hle/service/ir/extra_hid.h
index 5dc36b4cd..fbb82c4c0 100644
--- a/src/core/hle/service/ir/extra_hid.h
+++ b/src/core/hle/service/ir/extra_hid.h
@@ -7,7 +7,6 @@
 #include <array>
 #include <atomic>
 #include <span>
-#include <boost/serialization/array.hpp>
 #include "common/bit_field.h"
 #include "common/swap.h"
 #include "core/frontend/input.h"
@@ -69,18 +68,6 @@ private:
     std::unique_ptr<Input::ButtonDevice> zr;
     std::unique_ptr<Input::AnalogDevice> c_stick;
     std::atomic<bool> is_device_reload_pending;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& hid_period;
-        ar& calibration_data; // This isn't writeable for now, but might be in future
-        if (Archive::is_loading::value) {
-            LoadInputDevices(); // zl, zr, c_stick are loaded here
-        }
-    }
-    friend class boost::serialization::access;
 };
 
 } // namespace Service::IR
-
-BOOST_CLASS_EXPORT_KEY(Service::IR::ExtraHID)
diff --git a/src/core/hle/service/ir/ir_rst.cpp b/src/core/hle/service/ir/ir_rst.cpp
index 2e2cd5b94..e8ef74242 100644
--- a/src/core/hle/service/ir/ir_rst.cpp
+++ b/src/core/hle/service/ir/ir_rst.cpp
@@ -2,9 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <boost/serialization/base_object.hpp>
-#include <boost/serialization/shared_ptr.hpp>
-#include "common/archives.h"
 #include "common/settings.h"
 #include "core/core.h"
 #include "core/core_timing.h"
@@ -15,23 +12,8 @@
 #include "core/hle/service/ir/ir_rst.h"
 #include "core/movie.h"
 
-SERIALIZE_EXPORT_IMPL(Service::IR::IR_RST)
-SERVICE_CONSTRUCT_IMPL(Service::IR::IR_RST)
-
 namespace Service::IR {
 
-template <class Archive>
-void IR_RST::serialize(Archive& ar, const unsigned int) {
-    ar& boost::serialization::base_object<Kernel::SessionRequestHandler>(*this);
-    ar& update_event;
-    ar& shared_memory;
-    ar& next_pad_index;
-    ar& raw_c_stick;
-    ar& update_period;
-    // update_callback_id and input devices are set separately
-    ReloadInputDevices();
-}
-
 struct PadDataEntry {
     PadState current_state;
     PadState delta_additions;
diff --git a/src/core/hle/service/ir/ir_rst.h b/src/core/hle/service/ir/ir_rst.h
index 2514ab6f9..c98db6b90 100644
--- a/src/core/hle/service/ir/ir_rst.h
+++ b/src/core/hle/service/ir/ir_rst.h
@@ -87,13 +87,6 @@ private:
     std::atomic<bool> is_device_reload_pending{false};
     bool raw_c_stick{false};
     int update_period{0};
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
-    friend class boost::serialization::access;
 };
 
 } // namespace Service::IR
-
-BOOST_CLASS_EXPORT_KEY(Service::IR::IR_RST)
-SERVICE_CONSTRUCT(Service::IR::IR_RST)
diff --git a/src/core/hle/service/ir/ir_u.cpp b/src/core/hle/service/ir/ir_u.cpp
index 78e900fe2..70c5089ee 100644
--- a/src/core/hle/service/ir/ir_u.cpp
+++ b/src/core/hle/service/ir/ir_u.cpp
@@ -2,11 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/ir/ir_u.h"
 
-SERIALIZE_EXPORT_IMPL(Service::IR::IR_U)
-
 namespace Service::IR {
 
 IR_U::IR_U() : ServiceFramework("ir:u", 1) {
diff --git a/src/core/hle/service/ir/ir_u.h b/src/core/hle/service/ir/ir_u.h
index ecaf1be28..ea150b082 100644
--- a/src/core/hle/service/ir/ir_u.h
+++ b/src/core/hle/service/ir/ir_u.h
@@ -12,11 +12,6 @@ namespace Service::IR {
 class IR_U final : public ServiceFramework<IR_U> {
 public:
     IR_U();
-
-private:
-    SERVICE_SERIALIZATION_SIMPLE
 };
 
 } // namespace Service::IR
-
-BOOST_CLASS_EXPORT_KEY(Service::IR::IR_U)
diff --git a/src/core/hle/service/ir/ir_user.cpp b/src/core/hle/service/ir/ir_user.cpp
index add0eb3d0..cbffc16fa 100644
--- a/src/core/hle/service/ir/ir_user.cpp
+++ b/src/core/hle/service/ir/ir_user.cpp
@@ -5,11 +5,8 @@
 #include <memory>
 #include <vector>
 #include <boost/crc.hpp>
-#include <boost/serialization/base_object.hpp>
-#include <boost/serialization/shared_ptr.hpp>
-#include <boost/serialization/unique_ptr.hpp>
 #include <fmt/format.h>
-#include "common/archives.h"
+
 #include "common/swap.h"
 #include "core/core.h"
 #include "core/hle/ipc_helpers.h"
@@ -18,23 +15,8 @@
 #include "core/hle/service/ir/extra_hid.h"
 #include "core/hle/service/ir/ir_user.h"
 
-SERIALIZE_EXPORT_IMPL(Service::IR::IR_USER)
-SERVICE_CONSTRUCT_IMPL(Service::IR::IR_USER)
-
 namespace Service::IR {
 
-template <class Archive>
-void IR_USER::serialize(Archive& ar, const unsigned int) {
-    ar& boost::serialization::base_object<Kernel::SessionRequestHandler>(*this);
-    ar& conn_status_event;
-    ar& send_event;
-    ar& receive_event;
-    ar& shared_memory;
-    ar& connected_device;
-    ar& receive_buffer;
-    ar&* extra_hid.get();
-}
-
 // This is a header that will present in the ir:USER shared memory if it is initialized with
 // InitializeIrNopShared service function. Otherwise the shared memory doesn't have this header if
 // it is initialized with InitializeIrNop service function.
@@ -160,16 +142,6 @@ private:
         u32_le end_index;
         u32_le packet_count;
         u32_le unknown;
-
-    private:
-        template <class Archive>
-        void serialize(Archive& ar, const unsigned int) {
-            ar& begin_index;
-            ar& end_index;
-            ar& packet_count;
-            ar& unknown;
-        }
-        friend class boost::serialization::access;
     };
     static_assert(sizeof(BufferInfo) == 16, "BufferInfo has wrong size!");
 
@@ -210,20 +182,6 @@ private:
     u32 buffer_offset;
     u32 max_packet_count;
     u32 max_data_size;
-
-private:
-    BufferManager() = default;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& info;
-        ar& shared_memory;
-        ar& info_offset;
-        ar& buffer_offset;
-        ar& max_packet_count;
-        ar& max_data_size;
-    }
-    friend class boost::serialization::access;
 };
 
 /// Wraps the payload into packet and puts it to the receive buffer
diff --git a/src/core/hle/service/ir/ir_user.h b/src/core/hle/service/ir/ir_user.h
index e724e9dc5..7a68d7c1b 100644
--- a/src/core/hle/service/ir/ir_user.h
+++ b/src/core/hle/service/ir/ir_user.h
@@ -168,14 +168,6 @@ private:
     bool connected_device;
     std::unique_ptr<BufferManager> receive_buffer;
     std::unique_ptr<ExtraHID> extra_hid;
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
-    friend class boost::serialization::access;
 };
 
 } // namespace Service::IR
-
-BOOST_CLASS_EXPORT_KEY(Service::IR::IR_USER)
-SERVICE_CONSTRUCT(Service::IR::IR_USER)
diff --git a/src/core/hle/service/ldr_ro/ldr_ro.cpp b/src/core/hle/service/ldr_ro/ldr_ro.cpp
index 5fd3f36ba..cce33051d 100644
--- a/src/core/hle/service/ldr_ro/ldr_ro.cpp
+++ b/src/core/hle/service/ldr_ro/ldr_ro.cpp
@@ -3,7 +3,7 @@
 // Refer to the license.txt file included.
 
 #include "common/alignment.h"
-#include "common/archives.h"
+
 #include "common/common_types.h"
 #include "common/logging/log.h"
 #include "core/arm/arm_interface.h"
@@ -13,10 +13,6 @@
 #include "core/hle/service/ldr_ro/cro_helper.h"
 #include "core/hle/service/ldr_ro/ldr_ro.h"
 
-SERVICE_CONSTRUCT_IMPL(Service::LDR::RO)
-SERIALIZE_EXPORT_IMPL(Service::LDR::RO)
-SERIALIZE_EXPORT_IMPL(Service::LDR::ClientSlot)
-
 namespace Service::LDR {
 
 static const Result ERROR_ALREADY_INITIALIZED = // 0xD9612FF9
diff --git a/src/core/hle/service/ldr_ro/ldr_ro.h b/src/core/hle/service/ldr_ro/ldr_ro.h
index 7581884f6..f90005d13 100644
--- a/src/core/hle/service/ldr_ro/ldr_ro.h
+++ b/src/core/hle/service/ldr_ro/ldr_ro.h
@@ -14,15 +14,6 @@ namespace Service::LDR {
 
 struct ClientSlot : public Kernel::SessionRequestHandler::SessionDataBase {
     VAddr loaded_crs = 0; ///< the virtual address of the static module
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& boost::serialization::base_object<Kernel::SessionRequestHandler::SessionDataBase>(
-            *this);
-        ar& loaded_crs;
-    }
-    friend class boost::serialization::access;
 };
 
 class RO final : public ServiceFramework<RO, ClientSlot> {
@@ -160,19 +151,8 @@ private:
     void Shutdown(Kernel::HLERequestContext& self);
 
     Core::System& system;
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& boost::serialization::base_object<Kernel::SessionRequestHandler>(*this);
-    }
-    friend class boost::serialization::access;
 };
 
 void InstallInterfaces(Core::System& system);
 
 } // namespace Service::LDR
-
-SERVICE_CONSTRUCT(Service::LDR::RO)
-BOOST_CLASS_EXPORT_KEY(Service::LDR::RO)
-BOOST_CLASS_EXPORT_KEY(Service::LDR::ClientSlot)
diff --git a/src/core/hle/service/mcu/mcu_hwc.cpp b/src/core/hle/service/mcu/mcu_hwc.cpp
index c2a5d7514..02df332e9 100644
--- a/src/core/hle/service/mcu/mcu_hwc.cpp
+++ b/src/core/hle/service/mcu/mcu_hwc.cpp
@@ -2,11 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/mcu/mcu_hwc.h"
 
-SERIALIZE_EXPORT_IMPL(Service::MCU::HWC)
-
 namespace Service::MCU {
 
 HWC::HWC() : ServiceFramework("mcu::HWC", 1) {
diff --git a/src/core/hle/service/mcu/mcu_hwc.h b/src/core/hle/service/mcu/mcu_hwc.h
index fdcd7bf2f..62ed54cf3 100644
--- a/src/core/hle/service/mcu/mcu_hwc.h
+++ b/src/core/hle/service/mcu/mcu_hwc.h
@@ -11,11 +11,6 @@ namespace Service::MCU {
 class HWC final : public ServiceFramework<HWC> {
 public:
     explicit HWC();
-
-private:
-    SERVICE_SERIALIZATION_SIMPLE
 };
 
 } // namespace Service::MCU
-
-BOOST_CLASS_EXPORT_KEY(Service::MCU::HWC)
diff --git a/src/core/hle/service/mic/mic_u.cpp b/src/core/hle/service/mic/mic_u.cpp
index 1ed15cd25..90c2b3482 100644
--- a/src/core/hle/service/mic/mic_u.cpp
+++ b/src/core/hle/service/mic/mic_u.cpp
@@ -3,10 +3,9 @@
 // Refer to the license.txt file included.
 
 #include <span>
-#include <boost/serialization/weak_ptr.hpp>
 #include "audio_core/input.h"
 #include "audio_core/input_details.h"
-#include "common/archives.h"
+
 #include "common/logging/log.h"
 #include "common/settings.h"
 #include "core/core.h"
@@ -18,17 +17,8 @@
 #include "core/hle/kernel/shared_memory.h"
 #include "core/hle/service/mic/mic_u.h"
 
-SERVICE_CONSTRUCT_IMPL(Service::MIC::MIC_U)
-SERIALIZE_EXPORT_IMPL(Service::MIC::MIC_U)
-
 namespace Service::MIC {
 
-template <class Archive>
-void MIC_U::serialize(Archive& ar, const unsigned int) {
-    ar& boost::serialization::base_object<Kernel::SessionRequestHandler>(*this);
-    ar&* impl.get();
-}
-
 /// Microphone audio encodings.
 enum class Encoding : u8 {
     PCM8 = 0,        ///< Unsigned 8-bit PCM.
@@ -113,25 +103,6 @@ struct State {
         std::memcpy(sharedmem_buffer + (sharedmem_size - sizeof(u32)), reinterpret_cast<u8*>(&off),
                     sizeof(u32));
     }
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        std::shared_ptr<Kernel::SharedMemory> _memory_ref = memory_ref.lock();
-        ar& _memory_ref;
-        memory_ref = _memory_ref;
-        ar& sharedmem_size;
-        ar& size;
-        ar& offset;
-        ar& initial_offset;
-        ar& looped_buffer;
-        ar& sample_size;
-        ar& gain;
-        ar& power;
-        ar& sample_rate;
-        sharedmem_buffer = _memory_ref ? _memory_ref->GetPointer() : nullptr;
-    }
-    friend class boost::serialization::access;
 };
 
 struct MIC_U::Impl {
@@ -396,33 +367,6 @@ struct MIC_U::Impl {
     Core::Timing& timing;
     State state{};
     Encoding encoding{};
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int file_version) {
-        ar& change_mic_impl_requested;
-        ar& buffer_full_event;
-        // buffer_write_event set in constructor
-        ar& shared_memory;
-        ar& client_version;
-        ar& allow_shell_closed;
-        ar& clamp;
-        // mic interface set in constructor
-        ar& state;
-        // Maintain the internal mic state
-        ar& encoding;
-        bool is_sampling = mic && mic->IsSampling();
-        ar& is_sampling;
-        if (Archive::is_loading::value) {
-            if (is_sampling) {
-                CreateMic();
-                StartSampling();
-            } else if (mic) {
-                mic->StopSampling();
-            }
-        }
-    }
-    friend class boost::serialization::access;
 };
 
 void MIC_U::MapSharedMem(Kernel::HLERequestContext& ctx) {
diff --git a/src/core/hle/service/mic/mic_u.h b/src/core/hle/service/mic/mic_u.h
index 96aa5437e..d78438171 100644
--- a/src/core/hle/service/mic/mic_u.h
+++ b/src/core/hle/service/mic/mic_u.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include <memory>
-#include <boost/serialization/version.hpp>
 #include "core/hle/service/service.h"
 
 namespace Core {
@@ -190,10 +189,6 @@ private:
 
     struct Impl;
     std::unique_ptr<Impl> impl;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
-    friend class boost::serialization::access;
 };
 
 void ReloadMic(Core::System& system);
@@ -201,7 +196,3 @@ void ReloadMic(Core::System& system);
 void InstallInterfaces(Core::System& system);
 
 } // namespace Service::MIC
-
-SERVICE_CONSTRUCT(Service::MIC::MIC_U)
-BOOST_CLASS_EXPORT_KEY(Service::MIC::MIC_U)
-BOOST_CLASS_VERSION(Service::MIC::MIC_U::Impl, 1)
diff --git a/src/core/hle/service/mvd/mvd_std.cpp b/src/core/hle/service/mvd/mvd_std.cpp
index 64a5314df..1f10c8e7e 100644
--- a/src/core/hle/service/mvd/mvd_std.cpp
+++ b/src/core/hle/service/mvd/mvd_std.cpp
@@ -2,12 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/ipc_helpers.h"
 #include "core/hle/service/mvd/mvd_std.h"
 
-SERIALIZE_EXPORT_IMPL(Service::MVD::MVD_STD)
-
 namespace Service::MVD {
 
 MVD_STD::MVD_STD() : ServiceFramework("mvd:std", 1) {
diff --git a/src/core/hle/service/mvd/mvd_std.h b/src/core/hle/service/mvd/mvd_std.h
index fed41e6f0..6764f6ba8 100644
--- a/src/core/hle/service/mvd/mvd_std.h
+++ b/src/core/hle/service/mvd/mvd_std.h
@@ -12,11 +12,6 @@ class MVD_STD final : public ServiceFramework<MVD_STD> {
 public:
     MVD_STD();
     ~MVD_STD() = default;
-
-private:
-    SERVICE_SERIALIZATION_SIMPLE
 };
 
 } // namespace Service::MVD
-
-BOOST_CLASS_EXPORT_KEY(Service::MVD::MVD_STD)
diff --git a/src/core/hle/service/ndm/ndm_u.cpp b/src/core/hle/service/ndm/ndm_u.cpp
index 417c99b39..f44e8414e 100644
--- a/src/core/hle/service/ndm/ndm_u.cpp
+++ b/src/core/hle/service/ndm/ndm_u.cpp
@@ -2,13 +2,10 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/core.h"
 #include "core/hle/ipc_helpers.h"
 #include "core/hle/service/ndm/ndm_u.h"
 
-SERIALIZE_EXPORT_IMPL(Service::NDM::NDM_U)
-
 namespace Service::NDM {
 
 void NDM_U::EnterExclusiveState(Kernel::HLERequestContext& ctx) {
diff --git a/src/core/hle/service/ndm/ndm_u.h b/src/core/hle/service/ndm/ndm_u.h
index aebc6fa8b..5f48a3182 100644
--- a/src/core/hle/service/ndm/ndm_u.h
+++ b/src/core/hle/service/ndm/ndm_u.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include <array>
-#include <boost/serialization/array.hpp>
 #include "core/hle/service/service.h"
 
 namespace Core {
@@ -271,23 +270,8 @@ private:
     u32 scan_interval = DEFAULT_SCAN_INTERVAL;
     u32 retry_interval = DEFAULT_RETRY_INTERVAL;
     bool daemon_lock_enabled = false;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& boost::serialization::base_object<Kernel::SessionRequestHandler>(*this);
-        ar& daemon_bit_mask;
-        ar& default_daemon_bit_mask;
-        ar& daemon_status;
-        ar& exclusive_state;
-        ar& scan_interval;
-        ar& retry_interval;
-        ar& daemon_lock_enabled;
-    }
-    friend class boost::serialization::access;
 };
 
 void InstallInterfaces(Core::System& system);
 
 } // namespace Service::NDM
-
-BOOST_CLASS_EXPORT_KEY(Service::NDM::NDM_U)
diff --git a/src/core/hle/service/news/news.cpp b/src/core/hle/service/news/news.cpp
index f1a32d168..86b9e4306 100644
--- a/src/core/hle/service/news/news.cpp
+++ b/src/core/hle/service/news/news.cpp
@@ -4,7 +4,7 @@
 
 #include <algorithm>
 #include <fmt/format.h>
-#include "common/archives.h"
+
 #include "common/assert.h"
 #include "common/file_util.h"
 #include "common/logging/log.h"
@@ -23,8 +23,6 @@
 #include "core/hle/service/news/news_u.h"
 #include "core/hle/service/service.h"
 
-SERVICE_CONSTRUCT_IMPL(Service::NEWS::Module)
-
 namespace Service::NEWS {
 
 namespace ErrCodes {
@@ -43,15 +41,6 @@ constexpr std::array<u8, 8> news_system_savedata_id{
     0x00, 0x00, 0x00, 0x00, 0x35, 0x00, 0x01, 0x00,
 };
 
-template <class Archive>
-void Module::serialize(Archive& ar, const unsigned int) {
-    ar& db;
-    ar& notification_ids;
-    ar& automatic_sync_flag;
-    ar& news_system_save_data_archive;
-}
-SERIALIZE_IMPL(Module)
-
 void Module::Interface::AddNotificationImpl(Kernel::HLERequestContext& ctx, bool news_s) {
     IPC::RequestParser rp(ctx);
     const u32 header_size = rp.Pop<u32>();
diff --git a/src/core/hle/service/news/news.h b/src/core/hle/service/news/news.h
index 1d2382937..a4de18de4 100644
--- a/src/core/hle/service/news/news.h
+++ b/src/core/hle/service/news/news.h
@@ -22,14 +22,6 @@ struct NewsDBHeader {
     bool IsValid() const {
         return valid == 1;
     }
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& valid;
-        ar& flags;
-    }
-    friend class boost::serialization::access;
 };
 static_assert(sizeof(NewsDBHeader) == 0x10, "News DB Header structure size is wrong");
 
@@ -53,39 +45,12 @@ struct NotificationHeader {
     bool IsValid() const {
         return flag_valid == 1;
     }
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& flag_valid;
-        ar& flag_read;
-        ar& flag_jpeg;
-        ar& flag_boss;
-        ar& flag_optout;
-        ar& flag_url;
-        ar& flag_unk0x6;
-        ar& program_id;
-        ar& ns_data_id;
-        ar& version;
-        ar& jump_param;
-        ar& date_time;
-        ar& title;
-    }
-    friend class boost::serialization::access;
 };
 static_assert(sizeof(NotificationHeader) == 0x70, "Notification Header structure size is wrong");
 
 struct NewsDB {
     NewsDBHeader header;
     std::array<NotificationHeader, MAX_NOTIFICATIONS> notifications;
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& header;
-        ar& notifications;
-    }
-    friend class boost::serialization::access;
 };
 static_assert(sizeof(NewsDB) == 0x2BD0, "News DB structure size is wrong");
 
@@ -471,15 +436,8 @@ private:
     std::array<u32, MAX_NOTIFICATIONS> notification_ids; // Notifications ordered by date time
     u8 automatic_sync_flag;
     std::unique_ptr<FileSys::ArchiveBackend> news_system_save_data_archive;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
-    friend class boost::serialization::access;
 };
 
 void InstallInterfaces(Core::System& system);
 
 } // namespace Service::NEWS
-
-SERVICE_CONSTRUCT(Service::NEWS::Module)
-BOOST_CLASS_EXPORT_KEY(Service::NEWS::Module)
diff --git a/src/core/hle/service/news/news_s.cpp b/src/core/hle/service/news/news_s.cpp
index e32f190ee..ba794779f 100644
--- a/src/core/hle/service/news/news_s.cpp
+++ b/src/core/hle/service/news/news_s.cpp
@@ -2,11 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/news/news_s.h"
 
-SERIALIZE_EXPORT_IMPL(Service::NEWS::NEWS_S)
-
 namespace Service::NEWS {
 
 NEWS_S::NEWS_S(std::shared_ptr<Module> news) : Module::Interface(std::move(news), "news:s", 2) {
diff --git a/src/core/hle/service/news/news_s.h b/src/core/hle/service/news/news_s.h
index 186fc9b0d..ea28bee34 100644
--- a/src/core/hle/service/news/news_s.h
+++ b/src/core/hle/service/news/news_s.h
@@ -11,12 +11,6 @@ namespace Service::NEWS {
 class NEWS_S final : public Module::Interface {
 public:
     explicit NEWS_S(std::shared_ptr<Module> news);
-
-private:
-    SERVICE_SERIALIZATION(NEWS_S, news, Module)
 };
 
 } // namespace Service::NEWS
-
-BOOST_CLASS_EXPORT_KEY(Service::NEWS::NEWS_S)
-BOOST_SERIALIZATION_CONSTRUCT(Service::NEWS::NEWS_S)
diff --git a/src/core/hle/service/news/news_u.cpp b/src/core/hle/service/news/news_u.cpp
index e39babd30..483fdb87b 100644
--- a/src/core/hle/service/news/news_u.cpp
+++ b/src/core/hle/service/news/news_u.cpp
@@ -2,11 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/news/news_u.h"
 
-SERIALIZE_EXPORT_IMPL(Service::NEWS::NEWS_U)
-
 namespace Service::NEWS {
 
 NEWS_U::NEWS_U(std::shared_ptr<Module> news) : Module::Interface(std::move(news), "news:u", 1) {
diff --git a/src/core/hle/service/news/news_u.h b/src/core/hle/service/news/news_u.h
index 7a23a6fb8..2f646e046 100644
--- a/src/core/hle/service/news/news_u.h
+++ b/src/core/hle/service/news/news_u.h
@@ -11,12 +11,6 @@ namespace Service::NEWS {
 class NEWS_U final : public Module::Interface {
 public:
     explicit NEWS_U(std::shared_ptr<Module> news);
-
-private:
-    SERVICE_SERIALIZATION(NEWS_U, news, Module)
 };
 
 } // namespace Service::NEWS
-
-BOOST_CLASS_EXPORT_KEY(Service::NEWS::NEWS_U)
-BOOST_SERIALIZATION_CONSTRUCT(Service::NEWS::NEWS_U)
diff --git a/src/core/hle/service/nfc/nfc.cpp b/src/core/hle/service/nfc/nfc.cpp
index 756b433f9..ead841f57 100644
--- a/src/core/hle/service/nfc/nfc.cpp
+++ b/src/core/hle/service/nfc/nfc.cpp
@@ -2,25 +2,14 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/core.h"
 #include "core/hle/ipc_helpers.h"
 #include "core/hle/service/nfc/nfc.h"
 #include "core/hle/service/nfc/nfc_m.h"
 #include "core/hle/service/nfc/nfc_u.h"
 
-SERVICE_CONSTRUCT_IMPL(Service::NFC::Module)
-SERIALIZE_EXPORT_IMPL(Service::NFC::Module)
-
 namespace Service::NFC {
 
-template <class Archive>
-void Module::serialize(Archive& ar, const unsigned int) {
-    ar& nfc_mode;
-    ar& device;
-}
-SERIALIZE_IMPL(Module)
-
 void Module::Interface::Initialize(Kernel::HLERequestContext& ctx) {
     IPC::RequestParser rp(ctx);
     const auto communication_mode = rp.PopEnum<CommunicationMode>();
diff --git a/src/core/hle/service/nfc/nfc.h b/src/core/hle/service/nfc/nfc.h
index 2eaa59eb8..1e37f02bf 100644
--- a/src/core/hle/service/nfc/nfc.h
+++ b/src/core/hle/service/nfc/nfc.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include <memory>
-#include <boost/serialization/binary_object.hpp>
 #include "common/common_types.h"
 #include "core/hle/service/nfc/nfc_device.h"
 #include "core/hle/service/service.h"
@@ -373,15 +372,8 @@ private:
     CommunicationMode nfc_mode = CommunicationMode::NotInitialized;
 
     std::shared_ptr<NfcDevice> device = nullptr;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
-    friend class boost::serialization::access;
 };
 
 void InstallInterfaces(Core::System& system);
 
 } // namespace Service::NFC
-
-SERVICE_CONSTRUCT(Service::NFC::Module)
-BOOST_CLASS_EXPORT_KEY(Service::NFC::Module)
diff --git a/src/core/hle/service/nfc/nfc_device.cpp b/src/core/hle/service/nfc/nfc_device.cpp
index fa8bd3558..2a6cf96de 100644
--- a/src/core/hle/service/nfc/nfc_device.cpp
+++ b/src/core/hle/service/nfc/nfc_device.cpp
@@ -16,28 +16,7 @@
 #include "core/hw/aes/key.h"
 #include "core/loader/loader.h"
 
-SERVICE_CONSTRUCT_IMPL(Service::NFC::NfcDevice)
-
 namespace Service::NFC {
-template <class Archive>
-void NfcDevice::serialize(Archive& ar, const unsigned int) {
-    ar& tag_in_range_event;
-    ar& tag_out_of_range_event;
-    ar& is_initalized;
-    ar& is_data_moddified;
-    ar& is_app_area_open;
-    ar& is_plain_amiibo;
-    ar& is_write_protected;
-    ar& is_tag_in_range;
-    ar& allowed_protocols;
-    ar& device_state;
-    ar& connection_state;
-    ar& communication_state;
-    ar& amiibo_filename;
-    ar& tag;
-    ar& encrypted_tag;
-}
-SERIALIZE_IMPL(NfcDevice)
 
 NfcDevice::NfcDevice(Core::System& system_) : system{system_} {
     tag_in_range_event =
diff --git a/src/core/hle/service/nfc/nfc_device.h b/src/core/hle/service/nfc/nfc_device.h
index 0ca204c4c..1ebd422af 100644
--- a/src/core/hle/service/nfc/nfc_device.h
+++ b/src/core/hle/service/nfc/nfc_device.h
@@ -6,7 +6,6 @@
 
 #include <span>
 #include <vector>
-#include <boost/serialization/binary_object.hpp>
 
 #include "common/common_types.h"
 #include "core/hle/service/nfc/nfc_results.h"
@@ -105,12 +104,6 @@ private:
     SerializableAmiiboFile tag{};
     SerializableEncryptedAmiiboFile encrypted_tag{};
     Core::System& system;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
-    friend class boost::serialization::access;
 };
 
 } // namespace Service::NFC
-
-SERVICE_CONSTRUCT(Service::NFC::NfcDevice)
diff --git a/src/core/hle/service/nfc/nfc_m.cpp b/src/core/hle/service/nfc/nfc_m.cpp
index c4c7e89f7..f527f89dd 100644
--- a/src/core/hle/service/nfc/nfc_m.cpp
+++ b/src/core/hle/service/nfc/nfc_m.cpp
@@ -2,11 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/nfc/nfc_m.h"
 
-SERIALIZE_EXPORT_IMPL(Service::NFC::NFC_M)
-
 namespace Service::NFC {
 
 NFC_M::NFC_M(std::shared_ptr<Module> nfc) : Module::Interface(std::move(nfc), "nfc:m", 1) {
diff --git a/src/core/hle/service/nfc/nfc_m.h b/src/core/hle/service/nfc/nfc_m.h
index 48a9e241b..c9fe9b130 100644
--- a/src/core/hle/service/nfc/nfc_m.h
+++ b/src/core/hle/service/nfc/nfc_m.h
@@ -11,12 +11,6 @@ namespace Service::NFC {
 class NFC_M final : public Module::Interface {
 public:
     explicit NFC_M(std::shared_ptr<Module> nfc);
-
-private:
-    SERVICE_SERIALIZATION(NFC_M, nfc, Module)
 };
 
 } // namespace Service::NFC
-
-BOOST_CLASS_EXPORT_KEY(Service::NFC::NFC_M)
-BOOST_SERIALIZATION_CONSTRUCT(Service::NFC::NFC_M)
diff --git a/src/core/hle/service/nfc/nfc_types.h b/src/core/hle/service/nfc/nfc_types.h
index 8b08aca9c..017890466 100644
--- a/src/core/hle/service/nfc/nfc_types.h
+++ b/src/core/hle/service/nfc/nfc_types.h
@@ -147,14 +147,6 @@ struct TagUuid {
     UniqueSerialNumber uid;
     u8 nintendo_id;
     LockBytes lock_bytes;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& uid;
-        ar& nintendo_id;
-        ar& lock_bytes;
-    }
-    friend class boost::serialization::access;
 };
 static_assert(sizeof(TagUuid) == 10, "TagUuid is an invalid size");
 
@@ -256,14 +248,6 @@ struct NTAG215Password {
     u32 PWD;  // Password to allow write access
     u16 PACK; // Password acknowledge reply
     u16 RFUI; // Reserved for future use
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& PWD;
-        ar& PACK;
-        ar& RFUI;
-    }
-    friend class boost::serialization::access;
 };
 static_assert(sizeof(NTAG215Password) == 0x8, "NTAG215Password is an invalid size");
 
@@ -342,11 +326,6 @@ struct SerializableAmiiboFile {
         std::array<u8, 0x21C> raw;
         NTAG215File file;
     };
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& raw;
-    }
-    friend class boost::serialization::access;
 };
 static_assert(sizeof(SerializableAmiiboFile) == 0x21C, "SerializableAmiiboFile is an invalid size");
 static_assert(std::is_trivially_copyable_v<SerializableAmiiboFile>,
@@ -357,11 +336,6 @@ struct SerializableEncryptedAmiiboFile {
         std::array<u8, 0x21C> raw;
         EncryptedNTAG215File file;
     };
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& raw;
-    }
-    friend class boost::serialization::access;
 };
 static_assert(sizeof(SerializableEncryptedAmiiboFile) == 0x21C,
               "SerializableEncryptedAmiiboFile is an invalid size");
diff --git a/src/core/hle/service/nfc/nfc_u.cpp b/src/core/hle/service/nfc/nfc_u.cpp
index 7345407fb..25df8a7cc 100644
--- a/src/core/hle/service/nfc/nfc_u.cpp
+++ b/src/core/hle/service/nfc/nfc_u.cpp
@@ -2,11 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/nfc/nfc_u.h"
 
-SERIALIZE_EXPORT_IMPL(Service::NFC::NFC_U)
-
 namespace Service::NFC {
 
 NFC_U::NFC_U(std::shared_ptr<Module> nfc) : Module::Interface(std::move(nfc), "nfc:u", 1) {
diff --git a/src/core/hle/service/nfc/nfc_u.h b/src/core/hle/service/nfc/nfc_u.h
index 2ed6030e6..aab408269 100644
--- a/src/core/hle/service/nfc/nfc_u.h
+++ b/src/core/hle/service/nfc/nfc_u.h
@@ -11,12 +11,6 @@ namespace Service::NFC {
 class NFC_U final : public Module::Interface {
 public:
     explicit NFC_U(std::shared_ptr<Module> nfc);
-
-private:
-    SERVICE_SERIALIZATION(NFC_U, nfc, Module)
 };
 
 } // namespace Service::NFC
-
-BOOST_CLASS_EXPORT_KEY(Service::NFC::NFC_U)
-BOOST_SERIALIZATION_CONSTRUCT(Service::NFC::NFC_U)
diff --git a/src/core/hle/service/nim/nim_aoc.cpp b/src/core/hle/service/nim/nim_aoc.cpp
index 27137a2bc..3aadb50af 100644
--- a/src/core/hle/service/nim/nim_aoc.cpp
+++ b/src/core/hle/service/nim/nim_aoc.cpp
@@ -2,11 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/nim/nim_aoc.h"
 
-SERIALIZE_EXPORT_IMPL(Service::NIM::NIM_AOC)
-
 namespace Service::NIM {
 
 NIM_AOC::NIM_AOC() : ServiceFramework("nim:aoc", 2) {
diff --git a/src/core/hle/service/nim/nim_aoc.h b/src/core/hle/service/nim/nim_aoc.h
index 003b3fd85..db0adc7fa 100644
--- a/src/core/hle/service/nim/nim_aoc.h
+++ b/src/core/hle/service/nim/nim_aoc.h
@@ -12,11 +12,6 @@ class NIM_AOC final : public ServiceFramework<NIM_AOC> {
 public:
     NIM_AOC();
     ~NIM_AOC();
-
-private:
-    SERVICE_SERIALIZATION_SIMPLE
 };
 
-} // namespace Service::NIM
-
-BOOST_CLASS_EXPORT_KEY(Service::NIM::NIM_AOC)
+} // namespace Service::NIM
\ No newline at end of file
diff --git a/src/core/hle/service/nim/nim_s.cpp b/src/core/hle/service/nim/nim_s.cpp
index 06d91043f..c680e2589 100644
--- a/src/core/hle/service/nim/nim_s.cpp
+++ b/src/core/hle/service/nim/nim_s.cpp
@@ -2,11 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/nim/nim_s.h"
 
-SERIALIZE_EXPORT_IMPL(Service::NIM::NIM_S)
-
 namespace Service::NIM {
 
 NIM_S::NIM_S() : ServiceFramework("nim:s", 1) {
diff --git a/src/core/hle/service/nim/nim_s.h b/src/core/hle/service/nim/nim_s.h
index 10b041456..6485cde18 100644
--- a/src/core/hle/service/nim/nim_s.h
+++ b/src/core/hle/service/nim/nim_s.h
@@ -12,11 +12,6 @@ class NIM_S final : public ServiceFramework<NIM_S> {
 public:
     NIM_S();
     ~NIM_S();
-
-private:
-    SERVICE_SERIALIZATION_SIMPLE
 };
 
 } // namespace Service::NIM
-
-BOOST_CLASS_EXPORT_KEY(Service::NIM::NIM_S)
diff --git a/src/core/hle/service/nim/nim_u.cpp b/src/core/hle/service/nim/nim_u.cpp
index 2993b60ed..6e72f0f11 100644
--- a/src/core/hle/service/nim/nim_u.cpp
+++ b/src/core/hle/service/nim/nim_u.cpp
@@ -2,16 +2,12 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "common/string_util.h"
 #include "core/core.h"
 #include "core/hle/ipc_helpers.h"
 #include "core/hle/kernel/event.h"
 #include "core/hle/service/nim/nim_u.h"
 
-SERVICE_CONSTRUCT_IMPL(Service::NIM::NIM_U)
-SERIALIZE_EXPORT_IMPL(Service::NIM::NIM_U)
-
 namespace Service::NIM {
 
 enum class SystemUpdateState : u32 {
diff --git a/src/core/hle/service/nim/nim_u.h b/src/core/hle/service/nim/nim_u.h
index c3042e985..166af627d 100644
--- a/src/core/hle/service/nim/nim_u.h
+++ b/src/core/hle/service/nim/nim_u.h
@@ -529,18 +529,6 @@ private:
     std::shared_ptr<Kernel::Event> nim_system_update_event_for_menu;
     std::shared_ptr<Kernel::Event> nim_system_update_event_for_news;
     std::shared_ptr<Kernel::Event> nim_async_completion_event;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& boost::serialization::base_object<Kernel::SessionRequestHandler>(*this);
-        ar& nim_system_update_event_for_menu;
-        ar& nim_system_update_event_for_news;
-        ar& nim_async_completion_event;
-    }
-    friend class boost::serialization::access;
 };
 
 } // namespace Service::NIM
-
-SERVICE_CONSTRUCT(Service::NIM::NIM_U)
-BOOST_CLASS_EXPORT_KEY(Service::NIM::NIM_U)
diff --git a/src/core/hle/service/nwm/nwm_cec.cpp b/src/core/hle/service/nwm/nwm_cec.cpp
index 416384045..0df6ac523 100644
--- a/src/core/hle/service/nwm/nwm_cec.cpp
+++ b/src/core/hle/service/nwm/nwm_cec.cpp
@@ -2,11 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/nwm/nwm_cec.h"
 
-SERIALIZE_EXPORT_IMPL(Service::NWM::NWM_CEC)
-
 namespace Service::NWM {
 
 NWM_CEC::NWM_CEC() : ServiceFramework("nwm::CEC") {
diff --git a/src/core/hle/service/nwm/nwm_cec.h b/src/core/hle/service/nwm/nwm_cec.h
index 674c98cae..afdf98477 100644
--- a/src/core/hle/service/nwm/nwm_cec.h
+++ b/src/core/hle/service/nwm/nwm_cec.h
@@ -11,11 +11,6 @@ namespace Service::NWM {
 class NWM_CEC final : public ServiceFramework<NWM_CEC> {
 public:
     NWM_CEC();
-
-private:
-    SERVICE_SERIALIZATION_SIMPLE
 };
 
 } // namespace Service::NWM
-
-BOOST_CLASS_EXPORT_KEY(Service::NWM::NWM_CEC)
diff --git a/src/core/hle/service/nwm/nwm_ext.cpp b/src/core/hle/service/nwm/nwm_ext.cpp
index f4831dce2..4bf6e46a7 100644
--- a/src/core/hle/service/nwm/nwm_ext.cpp
+++ b/src/core/hle/service/nwm/nwm_ext.cpp
@@ -2,11 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/nwm/nwm_ext.h"
 
-SERIALIZE_EXPORT_IMPL(Service::NWM::NWM_EXT)
-
 namespace Service::NWM {
 
 NWM_EXT::NWM_EXT() : ServiceFramework("nwm::EXT") {
diff --git a/src/core/hle/service/nwm/nwm_ext.h b/src/core/hle/service/nwm/nwm_ext.h
index 1e8bcfde3..1711db65a 100644
--- a/src/core/hle/service/nwm/nwm_ext.h
+++ b/src/core/hle/service/nwm/nwm_ext.h
@@ -11,11 +11,6 @@ namespace Service::NWM {
 class NWM_EXT final : public ServiceFramework<NWM_EXT> {
 public:
     NWM_EXT();
-
-private:
-    SERVICE_SERIALIZATION_SIMPLE
 };
 
 } // namespace Service::NWM
-
-BOOST_CLASS_EXPORT_KEY(Service::NWM::NWM_EXT)
diff --git a/src/core/hle/service/nwm/nwm_inf.cpp b/src/core/hle/service/nwm/nwm_inf.cpp
index dca2cbaee..9fee746f3 100644
--- a/src/core/hle/service/nwm/nwm_inf.cpp
+++ b/src/core/hle/service/nwm/nwm_inf.cpp
@@ -2,11 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/nwm/nwm_inf.h"
 
-SERIALIZE_EXPORT_IMPL(Service::NWM::NWM_INF)
-
 namespace Service::NWM {
 
 NWM_INF::NWM_INF() : ServiceFramework("nwm::INF") {
diff --git a/src/core/hle/service/nwm/nwm_inf.h b/src/core/hle/service/nwm/nwm_inf.h
index 9f8c65a2b..2c69cfb1e 100644
--- a/src/core/hle/service/nwm/nwm_inf.h
+++ b/src/core/hle/service/nwm/nwm_inf.h
@@ -11,11 +11,6 @@ namespace Service::NWM {
 class NWM_INF final : public ServiceFramework<NWM_INF> {
 public:
     NWM_INF();
-
-private:
-    SERVICE_SERIALIZATION_SIMPLE
 };
 
 } // namespace Service::NWM
-
-BOOST_CLASS_EXPORT_KEY(Service::NWM::NWM_INF)
diff --git a/src/core/hle/service/nwm/nwm_sap.cpp b/src/core/hle/service/nwm/nwm_sap.cpp
index 2cedf9371..2ef196ab4 100644
--- a/src/core/hle/service/nwm/nwm_sap.cpp
+++ b/src/core/hle/service/nwm/nwm_sap.cpp
@@ -2,11 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/nwm/nwm_sap.h"
 
-SERIALIZE_EXPORT_IMPL(Service::NWM::NWM_SAP)
-
 namespace Service::NWM {
 
 NWM_SAP::NWM_SAP() : ServiceFramework("nwm::SAP") {
diff --git a/src/core/hle/service/nwm/nwm_sap.h b/src/core/hle/service/nwm/nwm_sap.h
index 0422dc658..b6700b8ed 100644
--- a/src/core/hle/service/nwm/nwm_sap.h
+++ b/src/core/hle/service/nwm/nwm_sap.h
@@ -11,11 +11,6 @@ namespace Service::NWM {
 class NWM_SAP final : public ServiceFramework<NWM_SAP> {
 public:
     NWM_SAP();
-
-private:
-    SERVICE_SERIALIZATION_SIMPLE
 };
 
 } // namespace Service::NWM
-
-BOOST_CLASS_EXPORT_KEY(Service::NWM::NWM_SAP)
diff --git a/src/core/hle/service/nwm/nwm_soc.cpp b/src/core/hle/service/nwm/nwm_soc.cpp
index d6ca365ab..443baaf39 100644
--- a/src/core/hle/service/nwm/nwm_soc.cpp
+++ b/src/core/hle/service/nwm/nwm_soc.cpp
@@ -2,11 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/nwm/nwm_soc.h"
 
-SERIALIZE_EXPORT_IMPL(Service::NWM::NWM_SOC)
-
 namespace Service::NWM {
 
 NWM_SOC::NWM_SOC() : ServiceFramework("nwm::SOC") {
diff --git a/src/core/hle/service/nwm/nwm_soc.h b/src/core/hle/service/nwm/nwm_soc.h
index f13490e83..8e1b922bc 100644
--- a/src/core/hle/service/nwm/nwm_soc.h
+++ b/src/core/hle/service/nwm/nwm_soc.h
@@ -11,11 +11,6 @@ namespace Service::NWM {
 class NWM_SOC final : public ServiceFramework<NWM_SOC> {
 public:
     NWM_SOC();
-
-private:
-    SERVICE_SERIALIZATION_SIMPLE
 };
 
 } // namespace Service::NWM
-
-BOOST_CLASS_EXPORT_KEY(Service::NWM::NWM_SOC)
diff --git a/src/core/hle/service/nwm/nwm_tst.cpp b/src/core/hle/service/nwm/nwm_tst.cpp
index 65ffabfd9..3be65200b 100644
--- a/src/core/hle/service/nwm/nwm_tst.cpp
+++ b/src/core/hle/service/nwm/nwm_tst.cpp
@@ -2,11 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/nwm/nwm_tst.h"
 
-SERIALIZE_EXPORT_IMPL(Service::NWM::NWM_TST)
-
 namespace Service::NWM {
 
 NWM_TST::NWM_TST() : ServiceFramework("nwm::TST") {
diff --git a/src/core/hle/service/nwm/nwm_tst.h b/src/core/hle/service/nwm/nwm_tst.h
index 576d4d124..8214e0d1d 100644
--- a/src/core/hle/service/nwm/nwm_tst.h
+++ b/src/core/hle/service/nwm/nwm_tst.h
@@ -11,11 +11,6 @@ namespace Service::NWM {
 class NWM_TST final : public ServiceFramework<NWM_TST> {
 public:
     NWM_TST();
-
-private:
-    SERVICE_SERIALIZATION_SIMPLE
 };
 
 } // namespace Service::NWM
-
-BOOST_CLASS_EXPORT_KEY(Service::NWM::NWM_TST)
diff --git a/src/core/hle/service/nwm/nwm_uds.cpp b/src/core/hle/service/nwm/nwm_uds.cpp
index 8b82db5e0..f8e12acfd 100644
--- a/src/core/hle/service/nwm/nwm_uds.cpp
+++ b/src/core/hle/service/nwm/nwm_uds.cpp
@@ -4,10 +4,8 @@
 
 #include <algorithm>
 #include <cstring>
-#include <boost/serialization/list.hpp>
-#include <boost/serialization/map.hpp>
 #include <cryptopp/osrng.h>
-#include "common/archives.h"
+
 #include "common/common_types.h"
 #include "common/logging/log.h"
 #include "core/core.h"
@@ -23,20 +21,8 @@
 #include "core/hle/service/nwm/uds_data.h"
 #include "core/memory.h"
 
-SERIALIZE_EXPORT_IMPL(Service::NWM::NWM_UDS)
-SERVICE_CONSTRUCT_IMPL(Service::NWM::NWM_UDS)
-
 namespace Service::NWM {
 
-template <class Archive>
-void NWM_UDS::serialize(Archive& ar, const unsigned int) {
-    ar& boost::serialization::base_object<Kernel::SessionRequestHandler>(*this);
-    ar& node_map;
-    ar& connection_event;
-    ar& received_beacons;
-    // wifi_packet_received set in constructor
-}
-
 namespace ErrCodes {
 enum {
     NotInitialized = 2,
@@ -1257,15 +1243,7 @@ public:
     }
 
 private:
-    ThreadCallback() = default;
     u16 command_id;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& boost::serialization::base_object<Kernel::HLERequestContext::WakeupCallback>(*this);
-        ar& command_id;
-    }
-    friend class boost::serialization::access;
 };
 
 void NWM_UDS::ConnectToNetwork(Kernel::HLERequestContext& ctx, u16 command_id,
@@ -1523,5 +1501,3 @@ NWM_UDS::~NWM_UDS() {
 }
 
 } // namespace Service::NWM
-
-SERIALIZE_EXPORT_IMPL(Service::NWM::NWM_UDS::ThreadCallback)
diff --git a/src/core/hle/service/nwm/nwm_uds.h b/src/core/hle/service/nwm/nwm_uds.h
index e3f2e588f..4823fb119 100644
--- a/src/core/hle/service/nwm/nwm_uds.h
+++ b/src/core/hle/service/nwm/nwm_uds.h
@@ -15,7 +15,6 @@
 #include <unordered_map>
 #include <vector>
 #include <boost/optional.hpp>
-#include <boost/serialization/export.hpp>
 #include "common/common_types.h"
 #include "common/swap.h"
 #include "core/hle/service/service.h"
@@ -549,14 +548,6 @@ private:
     struct Node {
         bool connected;
         u16 node_id;
-
-    private:
-        template <class Archive>
-        void serialize(Archive& ar, const unsigned int) {
-            ar& connected;
-            ar& node_id;
-        }
-        friend class boost::serialization::access;
     };
 
     std::map<MacAddress, Node> node_map;
@@ -579,14 +570,6 @@ private:
 
     // List of the last <MaxBeaconFrames> beacons received from the network.
     std::list<Network::WifiPacket> received_beacons;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
-    friend class boost::serialization::access;
 };
 
 } // namespace Service::NWM
-
-SERVICE_CONSTRUCT(Service::NWM::NWM_UDS)
-BOOST_CLASS_EXPORT_KEY(Service::NWM::NWM_UDS)
-BOOST_CLASS_EXPORT_KEY(Service::NWM::NWM_UDS::ThreadCallback)
diff --git a/src/core/hle/service/plgldr/plgldr.cpp b/src/core/hle/service/plgldr/plgldr.cpp
index 8e8d876cf..2b71e5781 100644
--- a/src/core/hle/service/plgldr/plgldr.cpp
+++ b/src/core/hle/service/plgldr/plgldr.cpp
@@ -19,9 +19,8 @@
 // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include <boost/serialization/weak_ptr.hpp>
 #include <fmt/format.h>
-#include "common/archives.h"
+
 #include "common/logging/log.h"
 #include "common/settings.h"
 #include "core/core.h"
@@ -33,9 +32,6 @@
 #include "core/hle/service/plgldr/plgldr.h"
 #include "core/loader/loader.h"
 
-SERIALIZE_EXPORT_IMPL(Service::PLGLDR::PLG_LDR)
-SERVICE_CONSTRUCT_IMPL(Service::PLGLDR::PLG_LDR)
-
 namespace Service::PLGLDR {
 
 static const Kernel::CoreVersion plgldr_version = Kernel::CoreVersion(1, 0, 0);
@@ -63,33 +59,6 @@ PLG_LDR::PLG_LDR(Core::System& system_) : ServiceFramework{"plg:ldr", 1}, system
     plgldr_context.plugin_loaded = false;
 }
 
-template <class Archive>
-void PLG_LDR::PluginLoaderContext::serialize(Archive& ar, const unsigned int) {
-    ar& is_enabled;
-    ar& allow_game_change;
-    ar& plugin_loaded;
-    ar& is_default_path;
-    ar& plugin_path;
-    ar& use_user_load_parameters;
-    ar& user_load_parameters;
-    ar& plg_event;
-    ar& plg_reply;
-    ar& memory_changed_handle;
-    ar& is_exe_load_function_set;
-    ar& exe_load_checksum;
-    ar& load_exe_func;
-    ar& load_exe_args;
-    ar& plugin_fb_addr;
-}
-SERIALIZE_IMPL(PLG_LDR::PluginLoaderContext)
-
-template <class Archive>
-void PLG_LDR::serialize(Archive& ar, const unsigned int) {
-    ar& boost::serialization::base_object<Kernel::SessionRequestHandler>(*this);
-    ar& plgldr_context;
-}
-SERIALIZE_IMPL(PLG_LDR)
-
 void PLG_LDR::OnProcessRun(Kernel::Process& process, Kernel::KernelSystem& kernel) {
     if (!plgldr_context.is_enabled || plgldr_context.plugin_loaded) {
         return;
diff --git a/src/core/hle/service/plgldr/plgldr.h b/src/core/hle/service/plgldr/plgldr.h
index d9941adbe..011bf5261 100644
--- a/src/core/hle/service/plgldr/plgldr.h
+++ b/src/core/hle/service/plgldr/plgldr.h
@@ -22,7 +22,6 @@
 #pragma once
 
 #include <memory>
-#include <boost/serialization/export.hpp>
 #include "core/hle/service/service.h"
 
 namespace Core {
@@ -46,16 +45,6 @@ public:
             u32_le low_title_Id = 0;
             char path[256] = {0};
             u32_le config[32] = {0};
-
-            template <class Archive>
-            void serialize(Archive& ar, const unsigned int) {
-                ar& no_flash;
-                ar& plugin_memory_strategy;
-                ar& low_title_Id;
-                ar& path;
-                ar& config;
-            }
-            friend class boost::serialization::access;
         };
         bool is_enabled = true;
         bool allow_game_change = true;
@@ -77,10 +66,6 @@ public:
         u32_le load_exe_args[4] = {0};
 
         PAddr plugin_fb_addr = 0;
-
-        template <class Archive>
-        void serialize(Archive& ar, const unsigned int);
-        friend class boost::serialization::access;
     };
 
     PLG_LDR(Core::System& system_);
@@ -128,10 +113,6 @@ private:
     void GetPLGLDRVersion(Kernel::HLERequestContext& ctx);
     void GetArbiter(Kernel::HLERequestContext& ctx);
     void GetPluginPath(Kernel::HLERequestContext& ctx);
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
-    friend class boost::serialization::access;
 };
 
 std::shared_ptr<PLG_LDR> GetService(Core::System& system);
@@ -139,6 +120,3 @@ std::shared_ptr<PLG_LDR> GetService(Core::System& system);
 void InstallInterfaces(Core::System& system);
 
 } // namespace Service::PLGLDR
-
-BOOST_CLASS_EXPORT_KEY(Service::PLGLDR::PLG_LDR)
-SERVICE_CONSTRUCT(Service::PLGLDR::PLG_LDR)
diff --git a/src/core/hle/service/pm/pm_app.cpp b/src/core/hle/service/pm/pm_app.cpp
index ba14d1bdc..816b0e39d 100644
--- a/src/core/hle/service/pm/pm_app.cpp
+++ b/src/core/hle/service/pm/pm_app.cpp
@@ -2,12 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/ipc_helpers.h"
 #include "core/hle/service/pm/pm_app.h"
 
-SERIALIZE_EXPORT_IMPL(Service::PM::PM_APP)
-
 namespace Service::PM {
 
 PM_APP::PM_APP() : ServiceFramework("pm:app", 3) {
diff --git a/src/core/hle/service/pm/pm_app.h b/src/core/hle/service/pm/pm_app.h
index 9aefb0cee..8c7e375f0 100644
--- a/src/core/hle/service/pm/pm_app.h
+++ b/src/core/hle/service/pm/pm_app.h
@@ -12,11 +12,6 @@ class PM_APP final : public ServiceFramework<PM_APP> {
 public:
     PM_APP();
     ~PM_APP() = default;
-
-private:
-    SERVICE_SERIALIZATION_SIMPLE
 };
 
 } // namespace Service::PM
-
-BOOST_CLASS_EXPORT_KEY(Service::PM::PM_APP)
diff --git a/src/core/hle/service/pm/pm_dbg.cpp b/src/core/hle/service/pm/pm_dbg.cpp
index 50d1ff570..ded345357 100644
--- a/src/core/hle/service/pm/pm_dbg.cpp
+++ b/src/core/hle/service/pm/pm_dbg.cpp
@@ -2,12 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/ipc_helpers.h"
 #include "core/hle/service/pm/pm_dbg.h"
 
-SERIALIZE_EXPORT_IMPL(Service::PM::PM_DBG)
-
 namespace Service::PM {
 
 PM_DBG::PM_DBG() : ServiceFramework("pm:dbg", 3) {
diff --git a/src/core/hle/service/pm/pm_dbg.h b/src/core/hle/service/pm/pm_dbg.h
index 3a6e3c5c7..77b644969 100644
--- a/src/core/hle/service/pm/pm_dbg.h
+++ b/src/core/hle/service/pm/pm_dbg.h
@@ -12,11 +12,6 @@ class PM_DBG final : public ServiceFramework<PM_DBG> {
 public:
     PM_DBG();
     ~PM_DBG() = default;
-
-private:
-    SERVICE_SERIALIZATION_SIMPLE
 };
 
 } // namespace Service::PM
-
-BOOST_CLASS_EXPORT_KEY(Service::PM::PM_DBG)
diff --git a/src/core/hle/service/ps/ps_ps.cpp b/src/core/hle/service/ps/ps_ps.cpp
index c6ca195aa..c802efafa 100644
--- a/src/core/hle/service/ps/ps_ps.cpp
+++ b/src/core/hle/service/ps/ps_ps.cpp
@@ -4,7 +4,7 @@
 
 #include <cryptopp/aes.h>
 #include <cryptopp/modes.h>
-#include "common/archives.h"
+
 #include "common/logging/log.h"
 #include "core/core.h"
 #include "core/hle/ipc_helpers.h"
@@ -13,8 +13,6 @@
 #include "core/hw/aes/arithmetic128.h"
 #include "core/hw/aes/key.h"
 
-SERIALIZE_EXPORT_IMPL(Service::PS::PS_PS)
-
 namespace Service::PS {
 
 enum class AlgorithmType : u8 {
diff --git a/src/core/hle/service/ps/ps_ps.h b/src/core/hle/service/ps/ps_ps.h
index f5005d444..6e8b3ad0a 100644
--- a/src/core/hle/service/ps/ps_ps.h
+++ b/src/core/hle/service/ps/ps_ps.h
@@ -18,8 +18,6 @@ public:
     ~PS_PS() = default;
 
 private:
-    SERVICE_SERIALIZATION_SIMPLE
-
     /**
      * PS_PS::SignRsaSha256 service function
      *  Inputs:
@@ -233,5 +231,3 @@ private:
 void InstallInterfaces(Core::System& system);
 
 } // namespace Service::PS
-
-BOOST_CLASS_EXPORT_KEY(Service::PS::PS_PS)
diff --git a/src/core/hle/service/ptm/ptm.cpp b/src/core/hle/service/ptm/ptm.cpp
index 6f609182b..6a7e1aded 100644
--- a/src/core/hle/service/ptm/ptm.cpp
+++ b/src/core/hle/service/ptm/ptm.cpp
@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "common/common_paths.h"
 #include "common/file_util.h"
 #include "common/logging/log.h"
@@ -19,9 +18,6 @@
 #include "core/hle/service/ptm/ptm_sysm.h"
 #include "core/hle/service/ptm/ptm_u.h"
 
-SERIALIZE_EXPORT_IMPL(Service::PTM::Module)
-SERVICE_CONSTRUCT_IMPL(Service::PTM::Module)
-
 namespace Service::PTM {
 
 /// Values for the default gamecoin.dat file
@@ -222,14 +218,6 @@ Module::Module(Core::System& system_) : system(system_) {
     }
 }
 
-template <class Archive>
-void Module::serialize(Archive& ar, const unsigned int) {
-    ar& shell_open;
-    ar& battery_is_charging;
-    ar& pedometer_is_counting;
-}
-SERIALIZE_IMPL(Module)
-
 u16 Module::GetPlayCoins() {
     return ReadGameCoinData().total_coins;
 }
diff --git a/src/core/hle/service/ptm/ptm.h b/src/core/hle/service/ptm/ptm.h
index 2e3e5af55..0bef6e041 100644
--- a/src/core/hle/service/ptm/ptm.h
+++ b/src/core/hle/service/ptm/ptm.h
@@ -157,15 +157,8 @@ private:
     bool shell_open = true;
     bool battery_is_charging = true;
     bool pedometer_is_counting = false;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
-    friend class boost::serialization::access;
 };
 
 void InstallInterfaces(Core::System& system);
 
 } // namespace Service::PTM
-
-BOOST_CLASS_EXPORT_KEY(Service::PTM::Module)
-SERVICE_CONSTRUCT(Service::PTM::Module)
diff --git a/src/core/hle/service/ptm/ptm_gets.cpp b/src/core/hle/service/ptm/ptm_gets.cpp
index a1a5dc774..56d372e11 100644
--- a/src/core/hle/service/ptm/ptm_gets.cpp
+++ b/src/core/hle/service/ptm/ptm_gets.cpp
@@ -2,11 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/ptm/ptm_gets.h"
 
-SERIALIZE_EXPORT_IMPL(Service::PTM::PTM_Gets)
-
 namespace Service::PTM {
 
 PTM_Gets::PTM_Gets(std::shared_ptr<Module> ptm)
diff --git a/src/core/hle/service/ptm/ptm_gets.h b/src/core/hle/service/ptm/ptm_gets.h
index 57b8e5f55..a8d71fdc9 100644
--- a/src/core/hle/service/ptm/ptm_gets.h
+++ b/src/core/hle/service/ptm/ptm_gets.h
@@ -12,12 +12,6 @@ namespace Service::PTM {
 class PTM_Gets final : public Module::Interface {
 public:
     explicit PTM_Gets(std::shared_ptr<Module> ptm);
-
-private:
-    SERVICE_SERIALIZATION(PTM_Gets, ptm, Module)
 };
 
 } // namespace Service::PTM
-
-BOOST_CLASS_EXPORT_KEY(Service::PTM::PTM_Gets)
-BOOST_SERIALIZATION_CONSTRUCT(Service::PTM::PTM_Gets)
diff --git a/src/core/hle/service/ptm/ptm_play.cpp b/src/core/hle/service/ptm/ptm_play.cpp
index 823b45b80..5dcc49b99 100644
--- a/src/core/hle/service/ptm/ptm_play.cpp
+++ b/src/core/hle/service/ptm/ptm_play.cpp
@@ -2,11 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/ptm/ptm_play.h"
 
-SERIALIZE_EXPORT_IMPL(Service::PTM::PTM_Play)
-
 namespace Service::PTM {
 
 PTM_Play::PTM_Play(std::shared_ptr<Module> ptm)
diff --git a/src/core/hle/service/ptm/ptm_play.h b/src/core/hle/service/ptm/ptm_play.h
index 091e91d30..3a226149d 100644
--- a/src/core/hle/service/ptm/ptm_play.h
+++ b/src/core/hle/service/ptm/ptm_play.h
@@ -12,12 +12,6 @@ namespace Service::PTM {
 class PTM_Play final : public Module::Interface {
 public:
     explicit PTM_Play(std::shared_ptr<Module> ptm);
-
-private:
-    SERVICE_SERIALIZATION(PTM_Play, ptm, Module)
 };
 
 } // namespace Service::PTM
-
-BOOST_CLASS_EXPORT_KEY(Service::PTM::PTM_Play)
-BOOST_SERIALIZATION_CONSTRUCT(Service::PTM::PTM_Play)
diff --git a/src/core/hle/service/ptm/ptm_sets.cpp b/src/core/hle/service/ptm/ptm_sets.cpp
index 0fea24b68..cfa83a540 100644
--- a/src/core/hle/service/ptm/ptm_sets.cpp
+++ b/src/core/hle/service/ptm/ptm_sets.cpp
@@ -2,11 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/ptm/ptm_sets.h"
 
-SERIALIZE_EXPORT_IMPL(Service::PTM::PTM_Sets)
-
 namespace Service::PTM {
 
 PTM_Sets::PTM_Sets(std::shared_ptr<Module> ptm) : Module::Interface(std::move(ptm), "ptm:sets", 1) {
diff --git a/src/core/hle/service/ptm/ptm_sets.h b/src/core/hle/service/ptm/ptm_sets.h
index 573b20dbd..f7f92c906 100644
--- a/src/core/hle/service/ptm/ptm_sets.h
+++ b/src/core/hle/service/ptm/ptm_sets.h
@@ -12,12 +12,6 @@ namespace Service::PTM {
 class PTM_Sets final : public Module::Interface {
 public:
     explicit PTM_Sets(std::shared_ptr<Module> ptm);
-
-private:
-    SERVICE_SERIALIZATION(PTM_Sets, ptm, Module)
 };
 
-} // namespace Service::PTM
-
-BOOST_CLASS_EXPORT_KEY(Service::PTM::PTM_Sets)
-BOOST_SERIALIZATION_CONSTRUCT(Service::PTM::PTM_Sets)
+} // namespace Service::PTM
\ No newline at end of file
diff --git a/src/core/hle/service/ptm/ptm_sysm.cpp b/src/core/hle/service/ptm/ptm_sysm.cpp
index f827517d3..3f9e8cb98 100644
--- a/src/core/hle/service/ptm/ptm_sysm.cpp
+++ b/src/core/hle/service/ptm/ptm_sysm.cpp
@@ -2,12 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/ptm/ptm_sysm.h"
 
-SERIALIZE_EXPORT_IMPL(Service::PTM::PTM_S)
-SERIALIZE_EXPORT_IMPL(Service::PTM::PTM_Sysm)
-
 namespace Service::PTM {
 
 PTM_S_Common::PTM_S_Common(std::shared_ptr<Module> ptm, const char* name)
diff --git a/src/core/hle/service/ptm/ptm_sysm.h b/src/core/hle/service/ptm/ptm_sysm.h
index 1e01fdb2e..8667f2a95 100644
--- a/src/core/hle/service/ptm/ptm_sysm.h
+++ b/src/core/hle/service/ptm/ptm_sysm.h
@@ -17,22 +17,11 @@ public:
 class PTM_S final : public PTM_S_Common {
 public:
     explicit PTM_S(std::shared_ptr<Module> ptm);
-
-private:
-    SERVICE_SERIALIZATION(PTM_S, ptm, Module)
 };
 
 class PTM_Sysm final : public PTM_S_Common {
 public:
     explicit PTM_Sysm(std::shared_ptr<Module> ptm);
-
-private:
-    SERVICE_SERIALIZATION(PTM_Sysm, ptm, Module)
 };
 
 } // namespace Service::PTM
-
-BOOST_CLASS_EXPORT_KEY(Service::PTM::PTM_S)
-BOOST_CLASS_EXPORT_KEY(Service::PTM::PTM_Sysm)
-BOOST_SERIALIZATION_CONSTRUCT(Service::PTM::PTM_S)
-BOOST_SERIALIZATION_CONSTRUCT(Service::PTM::PTM_Sysm)
diff --git a/src/core/hle/service/ptm/ptm_u.cpp b/src/core/hle/service/ptm/ptm_u.cpp
index 7234a0c0f..a59195ba3 100644
--- a/src/core/hle/service/ptm/ptm_u.cpp
+++ b/src/core/hle/service/ptm/ptm_u.cpp
@@ -2,11 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/ptm/ptm_u.h"
 
-SERIALIZE_EXPORT_IMPL(Service::PTM::PTM_U)
-
 namespace Service::PTM {
 
 PTM_U::PTM_U(std::shared_ptr<Module> ptm) : Module::Interface(std::move(ptm), "ptm:u", 26) {
diff --git a/src/core/hle/service/ptm/ptm_u.h b/src/core/hle/service/ptm/ptm_u.h
index 213972242..618401cec 100644
--- a/src/core/hle/service/ptm/ptm_u.h
+++ b/src/core/hle/service/ptm/ptm_u.h
@@ -12,12 +12,6 @@ namespace Service::PTM {
 class PTM_U final : public Module::Interface {
 public:
     explicit PTM_U(std::shared_ptr<Module> ptm);
-
-private:
-    SERVICE_SERIALIZATION(PTM_U, ptm, Module)
 };
 
 } // namespace Service::PTM
-
-BOOST_CLASS_EXPORT_KEY(Service::PTM::PTM_U)
-BOOST_SERIALIZATION_CONSTRUCT(Service::PTM::PTM_U)
diff --git a/src/core/hle/service/pxi/dev.cpp b/src/core/hle/service/pxi/dev.cpp
index 02573d0ff..512cafd56 100644
--- a/src/core/hle/service/pxi/dev.cpp
+++ b/src/core/hle/service/pxi/dev.cpp
@@ -2,11 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/service/pxi/dev.h"
 
-SERIALIZE_EXPORT_IMPL(Service::PXI::DEV)
-
 namespace Service::PXI {
 
 DEV::DEV() : ServiceFramework("pxi:dev", 1) {
diff --git a/src/core/hle/service/pxi/dev.h b/src/core/hle/service/pxi/dev.h
index f16491077..115dc2308 100644
--- a/src/core/hle/service/pxi/dev.h
+++ b/src/core/hle/service/pxi/dev.h
@@ -13,11 +13,6 @@ class DEV final : public ServiceFramework<DEV> {
 public:
     DEV();
     ~DEV();
-
-private:
-    SERVICE_SERIALIZATION_SIMPLE
 };
 
 } // namespace Service::PXI
-
-BOOST_CLASS_EXPORT_KEY(Service::PXI::DEV)
diff --git a/src/core/hle/service/qtm/qtm_c.cpp b/src/core/hle/service/qtm/qtm_c.cpp
index ea3bb2f93..0b705c248 100644
--- a/src/core/hle/service/qtm/qtm_c.cpp
+++ b/src/core/hle/service/qtm/qtm_c.cpp
@@ -2,12 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/ipc_helpers.h"
 #include "core/hle/service/qtm/qtm_c.h"
 
-SERIALIZE_EXPORT_IMPL(Service::QTM::QTM_C)
-
 namespace Service::QTM {
 
 QTM_C::QTM_C() : ServiceFramework("qtm:c", 2) {
diff --git a/src/core/hle/service/qtm/qtm_c.h b/src/core/hle/service/qtm/qtm_c.h
index b601cd9de..c9cad0329 100644
--- a/src/core/hle/service/qtm/qtm_c.h
+++ b/src/core/hle/service/qtm/qtm_c.h
@@ -12,11 +12,6 @@ class QTM_C final : public ServiceFramework<QTM_C> {
 public:
     QTM_C();
     ~QTM_C() = default;
-
-private:
-    SERVICE_SERIALIZATION_SIMPLE
 };
 
 } // namespace Service::QTM
-
-BOOST_CLASS_EXPORT_KEY(Service::QTM::QTM_C)
diff --git a/src/core/hle/service/qtm/qtm_s.cpp b/src/core/hle/service/qtm/qtm_s.cpp
index 357cbb366..e4eb6eec4 100644
--- a/src/core/hle/service/qtm/qtm_s.cpp
+++ b/src/core/hle/service/qtm/qtm_s.cpp
@@ -2,12 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/ipc_helpers.h"
 #include "core/hle/service/qtm/qtm_s.h"
 
-SERIALIZE_EXPORT_IMPL(Service::QTM::QTM_S)
-
 namespace Service::QTM {
 
 void QTM_S::GetHeadtrackingInfo(Kernel::HLERequestContext& ctx) {
diff --git a/src/core/hle/service/qtm/qtm_s.h b/src/core/hle/service/qtm/qtm_s.h
index 4ef85e260..c42d33a29 100644
--- a/src/core/hle/service/qtm/qtm_s.h
+++ b/src/core/hle/service/qtm/qtm_s.h
@@ -14,11 +14,7 @@ public:
     ~QTM_S() = default;
 
 private:
-    SERVICE_SERIALIZATION_SIMPLE
-
     void GetHeadtrackingInfo(Kernel::HLERequestContext& ctx);
 };
 
 } // namespace Service::QTM
-
-BOOST_CLASS_EXPORT_KEY(Service::QTM::QTM_S)
diff --git a/src/core/hle/service/qtm/qtm_sp.cpp b/src/core/hle/service/qtm/qtm_sp.cpp
index 114b385bd..a47f8b5a8 100644
--- a/src/core/hle/service/qtm/qtm_sp.cpp
+++ b/src/core/hle/service/qtm/qtm_sp.cpp
@@ -2,12 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/ipc_helpers.h"
 #include "core/hle/service/qtm/qtm_sp.h"
 
-SERIALIZE_EXPORT_IMPL(Service::QTM::QTM_SP)
-
 namespace Service::QTM {
 
 QTM_SP::QTM_SP() : ServiceFramework("qtm:sp", 2) {
diff --git a/src/core/hle/service/qtm/qtm_sp.h b/src/core/hle/service/qtm/qtm_sp.h
index 2f290f192..c3f1049a1 100644
--- a/src/core/hle/service/qtm/qtm_sp.h
+++ b/src/core/hle/service/qtm/qtm_sp.h
@@ -12,11 +12,6 @@ class QTM_SP final : public ServiceFramework<QTM_SP> {
 public:
     QTM_SP();
     ~QTM_SP() = default;
-
-private:
-    SERVICE_SERIALIZATION_SIMPLE
 };
 
 } // namespace Service::QTM
-
-BOOST_CLASS_EXPORT_KEY(Service::QTM::QTM_SP)
diff --git a/src/core/hle/service/qtm/qtm_u.cpp b/src/core/hle/service/qtm/qtm_u.cpp
index 92736db9f..eba21486b 100644
--- a/src/core/hle/service/qtm/qtm_u.cpp
+++ b/src/core/hle/service/qtm/qtm_u.cpp
@@ -2,12 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "core/hle/ipc_helpers.h"
 #include "core/hle/service/qtm/qtm_u.h"
 
-SERIALIZE_EXPORT_IMPL(Service::QTM::QTM_U)
-
 namespace Service::QTM {
 
 QTM_U::QTM_U() : ServiceFramework("qtm:u", 2) {
diff --git a/src/core/hle/service/qtm/qtm_u.h b/src/core/hle/service/qtm/qtm_u.h
index d1aee1e97..01bb1e6e0 100644
--- a/src/core/hle/service/qtm/qtm_u.h
+++ b/src/core/hle/service/qtm/qtm_u.h
@@ -12,11 +12,6 @@ class QTM_U final : public ServiceFramework<QTM_U> {
 public:
     QTM_U();
     ~QTM_U() = default;
-
-private:
-    SERVICE_SERIALIZATION_SIMPLE
 };
 
 } // namespace Service::QTM
-
-BOOST_CLASS_EXPORT_KEY(Service::QTM::QTM_U)
diff --git a/src/core/hle/service/service.h b/src/core/hle/service/service.h
index 0b4b3ec54..92608cc7f 100644
--- a/src/core/hle/service/service.h
+++ b/src/core/hle/service/service.h
@@ -10,10 +10,7 @@
 #include <memory>
 #include <string>
 #include <boost/container/flat_map.hpp>
-#include <boost/serialization/base_object.hpp>
-#include <boost/serialization/shared_ptr.hpp>
 #include "common/common_types.h"
-#include "common/construct.h"
 #include "core/hle/kernel/hle_ipc.h"
 #include "core/hle/kernel/object.h"
 #include "core/hle/service/sm/sm.h"
@@ -194,45 +191,3 @@ struct ServiceModuleInfo {
 extern const std::array<ServiceModuleInfo, 41> service_module_map;
 
 } // namespace Service
-
-#define SERVICE_SERIALIZATION(T, MFIELD, TMODULE)                                                  \
-    template <class Archive>                                                                       \
-    void save_construct(Archive& ar, const unsigned int file_version) const {                      \
-        ar << MFIELD;                                                                              \
-    }                                                                                              \
-                                                                                                   \
-    template <class Archive>                                                                       \
-    static void load_construct(Archive& ar, T* t, const unsigned int file_version) {               \
-        std::shared_ptr<TMODULE> MFIELD;                                                           \
-        ar >> MFIELD;                                                                              \
-        ::new (t) T(MFIELD);                                                                       \
-    }                                                                                              \
-                                                                                                   \
-    template <class Archive>                                                                       \
-    void serialize(Archive& ar, const unsigned int) {                                              \
-        ar& boost::serialization::base_object<Kernel::SessionRequestHandler>(*this);               \
-    }                                                                                              \
-    friend class boost::serialization::access;                                                     \
-    friend class ::construct_access;
-
-#define SERVICE_SERIALIZATION_SIMPLE                                                               \
-    template <class Archive>                                                                       \
-    void serialize(Archive& ar, const unsigned int) {                                              \
-        ar& boost::serialization::base_object<Kernel::SessionRequestHandler>(*this);               \
-    }                                                                                              \
-    friend class boost::serialization::access;
-
-#define SERVICE_CONSTRUCT(T)                                                                       \
-    namespace boost::serialization {                                                               \
-    template <class Archive>                                                                       \
-    void load_construct_data(Archive& ar, T* t, const unsigned int);                               \
-    }
-
-#define SERVICE_CONSTRUCT_IMPL(T)                                                                  \
-    namespace boost::serialization {                                                               \
-    template <class Archive>                                                                       \
-    void load_construct_data(Archive& ar, T* t, const unsigned int) {                              \
-        ::new (t) T(Core::Global<Core::System>());                                                 \
-    }                                                                                              \
-    template void load_construct_data<iarchive>(iarchive & ar, T* t, const unsigned int);          \
-    }
diff --git a/src/core/hle/service/sm/sm.h b/src/core/hle/service/sm/sm.h
index fd86ff198..94357912b 100644
--- a/src/core/hle/service/sm/sm.h
+++ b/src/core/hle/service/sm/sm.h
@@ -8,10 +8,6 @@
 #include <string>
 #include <type_traits>
 #include <unordered_map>
-#include <boost/serialization/shared_ptr.hpp>
-#include <boost/serialization/split_member.hpp>
-#include <boost/serialization/string.hpp>
-#include <boost/serialization/unordered_map.hpp>
 #include "core/hle/kernel/client_port.h"
 #include "core/hle/kernel/object.h"
 #include "core/hle/kernel/server_port.h"
@@ -86,24 +82,6 @@ private:
     // For IPC Recorder
     /// client port Object id -> service name
     std::unordered_map<u32, std::string> registered_services_inverse;
-
-    template <class Archive>
-    void save(Archive& ar, const unsigned int file_version) const {
-        ar << registered_services;
-    }
-
-    template <class Archive>
-    void load(Archive& ar, const unsigned int file_version) {
-        ar >> registered_services;
-        registered_services_inverse.clear();
-        for (const auto& pair : registered_services) {
-            registered_services_inverse.emplace(pair.second->GetObjectId(), pair.first);
-        }
-    }
-
-    BOOST_SERIALIZATION_SPLIT_MEMBER()
-
-    friend class boost::serialization::access;
 };
 
 } // namespace Service::SM
diff --git a/src/core/hle/service/sm/srv.cpp b/src/core/hle/service/sm/srv.cpp
index 97d563771..d2cbe602d 100644
--- a/src/core/hle/service/sm/srv.cpp
+++ b/src/core/hle/service/sm/srv.cpp
@@ -3,10 +3,7 @@
 // Refer to the license.txt file included.
 
 #include <tuple>
-#include <boost/serialization/shared_ptr.hpp>
-#include <boost/serialization/string.hpp>
-#include <boost/serialization/unordered_map.hpp>
-#include "common/archives.h"
+
 #include "common/common_types.h"
 #include "common/logging/log.h"
 #include "core/core.h"
@@ -24,18 +21,8 @@
 #include "core/hle/service/sm/sm.h"
 #include "core/hle/service/sm/srv.h"
 
-SERVICE_CONSTRUCT_IMPL(Service::SM::SRV)
-SERIALIZE_EXPORT_IMPL(Service::SM::SRV)
-
 namespace Service::SM {
 
-template <class Archive>
-void SRV::serialize(Archive& ar, const unsigned int) {
-    ar& boost::serialization::base_object<Kernel::SessionRequestHandler>(*this);
-    ar& notification_semaphore;
-    ar& get_service_handle_delayed_map;
-}
-
 constexpr int MAX_PENDING_NOTIFICATIONS = 16;
 
 /**
@@ -117,15 +104,6 @@ public:
 private:
     Core::System& system;
     std::string name;
-
-    ThreadCallback() : system(Core::Global<Core::System>()) {}
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& boost::serialization::base_object<Kernel::HLERequestContext::WakeupCallback>(*this);
-        ar& name;
-    }
-    friend class boost::serialization::access;
 };
 
 /**
@@ -314,5 +292,3 @@ SRV::SRV(Core::System& system) : ServiceFramework("srv:", 64), system(system) {
 SRV::~SRV() = default;
 
 } // namespace Service::SM
-
-SERIALIZE_EXPORT_IMPL(Service::SM::SRV::ThreadCallback)
diff --git a/src/core/hle/service/sm/srv.h b/src/core/hle/service/sm/srv.h
index 753218dca..ba27af974 100644
--- a/src/core/hle/service/sm/srv.h
+++ b/src/core/hle/service/sm/srv.h
@@ -6,7 +6,6 @@
 
 #include <memory>
 #include <unordered_map>
-#include <boost/serialization/export.hpp>
 #include "core/hle/service/service.h"
 
 namespace Core {
@@ -40,14 +39,6 @@ private:
     Core::System& system;
     std::shared_ptr<Kernel::Semaphore> notification_semaphore;
     std::unordered_map<std::string, std::shared_ptr<Kernel::Event>> get_service_handle_delayed_map;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int);
-    friend class boost::serialization::access;
 };
 
 } // namespace Service::SM
-
-SERVICE_CONSTRUCT(Service::SM::SRV)
-BOOST_CLASS_EXPORT_KEY(Service::SM::SRV)
-BOOST_CLASS_EXPORT_KEY(Service::SM::SRV::ThreadCallback)
diff --git a/src/core/hle/service/soc/soc_u.cpp b/src/core/hle/service/soc/soc_u.cpp
index ae2ecfcb2..ae0bf9c56 100644
--- a/src/core/hle/service/soc/soc_u.cpp
+++ b/src/core/hle/service/soc/soc_u.cpp
@@ -7,7 +7,7 @@
 #include <type_traits>
 #include <unordered_map>
 #include <vector>
-#include "common/archives.h"
+
 #include "common/assert.h"
 #include "common/bit_field.h"
 #include "common/common_types.h"
@@ -63,8 +63,6 @@
 #endif
 #define MSGCUSTOM_HANDLE_DONTWAIT 0x80000000
 
-SERIALIZE_EXPORT_IMPL(Service::SOC::SOC_U)
-
 // Change according the debugging needs
 #define LOG_SEND_RECV LOG_TRACE
 #define LOG_POLL LOG_TRACE
diff --git a/src/core/hle/service/soc/soc_u.h b/src/core/hle/service/soc/soc_u.h
index 2a7cfa8e8..fea600d5f 100644
--- a/src/core/hle/service/soc/soc_u.h
+++ b/src/core/hle/service/soc/soc_u.h
@@ -6,8 +6,6 @@
 
 #include <unordered_map>
 #include <utility>
-#include <boost/serialization/set.hpp>
-#include <boost/serialization/unordered_map.hpp>
 #include "core/hle/result.h"
 #include "core/hle/service/service.h"
 
@@ -35,16 +33,6 @@ struct SocketHolder {
     bool shutdown_rd = false;
 
     u32 ownerProcess = 0;
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& socket_fd;
-        ar& blocking;
-        ar& isGlobal;
-        ar& ownerProcess;
-    }
-    friend class boost::serialization::access;
 };
 
 class SOC_U final : public ServiceFramework<SOC_U> {
@@ -166,14 +154,6 @@ private:
     /// obtain them again between play sessions.
     bool interface_info_cached = false;
     InterfaceInfo interface_info;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& boost::serialization::base_object<Kernel::SessionRequestHandler>(*this);
-        ar& created_sockets;
-        ar& initialized_processes;
-    }
-    friend class boost::serialization::access;
 };
 
 std::shared_ptr<SOC_U> GetService(Core::System& system);
@@ -181,5 +161,3 @@ std::shared_ptr<SOC_U> GetService(Core::System& system);
 void InstallInterfaces(Core::System& system);
 
 } // namespace Service::SOC
-
-BOOST_CLASS_EXPORT_KEY(Service::SOC::SOC_U)
diff --git a/src/core/hle/service/ssl/ssl_c.cpp b/src/core/hle/service/ssl/ssl_c.cpp
index 415c71800..100074c90 100644
--- a/src/core/hle/service/ssl/ssl_c.cpp
+++ b/src/core/hle/service/ssl/ssl_c.cpp
@@ -3,14 +3,13 @@
 // Refer to the license.txt file included.
 
 #include <openssl/rand.h>
-#include "common/archives.h"
+
 #include "common/common_types.h"
 #include "core/core.h"
 #include "core/hle/ipc.h"
 #include "core/hle/ipc_helpers.h"
 #include "core/hle/service/ssl/ssl_c.h"
 
-SERIALIZE_EXPORT_IMPL(Service::SSL::SSL_C)
 namespace Service::SSL {
 
 void SSL_C::Initialize(Kernel::HLERequestContext& ctx) {
diff --git a/src/core/hle/service/ssl/ssl_c.h b/src/core/hle/service/ssl/ssl_c.h
index d4bcd1449..c08b01ec9 100644
--- a/src/core/hle/service/ssl/ssl_c.h
+++ b/src/core/hle/service/ssl/ssl_c.h
@@ -20,8 +20,6 @@ public:
 private:
     void Initialize(Kernel::HLERequestContext& ctx);
     void GenerateRandomData(Kernel::HLERequestContext& ctx);
-
-    SERVICE_SERIALIZATION_SIMPLE
 };
 
 void InstallInterfaces(Core::System& system);
@@ -29,5 +27,3 @@ void InstallInterfaces(Core::System& system);
 void GenerateRandomData(std::vector<u8>& out);
 
 } // namespace Service::SSL
-
-BOOST_CLASS_EXPORT_KEY(Service::SSL::SSL_C)
diff --git a/src/core/memory.cpp b/src/core/memory.cpp
index eb4ab42d4..2e023d6ad 100644
--- a/src/core/memory.cpp
+++ b/src/core/memory.cpp
@@ -4,30 +4,22 @@
 
 #include <array>
 #include <cstring>
-#include <boost/serialization/array.hpp>
-#include <boost/serialization/binary_object.hpp>
 #include "audio_core/dsp_interface.h"
-#include "common/archives.h"
+
 #include "common/assert.h"
 #include "common/atomic_ops.h"
 #include "common/common_types.h"
 #include "common/logging/log.h"
-#include "common/settings.h"
 #include "common/swap.h"
 #include "core/arm/arm_interface.h"
 #include "core/core.h"
-#include "core/global.h"
+
 #include "core/hle/kernel/process.h"
 #include "core/hle/service/plgldr/plgldr.h"
 #include "core/memory.h"
 #include "video_core/gpu.h"
 #include "video_core/renderer_base.h"
 
-SERIALIZE_EXPORT_IMPL(Memory::MemorySystem::BackingMemImpl<Memory::Region::FCRAM>)
-SERIALIZE_EXPORT_IMPL(Memory::MemorySystem::BackingMemImpl<Memory::Region::VRAM>)
-SERIALIZE_EXPORT_IMPL(Memory::MemorySystem::BackingMemImpl<Memory::Region::DSP>)
-SERIALIZE_EXPORT_IMPL(Memory::MemorySystem::BackingMemImpl<Memory::Region::N3DS>)
-
 namespace Memory {
 
 void PageTable::Clear() {
@@ -72,22 +64,10 @@ private:
     std::array<bool, LINEAR_HEAP_SIZE / CITRA_PAGE_SIZE> linear_heap{};
     std::array<bool, NEW_LINEAR_HEAP_SIZE / CITRA_PAGE_SIZE> new_linear_heap{};
     std::array<bool, PLUGIN_3GX_FB_SIZE / CITRA_PAGE_SIZE> plugin_fb{};
-
-    static_assert(sizeof(bool) == 1);
-    friend class boost::serialization::access;
-    template <typename Archive>
-    void serialize(Archive& ar, const unsigned int file_version) {
-        ar& vram;
-        ar& linear_heap;
-        ar& new_linear_heap;
-        ar& plugin_fb;
-    }
 };
 
 class MemorySystem::Impl {
 public:
-    // Visual Studio would try to allocate these on compile time
-    // if they are std::array which would exceed the memory limit.
     std::unique_ptr<u8[]> fcram = std::make_unique<u8[]>(Memory::FCRAM_N3DS_SIZE);
     std::unique_ptr<u8[]> vram = std::make_unique<u8[]>(Memory::VRAM_SIZE);
     std::unique_ptr<u8[]> n3ds_extra_ram = std::make_unique<u8[]>(Memory::N3DS_EXTRA_RAM_SIZE);
@@ -312,27 +292,6 @@ public:
             CheckRegion(PLUGIN_3GX_FB_VADDR, PLUGIN_3GX_FB_VADDR_END, plg_ldr->GetPluginFBAddr());
         }
     }
-
-private:
-    friend class boost::serialization::access;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int file_version) {
-        bool save_n3ds_ram = Settings::values.is_new_3ds.GetValue();
-        ar& save_n3ds_ram;
-        ar& boost::serialization::make_binary_object(vram.get(), Memory::VRAM_SIZE);
-        ar& boost::serialization::make_binary_object(
-            fcram.get(), save_n3ds_ram ? Memory::FCRAM_N3DS_SIZE : Memory::FCRAM_SIZE);
-        ar& boost::serialization::make_binary_object(
-            n3ds_extra_ram.get(), save_n3ds_ram ? Memory::N3DS_EXTRA_RAM_SIZE : 0);
-        ar& cache_marker;
-        ar& page_table_list;
-        // dsp is set from Core::System at startup
-        ar& current_page_table;
-        ar& fcram_mem;
-        ar& vram_mem;
-        ar& n3ds_extra_ram_mem;
-        ar& dsp_mem;
-    }
 };
 
 // We use this rather than BufferMem because we don't want new objects to be allocated when
@@ -340,7 +299,6 @@ private:
 template <Region R>
 class MemorySystem::BackingMemImpl : public BackingMem {
 public:
-    BackingMemImpl() : impl(*Core::Global<Core::System>().Memory().impl) {}
     explicit BackingMemImpl(MemorySystem::Impl& impl_) : impl(impl_) {}
     u8* GetPtr() override {
         return impl.GetPtr(R);
@@ -354,12 +312,6 @@ public:
 
 private:
     MemorySystem::Impl& impl;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& boost::serialization::base_object<BackingMem>(*this);
-    }
-    friend class boost::serialization::access;
 };
 
 MemorySystem::Impl::Impl(Core::System& system_)
@@ -371,13 +323,6 @@ MemorySystem::Impl::Impl(Core::System& system_)
 MemorySystem::MemorySystem(Core::System& system) : impl(std::make_unique<Impl>(system)) {}
 MemorySystem::~MemorySystem() = default;
 
-template <class Archive>
-void MemorySystem::serialize(Archive& ar, const unsigned int file_version) {
-    ar&* impl.get();
-}
-
-SERIALIZE_IMPL(MemorySystem)
-
 void MemorySystem::SetCurrentPageTable(std::shared_ptr<PageTable> page_table) {
     impl->current_page_table = page_table;
 }
diff --git a/src/core/memory.h b/src/core/memory.h
index 3aaf09bbe..d482f0bc4 100644
--- a/src/core/memory.h
+++ b/src/core/memory.h
@@ -6,8 +6,6 @@
 #include <array>
 #include <cstddef>
 #include <string>
-#include <boost/serialization/array.hpp>
-#include <boost/serialization/vector.hpp>
 #include "common/common_types.h"
 #include "common/memory_ref.h"
 
@@ -101,17 +99,6 @@ struct PageTable {
     }
 
     void Clear();
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& pointers.refs;
-        ar& attributes;
-        for (std::size_t i = 0; i < PAGE_TABLE_NUM_ENTRIES; i++) {
-            pointers.raw[i] = pointers.refs[i].GetPtr();
-        }
-    }
-    friend class boost::serialization::access;
 };
 
 /// Physical memory regions as seen from the ARM11
@@ -577,18 +564,9 @@ private:
     class Impl;
     std::unique_ptr<Impl> impl;
 
-    friend class boost::serialization::access;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int file_version);
-
 public:
     template <Region R>
     class BackingMemImpl;
 };
 
 } // namespace Memory
-
-BOOST_CLASS_EXPORT_KEY(Memory::MemorySystem::BackingMemImpl<Memory::Region::FCRAM>)
-BOOST_CLASS_EXPORT_KEY(Memory::MemorySystem::BackingMemImpl<Memory::Region::VRAM>)
-BOOST_CLASS_EXPORT_KEY(Memory::MemorySystem::BackingMemImpl<Memory::Region::DSP>)
-BOOST_CLASS_EXPORT_KEY(Memory::MemorySystem::BackingMemImpl<Memory::Region::N3DS>)
diff --git a/src/core/movie.cpp b/src/core/movie.cpp
index c7dd23c90..15e8caba5 100644
--- a/src/core/movie.cpp
+++ b/src/core/movie.cpp
@@ -10,7 +10,7 @@
 #include <boost/optional.hpp>
 #include <cryptopp/hex.h>
 #include <cryptopp/osrng.h>
-#include "common/archives.h"
+
 #include "common/bit_field.h"
 #include "common/file_util.h"
 #include "common/logging/log.h"
@@ -147,73 +147,6 @@ Movie::Movie(const Core::System& system_) : system{system_} {}
 
 Movie::~Movie() = default;
 
-template <class Archive>
-void Movie::serialize(Archive& ar, const unsigned int file_version) {
-    // Only serialize what's needed to make savestates useful for TAS:
-    u64 _current_byte = static_cast<u64>(current_byte);
-    ar& _current_byte;
-    current_byte = static_cast<std::size_t>(_current_byte);
-    ar& current_input;
-
-    std::vector<u8> recorded_input_ = recorded_input;
-    ar& recorded_input_;
-
-    ar& init_time;
-    ar& base_ticks;
-
-    if (Archive::is_loading::value) {
-        u64 savestate_movie_id;
-        ar& savestate_movie_id;
-        if (id != savestate_movie_id) {
-            if (savestate_movie_id == 0) {
-                throw std::runtime_error("You must close your movie to load this state");
-            } else {
-                throw std::runtime_error("You must load the same movie to load this state");
-            }
-        }
-    } else {
-        ar& id;
-    }
-
-    // Whether the state was made in MovieFinished state
-    bool post_movie = play_mode == PlayMode::MovieFinished;
-    ar& post_movie;
-
-    if (Archive::is_loading::value && id != 0) {
-        if (!read_only) {
-            recorded_input = std::move(recorded_input_);
-        }
-
-        if (post_movie) {
-            play_mode = PlayMode::MovieFinished;
-            return;
-        }
-
-        if (read_only) {
-            if (play_mode == PlayMode::Recording) {
-                SaveMovie();
-            }
-            if (recorded_input_.size() >= recorded_input.size()) {
-                throw std::runtime_error("Future event savestate not allowed in R/O mode");
-            }
-            // Ensure that the current movie and savestate movie are in the same timeline
-            if (std::mismatch(recorded_input_.begin(), recorded_input_.end(),
-                              recorded_input.begin())
-                    .first != recorded_input_.end()) {
-                throw std::runtime_error("Timeline mismatch not allowed in R/O mode");
-            }
-
-            play_mode = PlayMode::Playing;
-            total_input = GetInputCount(recorded_input);
-        } else {
-            play_mode = PlayMode::Recording;
-            rerecord_count++;
-        }
-    }
-}
-
-SERIALIZE_IMPL(Movie)
-
 Movie::PlayMode Movie::GetPlayMode() const {
     return play_mode;
 }
diff --git a/src/core/movie.h b/src/core/movie.h
index 729bc459b..34fd7752b 100644
--- a/src/core/movie.h
+++ b/src/core/movie.h
@@ -6,7 +6,6 @@
 
 #include <functional>
 #include <span>
-#include <boost/serialization/vector.hpp>
 #include "common/common_types.h"
 
 namespace Service {
@@ -186,11 +185,5 @@ private:
     bool read_only = true;
 
     std::function<void()> playback_completion_callback = [] {};
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int file_version);
-    friend class boost::serialization::access;
 };
 } // namespace Core
-
-BOOST_CLASS_VERSION(Core::Movie, 1)
diff --git a/src/core/savestate.cpp b/src/core/savestate.cpp
deleted file mode 100644
index bc1f53684..000000000
--- a/src/core/savestate.cpp
+++ /dev/null
@@ -1,208 +0,0 @@
-// Copyright 2020 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#include <chrono>
-#include <sstream>
-#include <cryptopp/hex.h>
-#include <fmt/format.h>
-#include "common/archives.h"
-#include "common/file_util.h"
-#include "common/logging/log.h"
-#include "common/scm_rev.h"
-#include "common/swap.h"
-#include "common/zstd_compression.h"
-#include "core/core.h"
-#include "core/movie.h"
-#include "core/savestate.h"
-#include "core/savestate_data.h"
-#include "network/network.h"
-
-namespace Core {
-
-#pragma pack(push, 1)
-struct CSTHeader {
-    std::array<u8, 4> filetype;    /// Unique Identifier to check the file type (always "CST"0x1B)
-    u64_le program_id;             /// ID of the ROM being executed. Also called title_id
-    std::array<u8, 20> revision;   /// Git hash of the revision this savestate was created with
-    u64_le time;                   /// The time when this save state was created
-    std::array<u8, 20> build_name; /// The build name (Canary/Nightly) with the version number
-    u32_le zero = 0;               /// Should be zero, just in case.
-
-    std::array<u8, 192> reserved{}; /// Make heading 256 bytes so it has consistent size
-};
-static_assert(sizeof(CSTHeader) == 256, "CSTHeader should be 256 bytes");
-#pragma pack(pop)
-
-constexpr std::array<u8, 4> header_magic_bytes{{'C', 'S', 'T', 0x1B}};
-
-static std::string GetSaveStatePath(u64 program_id, u64 movie_id, u32 slot) {
-    if (movie_id) {
-        return fmt::format("{}{:016X}.movie{:016X}.{:02d}.cst",
-                           FileUtil::GetUserPath(FileUtil::UserPath::StatesDir), program_id,
-                           movie_id, slot);
-    } else {
-        return fmt::format("{}{:016X}.{:02d}.cst",
-                           FileUtil::GetUserPath(FileUtil::UserPath::StatesDir), program_id, slot);
-    }
-}
-
-static bool ValidateSaveState(const CSTHeader& header, SaveStateInfo& info, u64 program_id,
-                              u64 movie_id) {
-    const auto path = GetSaveStatePath(program_id, movie_id, info.slot);
-    if (header.filetype != header_magic_bytes) {
-        LOG_WARNING(Core, "Invalid save state file {}", path);
-        return false;
-    }
-    info.time = header.time;
-
-    if (header.program_id != program_id) {
-        LOG_WARNING(Core, "Save state file isn't for the current game {}", path);
-        return false;
-    }
-    const std::string revision = fmt::format("{:02x}", fmt::join(header.revision, ""));
-    const std::string build_name =
-        header.zero == 0 ? reinterpret_cast<const char*>(header.build_name.data()) : "";
-
-    if (revision == Common::g_scm_rev) {
-        info.status = SaveStateInfo::ValidationStatus::OK;
-    } else {
-        if (!build_name.empty()) {
-            info.build_name = build_name;
-        } else if (hash_to_version.find(revision) != hash_to_version.end()) {
-            info.build_name = hash_to_version.at(revision);
-        }
-        if (info.build_name.empty()) {
-            LOG_WARNING(Core, "Save state file {} created from a different revision {}", path,
-                        revision);
-        } else {
-            LOG_WARNING(Core,
-                        "Save state file {} created from a different build {} with revision {}",
-                        path, info.build_name, revision);
-        }
-
-        info.status = SaveStateInfo::ValidationStatus::RevisionDismatch;
-    }
-    return true;
-}
-
-std::vector<SaveStateInfo> ListSaveStates(u64 program_id, u64 movie_id) {
-    std::vector<SaveStateInfo> result;
-    result.reserve(SaveStateSlotCount);
-    for (u32 slot = 1; slot <= SaveStateSlotCount; ++slot) {
-        const auto path = GetSaveStatePath(program_id, movie_id, slot);
-        if (!FileUtil::Exists(path)) {
-            continue;
-        }
-
-        SaveStateInfo info;
-        info.slot = slot;
-
-        FileUtil::IOFile file(path, "rb");
-        if (!file) {
-            LOG_ERROR(Core, "Could not open file {}", path);
-            continue;
-        }
-        CSTHeader header;
-        if (file.GetSize() < sizeof(header)) {
-            LOG_ERROR(Core, "File too small {}", path);
-            continue;
-        }
-        if (file.ReadBytes(&header, sizeof(header)) != sizeof(header)) {
-            LOG_ERROR(Core, "Could not read from file {}", path);
-            continue;
-        }
-        if (!ValidateSaveState(header, info, program_id, movie_id)) {
-            continue;
-        }
-
-        result.emplace_back(std::move(info));
-    }
-    return result;
-}
-
-void System::SaveState(u32 slot) const {
-    std::ostringstream sstream{std::ios_base::binary};
-    // Serialize
-    oarchive oa{sstream};
-    oa&* this;
-
-    const std::string& str{sstream.str()};
-    const auto data = std::span<const u8>{reinterpret_cast<const u8*>(str.data()), str.size()};
-    auto buffer = Common::Compression::CompressDataZSTDDefault(data);
-
-    const u64 movie_id = movie.GetCurrentMovieID();
-    const auto path = GetSaveStatePath(title_id, movie_id, slot);
-    if (!FileUtil::CreateFullPath(path)) {
-        throw std::runtime_error("Could not create path " + path);
-    }
-
-    FileUtil::IOFile file(path, "wb");
-    if (!file) {
-        throw std::runtime_error("Could not open file " + path);
-    }
-
-    CSTHeader header{};
-    header.filetype = header_magic_bytes;
-    header.program_id = title_id;
-    std::string rev_bytes;
-    CryptoPP::StringSource ss(Common::g_scm_rev, true,
-                              new CryptoPP::HexDecoder(new CryptoPP::StringSink(rev_bytes)));
-    std::memcpy(header.revision.data(), rev_bytes.data(), sizeof(header.revision));
-    header.time = std::chrono::duration_cast<std::chrono::seconds>(
-                      std::chrono::system_clock::now().time_since_epoch())
-                      .count();
-    const std::string build_fullname = Common::g_build_fullname;
-    std::memset(header.build_name.data(), 0, sizeof(header.build_name));
-    std::memcpy(header.build_name.data(), build_fullname.c_str(),
-                std::min(build_fullname.length(), sizeof(header.build_name) - 1));
-
-    if (file.WriteBytes(&header, sizeof(header)) != sizeof(header) ||
-        file.WriteBytes(buffer.data(), buffer.size()) != buffer.size()) {
-        throw std::runtime_error("Could not write to file " + path);
-    }
-}
-
-void System::LoadState(u32 slot) {
-    if (Network::GetRoomMember().lock()->IsConnected()) {
-        throw std::runtime_error("Unable to load while connected to multiplayer");
-    }
-
-    const u64 movie_id = movie.GetCurrentMovieID();
-    const auto path = GetSaveStatePath(title_id, movie_id, slot);
-
-    std::vector<u8> decompressed;
-    {
-        std::vector<u8> buffer(FileUtil::GetSize(path) - sizeof(CSTHeader));
-
-        FileUtil::IOFile file(path, "rb");
-
-        // load header
-        CSTHeader header;
-        if (file.ReadBytes(&header, sizeof(header)) != sizeof(header)) {
-            throw std::runtime_error("Could not read from file at " + path);
-        }
-
-        // validate header
-        SaveStateInfo info;
-        info.slot = slot;
-        if (!ValidateSaveState(header, info, title_id, movie_id)) {
-            throw std::runtime_error("Invalid savestate");
-        }
-
-        if (file.ReadBytes(buffer.data(), buffer.size()) != buffer.size()) {
-            throw std::runtime_error("Could not read from file at " + path);
-        }
-        decompressed = Common::Compression::DecompressDataZSTD(buffer);
-    }
-    std::istringstream sstream{
-        std::string{reinterpret_cast<char*>(decompressed.data()), decompressed.size()},
-        std::ios_base::binary};
-    decompressed.clear();
-
-    // Deserialize
-    iarchive ia{sstream};
-    ia&* this;
-}
-
-} // namespace Core
diff --git a/src/core/savestate.h b/src/core/savestate.h
deleted file mode 100644
index 2962cce86..000000000
--- a/src/core/savestate.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2020 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include <string>
-#include <vector>
-#include "common/common_types.h"
-
-namespace Core {
-
-struct SaveStateInfo {
-    u32 slot;
-    u64 time;
-    enum class ValidationStatus {
-        OK,
-        RevisionDismatch,
-    } status;
-    std::string build_name;
-};
-
-constexpr u32 SaveStateSlotCount = 10; // Maximum count of savestate slots
-
-std::vector<SaveStateInfo> ListSaveStates(u64 program_id, u64 movie_id);
-
-} // namespace Core
diff --git a/src/core/savestate_data.h b/src/core/savestate_data.h
deleted file mode 100644
index 5ae9346b9..000000000
--- a/src/core/savestate_data.h
+++ /dev/null
@@ -1,1427 +0,0 @@
-// Copyright 2023 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include <map>
-#include <string>
-
-namespace Core {
-
-std::map<std::string, std::string> hash_to_version = {
-    {"c605bb42dbb364cc0977c417aed0630d74b05c25", "nightly-1481"},
-    {"47829ee095aa398494f4068919ca83ea2a32caee", "nightly-1482"},
-    {"8967b403b984134fddf99a8c2a5158af177d5fba", "nightly-1483"},
-    {"79a0cbbba8603becb2c14b57aa9bf6475936aae9", "nightly-1484"},
-    {"c8a503b10fe05784ed18a2488bc8fe10569ceac9", "nightly-1485"},
-    {"75c9784239215cdf21367137a049cca52b84597a", "nightly-1486"},
-    {"397bd1bb7381eaa34ed7c3bcf18661bd3f66fcbb", "nightly-1487"},
-    {"b96b7ab3f6bd48ef86dcd3cf37c15f1ba0a4ac4b", "nightly-1488"},
-    {"e54b640e0ba77b0126e928aa5fe6ed318cb927de", "nightly-1489"},
-    {"8014c67faa11e6d2daa402724679170a4a7f32f6", "nightly-1490"},
-    {"182aa1e39d65fc81d1fbd04465a6179600eece5e", "nightly-1491"},
-    {"08dddbac4c462ece8554d302a655b5e1de89707f", "nightly-1492"},
-    {"1856752b6171368101768cc37029c36ffd13f9a2", "nightly-1493"},
-    {"362956a69bc3a31c9ec7a42ae8ff6bf2dee12cce", "nightly-1494"},
-    {"ca722f1bb13ce33e1e848c994e7dcdd109fa1ab3", "nightly-1495"},
-    {"0f72dd6d85b1d4e6cc49f47d6be68d8a38f9b51d", "nightly-1496"},
-    {"df92b37bbff02e4a1d132df48b5210700a62af6d", "nightly-1497"},
-    {"acf18ce4dd699ab93140ce91b3aab36edea5641d", "nightly-1498"},
-    {"1469ad339c4d3848eef742aa4a1247c963c1a248", "nightly-1499"},
-    {"bcc80d08712191a9485c63fd74570877245c340a", "nightly-1500"},
-    {"3597921ec5745cd20255aa210c5292eace69949c", "nightly-1501"},
-    {"d5a962cb8101fdc0bb9722a1be1a9b8d2f77e2e9", "nightly-1502"},
-    {"b82d4315fefb4fc8803e2b65e0dc9252548bd402", "nightly-1503"},
-    {"db5b8b9c88512f86327740a0b609057a3b08cbab", "nightly-1504"},
-    {"8b43dff8493f797604d28e3a779edfa8dd381144", "nightly-1505"},
-    {"38c3c9c74b704050d72e397feb290db2e616209a", "nightly-1506"},
-    {"39463f1f6d25164d433a347ef85b95ec1577cdc9", "nightly-1507"},
-    {"77ffe37c46af8a91f34e973971042948792a7790", "nightly-1508"},
-    {"bc14f485c41311c8d4bc7d830a963ca45b9b9b25", "nightly-1509"},
-    {"f18aef0579c7ac42bc4d82a38ea954510667fa14", "nightly-1510"},
-    {"ed304e28779511c88c413af1fcab2ff2aec3b88b", "nightly-1511"},
-    {"8a0b0c2fc7883a45492a3248b04a4ca48585a427", "nightly-1512"},
-    {"9dc0f38ffd40b80f27366aa6b61cfbdba7c1665c", "nightly-1513"},
-    {"96832a2c82807876925126bc7a0e3b546a952c74", "nightly-1514"},
-    {"98fe5f82c58f76dbc9730f9b82257993c8e77cc9", "nightly-1515"},
-    {"c937876935d50edf6ec98f2a9b7a15f1efbd92dd", "nightly-1516"},
-    {"64694b0f114e4709ccb3e9b62ff061518fe8cca9", "nightly-1517"},
-    {"4a677e83fee0c1cb620f650ce0ab6a9c9d84d3fc", "nightly-1518"},
-    {"85d37c99943817e3f41346127c3633ad59a8b716", "nightly-1519"},
-    {"fd1b254635cef6ac3393a960423d4388ed6e8cc9", "nightly-1520"},
-    {"1bb9a71a0142747ba6dd0899f139d0d527f1263d", "nightly-1521"},
-    {"2eacb11c5390b42da1369ef82155451ecf950750", "nightly-1522"},
-    {"6a0636d631077487e1039652300e2e20b78301d2", "nightly-1523"},
-    {"017f0c469e778ffd1c5b6e3b12739362261fa562", "nightly-1524"},
-    {"037c857bd6153c415f61eec21199541a39ab10d7", "nightly-1525"},
-    {"4d7487bd34024f7a5be6b909827934041524caf3", "nightly-1526"},
-    {"59984df6032befcaec0dbd520b2fe7455d0f46fa", "nightly-1527"},
-    {"69075680344f37bf6bb9a615a39d3a7837f5ff6e", "nightly-1528"},
-    {"5a008a74fa61f0d363e9112f5afe139f6e4d69f3", "nightly-1529"},
-    {"8e7abecf7eca9e22b596c3db0c1808b8cc4ac91a", "nightly-1530"},
-    {"70a43be714bf251505670f8bd865bcf2b8a4c9f8", "nightly-1531"},
-    {"e212dc3a1f1c6038a75a14bd059e77636180cee9", "nightly-1532"},
-    {"2476532f216c0a3d32981600bbcfa465f46eb20f", "nightly-1533"},
-    {"eb996f046d402fe4a3cca31476d0c3a9e8aad6aa", "nightly-1534"},
-    {"41bff0e3b780072acc9c5fabff8d026b2f97c7af", "nightly-1535"},
-    {"36809b2e2edf49ef1211180908b2a1ea0cc63066", "nightly-1536"},
-    {"e959d44f0024d65bca587b8fc77ddcf7e807402a", "nightly-1537"},
-    {"96ebd534669644d6d1eac778678234abe2c1fc9c", "nightly-1538"},
-    {"8a691725706ced0488e1b609aa7a7992c397cd84", "nightly-1539"},
-    {"007fb63e47f1e0ea30ebce9c87017b1a34d6d636", "nightly-1540"},
-    {"4892d37309d01c5f6457359ee268b8333e51992e", "nightly-1541"},
-    {"8d27b0714dc6dfcfb8fda3fa482b391fd9fa4c2d", "nightly-1542"},
-    {"d11d600b61e44599a3b7379727263396e51b6ef4", "nightly-1543"},
-    {"57aa18f52ea35ca74cd1a6c406a4abf04049b44e", "nightly-1544"},
-    {"63c86f24177e779b859eb897d6968df69a2ab276", "nightly-1545"},
-    {"307b8f923b36c4e6dc7632f888e895f632654558", "nightly-1546"},
-    {"213c956b7ce15a2ceabceef7539b881b1934467c", "nightly-1547"},
-    {"51dfc46d3f00c33e4ddf884da7581c5982f34546", "nightly-1548"},
-    {"c4ba7b362696ff424044856974d9ae8e2263dd73", "nightly-1549"},
-    {"028609d548fe672302fe307bcc4c33ddc52c4c1c", "nightly-1550"},
-    {"61c8ea3fe9df8a1a4b75f10c4d864ef3f53f394e", "nightly-1551"},
-    {"7dc472a3a78f31039b49bc058682d90a565c8398", "nightly-1552"},
-    {"81a1e5680f93189d6029f579b4b261b2aa552818", "nightly-1553"},
-    {"76253063a37e70733ac3ede712cd18cfcdff5bd6", "nightly-1554"},
-    {"dbd1a389ef14e2b51f9f90ecf706327366b203d4", "nightly-1555"},
-    {"0b307a86a6ea5dfb3a35ec2bb8397fab71a70dac", "nightly-1556"},
-    {"1643cf5b86f64d9700ad0654b1639ec819dc2b67", "nightly-1557"},
-    {"edb5977fba8109521e127ff7fc5d7b320fd56ce8", "nightly-1558"},
-    {"e6ad0d390ef9fae9360fb783907d0ffba9d38326", "nightly-1559"},
-    {"565e5988efa79cf1072700b8d5d24ff78803145c", "nightly-1560"},
-    {"2632b421c2dbae05cdcf2d7a010dc36db1860889", "nightly-1561"},
-    {"9b20ff0369c2f305a6bdcbb7658027cec101ea38", "nightly-1562"},
-    {"5b245aafd32c9aa8c35d00cf4a197f070e3ed0f6", "nightly-1563"},
-    {"16913feb4441ffba1a57347953a8a6aa0103e5c5", "nightly-1564"},
-    {"2e24183e53e5343f24f5e3cb630235ceac762ee2", "nightly-1565"},
-    {"1504018a566e99967191f6ecf5c5fce3caf4a403", "nightly-1566"},
-    {"f7aaa37bf2bfdc3480fbbd398900b199a110b566", "nightly-1567"},
-    {"8ce81b19be1a9161c829aec4e0a9521fa8aef57d", "nightly-1568"},
-    {"353780e1c9ad5326cdd4b8019234413e3c51911d", "nightly-1569"},
-    {"902cc1eb495953274360914c016320e62a971c91", "nightly-1570"},
-    {"cb44e4408d5e3fd6ec4f7c39c51aa094389408ba", "nightly-1571"},
-    {"8a080146c92bf95336025306481f2d056c504499", "nightly-1572"},
-    {"8a080146c92bf95336025306481f2d056c504499", "nightly-1573"},
-    {"3090f840a87b5fde58e53f0576d1f7e523514f54", "nightly-1574"},
-    {"6d65319c85a7bc032d27f93841ab1e27dd6d93be", "nightly-1575"},
-    {"485d64ae7396ede1a37c6fa46185976c0cf0cd2c", "nightly-1576"},
-    {"372c653ec33a770fb4fda0969c3a87b12e54e63c", "nightly-1577"},
-    {"7444c95132e40098ea4a5166b717f7af813cc385", "nightly-1578"},
-    {"e79de3107e0b8e36e5565b615efbf5e15f3aa861", "nightly-1579"},
-    {"c4a4b40b2d51a60af3c0450074580a65906ba57a", "nightly-1580"},
-    {"c4a4b40b2d51a60af3c0450074580a65906ba57a", "nightly-1581"},
-    {"c4a4b40b2d51a60af3c0450074580a65906ba57a", "nightly-1582"},
-    {"c4a4b40b2d51a60af3c0450074580a65906ba57a", "nightly-1583"},
-    {"910cc9efc18fa3cb1fbc897715afcdd5e8b12f23", "nightly-1584"},
-    {"835efd321e2ee361ad76cb4bb077efefe7396dcf", "nightly-1585"},
-    {"bd7ee8c315760b3e91a490254370bd3ccfb24bdc", "nightly-1586"},
-    {"bd7ee8c315760b3e91a490254370bd3ccfb24bdc", "nightly-1587"},
-    {"f4e727cc19f9b6fe56fe54673217425e29bc036a", "nightly-1588"},
-    {"96fa75fb93a3dea4a8fbe72bde23b16979057a43", "nightly-1589"},
-    {"a83f81916046f673482b522d695874220eb5faf0", "nightly-1590"},
-    {"897e473da4e1d5771a5eee021842e427336d623d", "nightly-1591"},
-    {"1722701c07088593f1db605ff97d9d6865899f5e", "nightly-1592"},
-    {"f6ced5def024192257667b8c21322fb2eb654890", "nightly-1593"},
-    {"d88d22080da40fcfcbc88fb3aa3e4cbc7d1e791f", "nightly-1594"},
-    {"a34888804b3eb0c150dcd78514a72834075b37fd", "nightly-1595"},
-    {"a34888804b3eb0c150dcd78514a72834075b37fd", "nightly-1596"},
-    {"c3673ac9cd342839e1b5a41408e7867f50b3c9fc", "nightly-1597"},
-    {"b4ec50ba217591d24f25a7765c275b86044fd04f", "nightly-1598"},
-    {"b94f21eacdd41d321c9b62730e119cd5495eb2c1", "nightly-1599"},
-    {"57da84ba63f0ba0ae6979e5ff27b13e2f4c80ef6", "nightly-1600"},
-    {"f72be7af2dd1706cbbd80a9baae417e17752a1b0", "nightly-1601"},
-    {"2a676858be6cb384a5473472861d71add9941598", "nightly-1602"},
-    {"f2d26eb73b5361490b9aa78e2b1ad2a5941587d4", "nightly-1603"},
-    {"69f4aacccf2b35c1bb618e1cf7eaa4b22b08cb78", "nightly-1604"},
-    {"550cc859b5ad537f0098233869918539101295c3", "nightly-1605"},
-    {"88c0288cb1d1fa029c55fbb8ba7ced384f97c699", "nightly-1606"},
-    {"855dc9f0fce8b768c6f468febe3c6772f2f776ef", "nightly-1607"},
-    {"a5fd11c213b374b47b07f4fa445a297da881fce7", "nightly-1608"},
-    {"08e508e846d04652a9e3bd12872b9fef1dee4712", "nightly-1609"},
-    {"4135a12cb5121ce45a565c90efc6869b8391f371", "nightly-1610"},
-    {"e48110bdf4f97fd43b940f9394964ab0e0ad3654", "nightly-1611"},
-    {"f6b543886c42def34369451927be6dbf8d3e1b4f", "nightly-1612"},
-    {"f4be7333556e6c6a12f77276dc5bef1895a44bff", "nightly-1613"},
-    {"a39e0ea3b16d254dc2f9fa5eeb697ca1f6c2642b", "nightly-1614"},
-    {"2f01046f77180c649c7508c6f7cd8e4a8624fcd5", "nightly-1615"},
-    {"66846836bc7017a0c5a34f7718b4e0dcdfe2472c", "nightly-1616"},
-    {"6a77547bdee43ee67e3199354dd3de22f3b4a232", "nightly-1617"},
-    {"316a64961c3809e0feaa9fb362c49467a22c58ab", "nightly-1618"},
-    {"e97ecdc2b838b83fe018a76a73292a7c0ae6d1f0", "nightly-1619"},
-    {"df83449d2115922e0651697e70a79f8c818913fa", "nightly-1620"},
-    {"df9e230d63970a379c31d9be64d39a127ef3618c", "nightly-1621"},
-    {"017631e51b1977ac69e905613cbae0385fd9ede0", "nightly-1622"},
-    {"a576eb633fbe55619f8728dab15df143b451143a", "nightly-1623"},
-    {"a26b466ac819cd710b6cfcdcbdcb8905c83e7bff", "nightly-1624"},
-    {"ff9c3b0531dc84f7b32a852416b7e88f7dce2162", "nightly-1625"},
-    {"1032b60d9bb41f24dfa693896ad827f9c7df4d60", "nightly-1626"},
-    {"aced133a3d80de3b58bf3c9c8ef555ede79b6c1c", "nightly-1627"},
-    {"1c8461fdea1106c68729643525c365afc93f5621", "nightly-1628"},
-    {"1bb20571b1b21ad5c61b1cfce4cbd6244c24ad8a", "nightly-1629"},
-    {"2e0ce86c9ef82b92f98695e8ab49e5485e796513", "nightly-1630"},
-    {"0133ebe0bcbe867eb7f45f58b7826b583ec6fb2c", "nightly-1631"},
-    {"045efe8268a7429ada9054ce5dd7c31c4f247287", "nightly-1632"},
-    {"bf03fb83aef1b4eb13b11dd6523940d096b9fa49", "nightly-1633"},
-    {"80c9f9abbba054dfb59e252bf57a75924ace4488", "nightly-1634"},
-    {"de3d7cf49feaa3ac2b2e50cce2e819f3364e043c", "nightly-1635"},
-    {"23b67849d5de6cb6536c05c58878db5e9823b188", "nightly-1636"},
-    {"a89261d3975f48f035a91e14061fa2df18f7956d", "nightly-1637"},
-    {"7a8d5761647cd7d038881f07a15c37396aec54d8", "nightly-1638"},
-    {"6772e46153c4ec5dfbb1843c343adda2d4cdc55f", "nightly-1639"},
-    {"3115529be7e8a974254bce2a945486bdf904d4c0", "nightly-1640"},
-    {"02d6032afb1069b1ea908c3ec14cf1a715bd6867", "nightly-1641"},
-    {"1aaec7938fbe7b00652b3e9d9823c625c1e5e23d", "nightly-1642"},
-    {"4efeace8eeea982dd21a0d8b43dee8cf2958a509", "nightly-1643"},
-    {"2d972f91b28d03aa3939ed956a5d998bf0fda3cc", "nightly-1644"},
-    {"4f058c04e8f57148b55330e1bffdcefb6c79e360", "nightly-1645"},
-    {"3fa12d43f584b9b0d5ec473f151d3725d1310ad1", "nightly-1646"},
-    {"182ffa4243fd1f5dc0627df9f1755384ce8f7f48", "nightly-1647"},
-    {"21fb9d63f45c2bafcc02996097028c55024f35db", "nightly-1648"},
-    {"a13a23051140aa29e8e8c40999651020df84b2b1", "nightly-1649"},
-    {"7ae0fc73385730d53a645306396b50a30b47f418", "nightly-1650"},
-    {"2f5eec3576a961ec1a21368166cab676e9db3043", "nightly-1651"},
-    {"36780040a621170107f6a927280fde75f238b7ec", "nightly-1652"},
-    {"664f5da105f763d2a40680d64e537ead60d2b3a3", "nightly-1653"},
-    {"6f45b402e751ba7bcaed6ee5c7afbd79f7f4f875", "nightly-1654"},
-    {"4888a14c12f5923f9974423370b24b1e392ff973", "nightly-1655"},
-    {"c557b290afd3f93b2ff1653701b110022c2a28f7", "nightly-1656"},
-    {"702af87f0dedf9d369d9f91e13f9529b9c49721b", "nightly-1657"},
-    {"f0e3637c7a133021a33def8694d712605cc46e81", "nightly-1658"},
-    {"3f13e1cc2419fac837952c44d7be9db78b054a2f", "nightly-1659"},
-    {"94d1f695eed6c34d7687e89405cd42e9c72fa56a", "nightly-1660"},
-    {"94013c8e00ccf1bde9d02c2d86630e0df900c8e3", "nightly-1661"},
-    {"26e8b755f0709dc6bce5715837652aca134bda83", "nightly-1662"},
-    {"3c1211e9fef2c4447dbf6e21ad2a99828b53a82a", "nightly-1663"},
-    {"39e0644993739d01c91c4dfbc0eefff59e5243ac", "nightly-1664"},
-    {"987f910a86f3b43ccb5d77ceb4805102031e262c", "nightly-1665"},
-    {"ab6c605e59be18e952e5de90640f4d926fc4ae23", "nightly-1666"},
-    {"820c288236047f7d9df7bd484567a2f133bdc566", "nightly-1667"},
-    {"e6ef00b41ddd75326c4a1337aeebe14b8fa34bbb", "nightly-1668"},
-    {"5f1eb7146d6ad4d7cfefff43d36f96b35388c55e", "nightly-1669"},
-    {"6f2bbbcced474363d23e6e6ed7a1564cbaab7679", "nightly-1670"},
-    {"ce16653cc81a1298a34741a7af4808da988a190f", "nightly-1671"},
-    {"1265c37babe0cee93e68c5c866a8be600602c6da", "nightly-1672"},
-    {"f00c4a4cf53c665b8d30ba12f99923500a106c3a", "nightly-1673"},
-    {"9c76120a132a65301fac8e283096ab5b8863f6f0", "nightly-1674"},
-    {"755393da9045047bc96b0ffda66ecba3991dd2f5", "nightly-1675"},
-    {"c1d7ba4d60da30e0dffe763c0d654763c98895a3", "nightly-1676"},
-    {"50eb63458320ed5fc8e8268b3457d719e72df927", "nightly-1677"},
-    {"e33677b021836d8f28cea69ced807cfa208d4e17", "nightly-1678"},
-    {"7c6d7905a4958fa7856821b97ecf84d134184485", "nightly-1679"},
-    {"8df502a6883c231c1318f7cb3b29509bed12ddd0", "nightly-1680"},
-    {"2539215f1824828e19a70799a7a9c5b973d8646b", "nightly-1681"},
-    {"2461f67a98800547105a1c239b56878e51e2d33c", "nightly-1682"},
-    {"2461f67a98800547105a1c239b56878e51e2d33c", "nightly-1683"},
-    {"a1d6396a900473c35a7f34bf86c73713d26a3345", "nightly-1684"},
-    {"e2adb514942f5737225c07597db14cf3919b07b4", "nightly-1685"},
-    {"6b2e7b77cccf718e99152597aef1f77b87c1920e", "nightly-1686"},
-    {"2e3834f880d6c3ebeea24e2374e2beb2a471a2e6", "nightly-1687"},
-    {"e770fd6e95e55528ef24085dc3e4279c20e22f32", "nightly-1688"},
-    {"5776bdda827787a1f91ae76f4131683626df7658", "nightly-1689"},
-    {"2ddecf35d261e5765ccb1f1dc6646241684cc237", "nightly-1690"},
-    {"5c58620618810cdcccb05381fa7e11020e5cfd2a", "nightly-1691"},
-    {"e6c479f497612a0ae1c00ad9c85d5af715495d46", "nightly-1692"},
-    {"e6c479f497612a0ae1c00ad9c85d5af715495d46", "nightly-1693"},
-    {"e6c479f497612a0ae1c00ad9c85d5af715495d46", "nightly-1694"},
-    {"c2d36cde9fa175950d7eeb61320802ffed0cb32d", "nightly-1695"},
-    {"8e3c7674d82df8db66e9cdf6a5d8b0e678a7f720", "nightly-1696"},
-    {"b3cab3c4507dc1b28e2f15b2e0c9f473f6e1959f", "nightly-1697"},
-    {"b9d7181a63ddfd40e8f94e83177737872cf3a985", "nightly-1698"},
-    {"33e5d16c89d9bbc451f30a526821f69f8ff1f9da", "nightly-1699"},
-    {"71b8ddb8a9b83655dccdb2d1a4d4cf7127259bb7", "nightly-1700"},
-    {"78b8dfc808378214857de148ad00d06a19b51ca0", "nightly-1701"},
-    {"24086d05bbdc4c4ae7daaa076b2c8566da6bf09c", "nightly-1702"},
-    {"9ff97270cf128f5ce91449ab7d4ad7b62d201b40", "nightly-1703"},
-    {"86b775bd8f3e1ab5f3a6e6546ae888a6907a641e", "nightly-1704"},
-    {"edbd6dfe8aad7dd1b626aaf20037d8ede6127bb6", "nightly-1705"},
-    {"6e16081b6a606f6ba3dd946f9fff247b51433a16", "nightly-1706"},
-    {"a2f34ea82b5a31a7e842d0099921b85b8bce403f", "nightly-1707"},
-    {"e7671d93b296c1f17040d4dd423cb8b710d67677", "nightly-1708"},
-    {"7325f58763dea2de5838f21da860300b63ad220c", "nightly-1709"},
-    {"82aedb9900ee0b204550140a8935ca801a811cdd", "nightly-1710"},
-    {"842031a2eb0b4bac4a351db914530296812962d1", "nightly-1711"},
-    {"324e88d6e08ab8bc95671e6ba8011fc8812ac2c9", "nightly-1712"},
-    {"3d8555236fb18fa90c07b47897a790fbb174c34d", "nightly-1713"},
-    {"5241032fc58b322e0ede29966dd28490ef0c3cb8", "nightly-1714"},
-    {"afed4953bccfb9b39558cf196492c2558ca1f109", "nightly-1715"},
-    {"62236b725760bdbc9087894ad4496e9a7d942951", "nightly-1716"},
-    {"647a6f8d821d7cb0e0855fecb7fa3bfd5414c600", "nightly-1717"},
-    {"dd31ed60c009e2977f746a591ff063d6a921970b", "nightly-1718"},
-    {"dfd7926681ce073ee3625b15f85db4278a2a2b7d", "nightly-1719"},
-    {"c40871f126a5942b16b8b240d256b59e25b5e7ae", "nightly-1720"},
-    {"89410c164ad023d2dd24961b435733123e538d9d", "nightly-1721"},
-    {"a1b4daa9d4b97c0afc173c8cbb737387edd7a8d4", "nightly-1722"},
-    {"4817b008434e2122679568d1223af4c656f0d2fd", "nightly-1723"},
-    {"19617f7edbbc0d709508045770877a85d586ab9a", "nightly-1724"},
-    {"7bf0f10305a39a478a1fec8b3581a064a0ccbebc", "nightly-1725"},
-    {"d4e85e2bb5cd9678eb648c414e30adaad58e1fad", "nightly-1726"},
-    {"6183b5d76c30f62c09fc0940838f32458addfe28", "nightly-1727"},
-    {"90192124cc644248c5b192e08e96a6bbbe7e0eae", "nightly-1728"},
-    {"ec96ee4371a9b166b0cd9fcec1e44295981418b6", "nightly-1729"},
-    {"a5d01c0c1543be2a51aa9f9e8d9d06f67ff92c0d", "nightly-1730"},
-    {"219eaabbcf9fbad968a15bb3873eda721a0e9298", "nightly-1731"},
-    {"5a7d80172dd115ad9bc6e8e85cee6ed9511c48d0", "nightly-1732"},
-    {"8dfd9d344563d9f9c9120318350499f560383650", "nightly-1733"},
-    {"64b502aad36a22a98e7adf69a1293b524e571125", "nightly-1734"},
-    {"6dfb74a8b976063591caa5d4cda52c4df44f1dce", "nightly-1735"},
-    {"83913e68f360209f34d120b525b8592ac00c4b44", "nightly-1736"},
-    {"d6356f5e9f9a1ef73e83c28d742a6d6ae44770cd", "nightly-1737"},
-    {"60d1def6f8923cdc7ee64e087b15461f3723157f", "nightly-1738"},
-    {"60d1def6f8923cdc7ee64e087b15461f3723157f", "nightly-1739"},
-    {"2670b951e13eab51e47e45263cd3ac4e44fa1ff5", "nightly-1740"},
-    {"67f1e4111dc81c562228aa158b01beaff61d732e", "nightly-1741"},
-    {"67f1e4111dc81c562228aa158b01beaff61d732e", "nightly-1742"},
-    {"45a4a56264b3d26b4dd1a16b13feda4f9fd5fe37", "nightly-1743"},
-    {"45a4a56264b3d26b4dd1a16b13feda4f9fd5fe37", "nightly-1744"},
-    {"45a4a56264b3d26b4dd1a16b13feda4f9fd5fe37", "nightly-1745"},
-    {"45a4a56264b3d26b4dd1a16b13feda4f9fd5fe37", "nightly-1746"},
-    {"45a4a56264b3d26b4dd1a16b13feda4f9fd5fe37", "nightly-1747"},
-    {"4e15823db236feeee0f43a9c41434e8489146758", "nightly-1748"},
-    {"2fc7def6f67be153e3bb81116209f233e75d9ec2", "nightly-1749"},
-    {"2fc7def6f67be153e3bb81116209f233e75d9ec2", "nightly-1750"},
-    {"2fc7def6f67be153e3bb81116209f233e75d9ec2", "nightly-1751"},
-    {"bae1c31406874294cfcc819945d3d317105a2fdf", "nightly-1752"},
-    {"cdbd72e79c9f91fd8261fd3bc2fa25b883a17fbe", "nightly-1753"},
-    {"54a36bc54f066ca3f8b578e95bb80e8f176a68d6", "nightly-1754"},
-    {"db5edf549e3013a0d8862d56c52f6ed0ea522561", "nightly-1755"},
-    {"25ad002e6e7301b5c62bbde129a273e53027e9be", "nightly-1756"},
-    {"ac98458e0b234e13936a9c2a98a413408d0f08c9", "nightly-1757"},
-    {"b5ac9e494615444f5b7144e7c818bee52cacbaee", "nightly-1758"},
-    {"3df43f9505505fbe2abb543c795f791615541cd4", "nightly-1759"},
-    {"593b0b2d8fe8c7bde82f53e58520c12b2d567d48", "nightly-1760"},
-    {"4a9995ab9f7db6441804084e5d70fb3db8e33e8d", "nightly-1761"},
-    {"1382035d4de5ada310c7f4fd00f1836b16ab74fb", "nightly-1762"},
-    {"856b3d6c9567d3a37f90c7d0b7418b20e6bb2aba", "nightly-1763"},
-    {"44e1f2319facc30a5625c525811546ab2be5c76b", "nightly-1764"},
-    {"46c6e5c4c0d79b3343042fd22bea1c48b8283da6", "nightly-1765"},
-    {"a6e7a81de949883adf4f654ad773a80eb0931d00", "nightly-1766"},
-    {"6f6a9357c26eccf09bf0c993f159d69bbe472f49", "nightly-1767"},
-    {"b7c1c21019dc54f7ad647989e0e3d912584cf455", "nightly-1768"},
-    {"3bb027ac12ddedec42f4ada49b7e9dbfcf8d3933", "nightly-1769"},
-    {"88a475970240e1dbade1720b02f9e5338647b1b8", "nightly-1770"},
-    {"84d5d62cf59da7e001bad6b7298e45faac37fbeb", "nightly-1771"},
-    {"355933218d00603c910cd0a9daead0b1cd72a3c3", "nightly-1772"},
-    {"353aaaf665d70999f7ee524b3b84914944627a45", "nightly-1773"},
-    {"2d95b9946f207987cd4f3b4c3a1eb58b17c99767", "nightly-1774"},
-    {"357025dfdf2b08204b0a3ae38330dc5fe3f05103", "nightly-1775"},
-    {"6764264488488a97ddb60be07f59c0750cc173a7", "nightly-1776"},
-    {"bf6e4a41d79d3bbee96d90bab32ddb20e20968eb", "nightly-1777"},
-    {"a51b1cd3cd0122110a31d17d8b84d7d2c50b1f7e", "nightly-1778"},
-    {"58d0705f0f00db4edb09d178083b9fbca5d0b57e", "nightly-1779"},
-    {"ec7dc8803f195cc4d35545d588a8d57e929c93c0", "nightly-1780"},
-    {"141471e38fc2b0f6295f28c65f815968f3e9f564", "nightly-1781"},
-    {"d38098051d74d19b4b198fcaef7465cedb984fd4", "nightly-1782"},
-    {"746609f35fae6ba174848d2ffa42e52b140bcbd1", "nightly-1783"},
-    {"47c4f31c8db86b043a1802a65f1df08aeec8e772", "nightly-1784"},
-    {"baecc18d8c5365af0dddb231bc8c0a9c03850bf6", "nightly-1785"},
-    {"cbd5d1c15c6ec7b182110e0ab264c0de6c2b9730", "nightly-1786"},
-    {"e5da8897cdeb24b9830e8e252051d2731de91ec6", "nightly-1787"},
-    {"030ecaa83c825bf4c91915d629adca2dadb9aaac", "nightly-1788"},
-    {"7d18e36566c949de835c106375eb591a6e1683cd", "nightly-1789"},
-    {"c6153bb32ef15c0e7245fdf5bbf3af51104dfa35", "nightly-1790"},
-    {"bc6e45ab3b3847bd87f44aa0c8a203deb5ef005a", "nightly-1791"},
-    {"a427a804468942b8e86af6d5e5ab2eee34f1ab00", "nightly-1792"},
-    {"2c40b2aa7232df9ba201d6d616d3663d1fc31967", "nightly-1793"},
-    {"e24e2a8f8b62973cf446792b1dad0e61ae2da449", "nightly-1794"},
-    {"1759e2afc2b966e79d7cff5bc3ff848d43b74ae2", "nightly-1795"},
-    {"b05b5b3bd8b973846b62dfe51b84952da756232b", "nightly-1796"},
-    {"ea26f46b0dfc53b45c53887cef3394b2a7951a6d", "nightly-1797"},
-    {"67c4b87184fb4df7bb3d1e68794ecdc183cf692a", "nightly-1798"},
-    {"9626bdf3854b2a430dff9425e25cff73e009d508", "nightly-1799"},
-    {"a2daef29857e7f64a4f5dc7c196a5bbe8e11367b", "nightly-1800"},
-    {"4d684174e04119c57c77bd27aec9d9080cae5c2b", "nightly-1801"},
-    {"a93d7a8d3ab02e3ba72013cbf92d5cae84d555d3", "nightly-1802"},
-    {"1ddea27ac8fbc2240b961016ec0f6ff20a6ccd6a", "nightly-1803"},
-    {"78019072883b1f97140be2d67a8ac0566028976f", "nightly-1804"},
-    {"92ad651890f0f15ce81fb414ca0c8305ae2a411c", "nightly-1805"},
-    {"c7e259366d69c3818cbe56602e1e89a058515d6b", "nightly-1806"},
-    {"bb05d8c12a3498939b10b9bfe3a34fd0dcce0686", "nightly-1807"},
-    {"f6320c8de98fd4598c88e9827556859588d0313c", "nightly-1808"},
-    {"94d0399876cde32e1b56411e5a0ab3e590a40044", "nightly-1809"},
-    {"2967068b87bc2d0285140851dca1b7b1ddd225a3", "nightly-1810"},
-    {"4f715b6718f65ebd0141d74411940fe9d5f04afc", "nightly-1811"},
-    {"f44c95d6384e4bcda79efe0b3b2ddd8413bfb496", "nightly-1812"},
-    {"3b6ffd9c27f7c36ace2804fbd279455771918d1c", "nightly-1813"},
-    {"64062162c6b087f2cc043c2038b9bb604f26b492", "nightly-1814"},
-    {"d09f6d97f6c573bc9b33e547304828bdc10c641b", "nightly-1815"},
-    {"d1171328c9a6b6daceb6747a9359f697b3d3b650", "nightly-1816"},
-    {"0fc177e26809461afb13b273a6a7f3879bbcd83c", "nightly-1817"},
-    {"48ee112cebfebf74ecb0013bd2ac557d808fa48f", "nightly-1818"},
-    {"016ce6c286412cf1e5fc13f251ccd37779ade06a", "nightly-1819"},
-    {"84eada8c50afd26145e170b7341e2eb2833a1641", "nightly-1820"},
-    {"06a9f69d88253c916b1fc4e8b62ca50f9e04f032", "nightly-1821"},
-    {"ae3d50f71f6feee0e5a2c17fe1cb565c255b7b51", "nightly-1822"},
-    {"b588d6181bcae7b6886e3b3116c9475a59836c2d", "nightly-1823"},
-    {"f18437e59fc2e8bc8388e88b4848c871be24faf0", "nightly-1824"},
-    {"f5ed7c775d47379695bf96cefb210b881b09d66f", "nightly-1825"},
-    {"e60a816d896332e3a3f7e47efae144a9d5db860c", "nightly-1826"},
-    {"ad2cbe2b26f4424acba4f28cc4982d4d8ddcd9b5", "nightly-1827"},
-    {"9c6035f254642fd569370efc5ffafc79cca4fc7f", "nightly-1828"},
-    {"9b20bcea0fd6eaa753d53d63601db0c4d44f5fb9", "nightly-1829"},
-    {"84e54a52a6402928f0cda4bbce24d930546f9842", "nightly-1830"},
-    {"0f6478a928195cb9e2c157bc2c9e586aded302c7", "nightly-1831"},
-    {"bb8cb3ff820338f58dbedf9c8f0eb729cf900aa9", "nightly-1832"},
-    {"3a6a17c708bf694c08ec47141f5ddf9ea638b25a", "nightly-1833"},
-    {"9b49d9464444d59b090b2d6c6eda459bb207ee8a", "nightly-1834"},
-    {"f66d03dd48ac81ce0cc0f1d0616d2f07093a59a3", "nightly-1835"},
-    {"5eb72e948901012a4f6c2fe8a97b9d01cfa87fdd", "nightly-1836"},
-    {"a40cde7f765c61c15e7861b5a8fc0666c27ef4a5", "nightly-1837"},
-    {"849d795f0ea80587b521283807031146e3833305", "nightly-1838"},
-    {"1ab9b60a605dc27db5d754719b60d5b16ff698fa", "nightly-1839"},
-    {"ab8d1c7d8bd8de830098da2472ec7ad93877cfa8", "nightly-1840"},
-    {"5215468ff61cc7e1f1773db4068aa84303e2f298", "nightly-1841"},
-    {"5aa80873e2c24719ef0081d638179e4e52ed04b3", "nightly-1842"},
-    {"bb8dde848078280c627af16152885e25ad8674fc", "nightly-1843"},
-    {"cda358443fa632b5e27dbe6272882d33d68bb529", "nightly-1844"},
-    {"d8c9335ef0801927b7d3ab8e0d809ffa7dcf3189", "nightly-1845"},
-    {"286f750c6c6b70b48e3fb2fb579e5bfafbf51a69", "nightly-1846"},
-    {"8b116aaa04031d5815fc52773453aa0b4654ba8a", "nightly-1847"},
-    {"c961ecb9a45695352e35afe58647877fce0cda09", "nightly-1848"},
-    {"8f2a5374c326eb75491eb2ac28add6a71b5b9b69", "nightly-1849"},
-    {"455a0198d9961b148053fb5cc73be069f091c90b", "nightly-1850"},
-    {"07e02a1acf8f48c3379dfa17aaea46cef2c9136f", "nightly-1851"},
-    {"976995ba08e6441689c2ff9aa3db286a07c083b6", "nightly-1852"},
-    {"27be16ee315dfb6b28ecd2715075c0bafe4321f2", "nightly-1853"},
-    {"2cbf6fbb171086d6fd890bb0e6ea8e2fddaa3811", "nightly-1854"},
-    {"6fbc54b0c5178dfb6aa05278c80a43d08445ec5f", "nightly-1855"},
-    {"e18e30a8ccd3aaa4b2dcbd67d06bf986ea8636e8", "nightly-1856"},
-    {"27c280534d6ed9cc4c41bba01c5bdcc9bf024235", "nightly-1857"},
-    {"a2fd43deaba82a95010c767e2ca613d9470d621c", "nightly-1858"},
-    {"a2fd43deaba82a95010c767e2ca613d9470d621c", "nightly-1859"},
-    {"0c3fe272b6f9640134b4897b0ec1970bf2864b0d", "nightly-1860"},
-    {"8c12eb4905d09bc2c1eb0fdd61b05f7cb8d9f7a8", "nightly-1861"},
-    {"54385a54eb441ff7691644c98c887086178fd410", "nightly-1862"},
-    {"54385a54eb441ff7691644c98c887086178fd410", "nightly-1863"},
-    {"5317c00c45ad6b128a2649f3b1b399bd323a1ed4", "nightly-1864"},
-    {"d9d0fc63ec965b60d99895f31cd751a3a51466c4", "nightly-1865"},
-    {"9ef42040afc83789671580c02f428c96804f3215", "nightly-1866"},
-    {"b5d6f645bd67633f54b96aa0bd500ca750d17e1e", "nightly-1867"},
-    {"b5d6f645bd67633f54b96aa0bd500ca750d17e1e", "nightly-1868"},
-    {"5346ca27b521cd7fdcfcafad978137dde2d9586c", "nightly-1869"},
-    {"ffc95eb59b950a3e0404c928e8676a68899634c2", "nightly-1870"},
-    {"f96047f18229e257297593e68cbbdf29b72b1e9b", "nightly-1871"},
-    {"f96047f18229e257297593e68cbbdf29b72b1e9b", "nightly-1872"},
-    {"215a099c4fdbcfd82f7009b4c173dc3720e60ac0", "nightly-1873"},
-    {"041252ba368e476d924089096acacd6536842828", "nightly-1874"},
-    {"9cbefa468a7a8989b13cf8a943c2a171c995fedd", "nightly-1875"},
-    {"31cd8120b6956f7aa869eebf8002be10f9cb0e7f", "nightly-1876"},
-    {"495e5dadd76d56d5fd94003794c14617a9583390", "nightly-1877"},
-    {"8b93db0841bc35ec2f3057172385929c885acc05", "nightly-1878"},
-    {"563c77154ed2e41d3e916dfe4d62a68cdb47e80e", "nightly-1879"},
-    {"cdb157f58af55e3f9728bc3ea10e71e83a299e7a", "nightly-1880"},
-    {"2a2ee8bc968232058fe77a06e95d4f3fa1b851e7", "nightly-1881"},
-    {"5f81940e632103ecd3b7f9760dc0ba2b5f361e2b", "nightly-1882"},
-    {"89db2e323adb8e577fcdeef6e4a0ac40f03f187f", "nightly-1883"},
-    {"9414db4f65ac777dbfdf54421681a230f9c3bd43", "nightly-1884"},
-    {"c9b2bd9077aef1238ddde75e1ee781bf7ff13fbd", "nightly-1885"},
-    {"1b944f3255589bf886343289ebf9c48d343f7f97", "nightly-1886"},
-    {"9ba6a901936bb40e1b724dc3792c1bd2da80ec4c", "nightly-1887"},
-    {"2c74ed1a6d15fb1dd12ad4a5841811c841d1413c", "nightly-1888"},
-    {"d16dce6d991547e92bf1ac664e36a94eaeb9195a", "nightly-1889"},
-    {"06f3c90cfb7ffd5e535c779afaa122694fbbed8a", "nightly-1890"},
-    {"06f3c90cfb7ffd5e535c779afaa122694fbbed8a", "nightly-1891"},
-    {"06f3c90cfb7ffd5e535c779afaa122694fbbed8a", "nightly-1892"},
-    {"9bd8c9290bd4bc32bc1fd3dc1dea8674ebbc1d8c", "nightly-1893"},
-    {"ea649263b752f9b73f1627ef9784ced19fe245bb", "nightly-1894"},
-    {"9dc71e33478f4a9cfeac0b263ea6ddd8e8b7b1df", "nightly-1895"},
-    {"41f13456c0a2b341229e61a31f3bf3144404cfa4", "nightly-1896"},
-    {"34de77d4291dc078d7e3e15415d784966d423adf", "nightly-1897"},
-    {"70335a7f4d50c092fb04749ac8d45ebeff1814a3", "nightly-1898"},
-    {"2273df4d70e2745853e661dcf676373518fb04fb", "nightly-1899"},
-    {"b4db9aebf2b4ac53b6a24ce360bb23e0b8b0f0fa", "nightly-1900"},
-    {"f9ab0b3042a47fb535470c7d8792306c02526128", "nightly-1901"},
-    {"d8e74a9ff4ea88e1b8810b86ea1d20637cba29cc", "nightly-1902"},
-    {"7677ace5ea9a23138a2359fee43f560c38dd7b8e", "nightly-1903"},
-    {"dc39eac91677e793e248d60ae01d2735f601751e", "nightly-1904"},
-    {"0768bd8ce0d2f322c6e859f579beca89fdf2dcf6", "nightly-1905"},
-    {"a12058ea37ea6e545985e6a8784cc1c776b0bc21", "nightly-1906"},
-    {"a12058ea37ea6e545985e6a8784cc1c776b0bc21", "nightly-1907"},
-    {"110063aa56e53f039fbe142640b8a24f14a588fa", "nightly-1908"},
-    {"110063aa56e53f039fbe142640b8a24f14a588fa", "nightly-1909"},
-    {"fa8c530e1088d85b3edb5ee22ffeb2d5ee27a87a", "nightly-1910"},
-    {"2281bf5b0bd8cf5eb7bffb52145ce75cae3611e0", "nightly-1911"},
-    {"72b82ef6edc53259e8b358107160864621701983", "nightly-1912"},
-    {"848116b5be6be6c7d24ac099a579e19fc21f2c27", "nightly-1913"},
-    {"b45c7188c7d37062e9567aef94edf68813aa7a00", "nightly-1914"},
-    {"723b662604e8a4ba57d8c9d2f6865775726bbc23", "nightly-1915"},
-    {"c67c648c1a2de1be3e1ca0d9c7d6f9ee2521e9c6", "nightly-1916"},
-    {"c67c648c1a2de1be3e1ca0d9c7d6f9ee2521e9c6", "nightly-1917"},
-    {"52f88f8fb49154cf6389981c8d208de6019702ae", "nightly-1918"},
-    {"54c499ed5b840102f5d25321d7015d25e6bf0ba2", "nightly-1919"},
-    {"238a574645e428dcff17b74ea8e80ada77987aa2", "nightly-1920"},
-    {"38435e9b3e9b0502d6dbc2b8f2f665bb291c1da5", "nightly-1921"},
-    {"06db4ffb17466d11cfbd274b0cab664c9e31fdad", "nightly-1922"},
-    {"06db4ffb17466d11cfbd274b0cab664c9e31fdad", "nightly-1923"},
-    {"4c8a98a321f744d5935a9b864549b550942d1b83", "nightly-1924"},
-    {"7c11b9b6891c17e09bda4aed5b32bcb57535cdd7", "nightly-1925"},
-    {"7c11b9b6891c17e09bda4aed5b32bcb57535cdd7", "nightly-1926"},
-    {"70225e92f717523754ddaf7e641c7971cc36c5ee", "nightly-1927"},
-    {"89663e0db82a1a246e4b133d64589f3f401a17ab", "nightly-1928"},
-    {"89663e0db82a1a246e4b133d64589f3f401a17ab", "nightly-1929"},
-    {"9b82de6b24ea06496846a5fa211a23879b0ff644", "nightly-1930"},
-    {"7edc86a9bc817f8d88fe261aafa6d5c87340b267", "nightly-1931"},
-    {"2e479fcec5288e5243f6e6988d22065c0fd9bfaf", "nightly-1932"},
-    {"2d6aca45635ffcafd28cf6ccf26018edf85c4651", "nightly-1933"},
-    {"0d516f6da5258e6b19d7a062ef3b28848f745b40", "nightly-1934"},
-    {"d26dcc8e31bc713dafd1a4ff552ae626351f58f5", "nightly-1935"},
-    {"ca2d87e5e38f84a1f4336c995fa71fb0e235e667", "nightly-1936"},
-    {"3d0a3c2c45cb6322ca9ae3a4fa570918339770c0", "nightly-1937"},
-    {"2126c240cdf89d1d0035cd5ad4d4d1cf95697f8e", "nightly-1938"},
-    {"df9cc1b84cff00e3e44de4efa63e08644c8fa6a1", "nightly-1939"},
-    {"df9cc1b84cff00e3e44de4efa63e08644c8fa6a1", "nightly-1940"},
-    {"e5310b25d4977eac7a23b4acaa4ded853b4c9360", "nightly-1941"},
-    {"662bb9ba7787dd580b922c6a9962a10ccc6ab77d", "nightly-1942"},
-    {"b738584832615d759a5d5768c99ff1101b98ffc7", "nightly-1943"},
-    {"a94af8ea62abb481b356813be2a3dd7aabf69c7f", "nightly-1944"},
-    {"bbf833bceb23aa4185b11042357b04b1733b4418", "nightly-1945"},
-    {"0bedb28bdc5084a504aeb5a95da3221f8170c6ec", "nightly-1946"},
-    {"8b6b58a36481b910acf31e2576166bd2fbb2c059", "nightly-1947"},
-    {"700c00f021dbe7674a42971d7ca3c3916d3b6b41", "nightly-1948"},
-    {"e783b0d4a97a67eb3380c64f3fc6d65d41a51872", "nightly-1949"},
-    {"e783b0d4a97a67eb3380c64f3fc6d65d41a51872", "nightly-1950"},
-    {"71582a72a46a2f9dc63365559ff10871f45b498e", "nightly-1951"},
-    {"b5e1a27a7e779a05ffb1cdfbf144e203fc774691", "nightly-1952"},
-    {"a537f56766b4523cb2bedfc3324cd935217d6961", "nightly-1953"},
-    {"8b21b902f2fa6fd94dd1b6fe9155dd4fb3a068cb", "nightly-1954"},
-    {"539a1a0b6e0d9d9b7967101c0baa29984cad4468", "nightly-1955"},
-    {"51996c54f03c554b8126cd7242801879be292f7c", "nightly-1956"},
-    {"964f9ee3cf3f0196a4eadb94cf2f0405d6abb9f3", "nightly-1957"},
-    {"335fb78c5cfeedfe0e285a475b31ee8158e703da", "nightly-1958"},
-    {"3fedc68230bad234694fc8dd8270c019fdb100a0", "nightly-1959"},
-    {"88ea66053e23bfd984d0ecb50f46bcc9c3668f7c", "nightly-1960"},
-    {"ebac2e49786bcdb24cf876afb64c7573a165ed61", "nightly-1961"},
-    {"aaeba6759e6d57968ce0b12f6245f45836dec546", "nightly-1962"},
-    {"5b52849f901fbdfbdbb8a81728b3233307445d0c", "nightly-1963"},
-    {"6d0cd5b00e80bdea60d7e0e6caed81f7cd5fbd40", "nightly-1964"},
-    {"ac78b74c45569ab5460d5458b75a1c817dbaa9bb", "nightly-1965"},
-    {"33a2113b7108908605f6a5e946cdb83078c80f68", "nightly-1966"},
-    {"d4bac5d837b15062087feed654236800c68ecd5f", "canary-1655"},
-    {"d1b6fe70c3838584f9f5c0d1f6887b4613ebbef0", "canary-1656"},
-    {"7ad3b72632182f0041e5a75dbe69b37784be474f", "canary-1657"},
-    {"6417392a020365519dc2d61f8eb3612727137acb", "canary-1658"},
-    {"95aa356c73d8f799756257d6770c62ccf7051de7", "canary-1659"},
-    {"337433b53fddfbcfcfed314f259a76d5cb1b34b6", "canary-1660"},
-    {"a80076c01c692866fa85b95c04f68506a5ca82c9", "canary-1661"},
-    {"ea258dee21ed515bcea8a76738149f4ede17fdea", "canary-1662"},
-    {"dcb3c4f01b0c88159cdc94578f18cf378a3d2dca", "canary-1663"},
-    {"b5b949672d295feeb666cc48225a4a522bbff61e", "canary-1664"},
-    {"395374c0ed7e8acb5c7c28ac3dc218c5120f59bb", "canary-1665"},
-    {"4c00e4dca0f0251117ce03e254d2a735a4e4f63d", "canary-1666"},
-    {"db43a83f1608dbc772f73c3c9ca839b9ce1a0178", "canary-1667"},
-    {"fbcab9ff5d7383e498ef9e785f4b386c23dc1674", "canary-1668"},
-    {"ccbe5ea8ee14e5389be064a834b64edf4ff569cb", "canary-1669"},
-    {"5494d4fd553151402bee8f616251726758409bdd", "canary-1670"},
-    {"f5d7369d9dac9747487b3f90cab8b95796d678fa", "canary-1671"},
-    {"d63c5f8a493412fa91696d07ef3caf658dbdfc01", "canary-1672"},
-    {"7c26be6a09bffdcebe2bde5a6452ab1bdde61c7b", "canary-1673"},
-    {"dfd021fe9005e4ea37520fe142d5f5aaa467336b", "canary-1674"},
-    {"25ad5899a65724e597ff75cbffd7489e3760cdba", "canary-1675"},
-    {"df56dabdb7bbad548e1b3ed13f125464c7ec954b", "canary-1676"},
-    {"98ce9e5f05f60376de11245a6c9535b46a56e3d5", "canary-1677"},
-    {"769809c4fa59f174b92520ef9fa475e6055e4b8e", "canary-1678"},
-    {"28e251647b70774d80b8aaa2c6a778c855f20c05", "canary-1679"},
-    {"50cbbdccb87e2c2530f3e17d2c879ee4a1adf70d", "canary-1680"},
-    {"603e8745a6401b337b05ed20fb1c259268ffd38e", "canary-1681"},
-    {"e0acd5a60e4cb0167681e90ef03ec1f1951d025a", "canary-1682"},
-    {"86cfbf8daa5f129743e249f5dade7ffb8f316fa1", "canary-1683"},
-    {"a47b54dc9e3e193a081023a1bd49aae7e9c7d106", "canary-1684"},
-    {"f8ea290abf2f500cda78af9393d2e0d8e4e35779", "canary-1685"},
-    {"da20fed4b78ed36eb0135ee73d8c4df7d6b6ac2f", "canary-1686"},
-    {"ac0338d55d34ca036ee8a82c4f0e65e38da88b19", "canary-1687"},
-    {"a33eaef0ad6ebf869b5d0f024e22a38aed85d1d1", "canary-1688"},
-    {"afe573ab93e7fa91e1f0c9226f572c428345a4ba", "canary-1689"},
-    {"48690c71b53e996f8fb1095558140cf115c6106e", "canary-1690"},
-    {"89a2d7c0f04a901ba4883621d28e9b557c3eea55", "canary-1691"},
-    {"26e598f80e4577e4b42ca5be2146f50f1264b649", "canary-1692"},
-    {"bc7e243ea49a1be6353aa4ca9bb63388490a6c85", "canary-1693"},
-    {"33870e458a245fe11c453bebf118dc62b3aa313b", "canary-1694"},
-    {"874091b5e773600e0417f26e789c9726a1bd5974", "canary-1695"},
-    {"6c89cbdb5d75bf505dd7aeebce288ac01f48a927", "canary-1696"},
-    {"918e9e1aa979e71d05f4f10685770a3cfe30fa46", "canary-1697"},
-    {"3427820b6869d86e2cdb2cf23ba8ef754a17c771", "canary-1698"},
-    {"4a10f1785cf5e376c60087cf1dabe74379462f4f", "canary-1699"},
-    {"e7d8221e216a68d8c2b12f1700bbf9b88c8c8531", "canary-1700"},
-    {"d39c0469f83883d9782d771b6bb9e5294d14954c", "canary-1701"},
-    {"55b7c3f08ee44048256fc98f7f9477d1d5037cef", "canary-1702"},
-    {"00f53130b7bdce5ef414daaa65333da8ab67633c", "canary-1703"},
-    {"d6f4c63f5065832cae86822eee2c8513fc725d8d", "canary-1704"},
-    {"2ca80a5120408a466b70da397dc1c1c638304c36", "canary-1705"},
-    {"bfb6db55f97e69efb548d328d094b7422a8f2988", "canary-1706"},
-    {"8da0661c56ab1373756a313905d8e186e3c9f0f6", "canary-1707"},
-    {"4a2a2f67c50270848088f9510aa9d36e642b423a", "canary-1708"},
-    {"0b142cfe10cee28e6b9c4306c6f1d81a883fec1e", "canary-1709"},
-    {"6f500b13cbca57d7a92aff3f759b6714b2fff646", "canary-1710"},
-    {"c0b37ec9b522efa465dc7ed83d645d1cdd754653", "canary-1711"},
-    {"e8378e0c8b08ae111fff96e93108f2a9d38c16be", "canary-1712"},
-    {"e3cf770f224a9c5e9e400879c980cf110c8e470c", "canary-1713"},
-    {"2994a850331b02127a9e4b48008e3eb7cb027530", "canary-1714"},
-    {"e239a0a445df3a7de6d25a938485ed264c8cbcc8", "canary-1715"},
-    {"9fe240a0fd917779852fe6152d6d5972b782b1aa", "canary-1716"},
-    {"e6a180eb2ab01dc16b2a437a778ec1c61556a0c4", "canary-1717"},
-    {"20477b1124b794faaf30d915d88981e829295ada", "canary-1718"},
-    {"02856b012285c6c16ab87b5fba492051adf960e2", "canary-1719"},
-    {"feff6500f298dfb566239684ba87debf1c073a57", "canary-1720"},
-    {"f2150db83d6513694e1f883d302ebca5b18be898", "canary-1721"},
-    {"3023be433aa58714f636ed5e73d850565f93dcb2", "canary-1722"},
-    {"d8b73e7409f8118da83675c391ab91449d17171d", "canary-1723"},
-    {"a40953a2f2195726ff397088192008143bec043c", "canary-1724"},
-    {"2d436a01454d8e32a92def33d96c6619d9cceea5", "canary-1725"},
-    {"ce609a8b8811079738151b65c0925d2e97628f94", "canary-1726"},
-    {"c3bf506721e7d814d55c618141c674f5409028ce", "canary-1727"},
-    {"a310e63721c41beb9036d4fb860346a1ddc316ff", "canary-1728"},
-    {"2e2a4acb54e72247d20c4ea231fb4d3b293e6a11", "canary-1729"},
-    {"114a9a094f5f80d51397a773da1cab0084406ccb", "canary-1730"},
-    {"50aa5af1c38499b9b4ade34b11d61f9f12def81c", "canary-1731"},
-    {"10eee0730e3a57ef36d6e1e92d3b6689d8af0f84", "canary-1732"},
-    {"ea36ba153294462e5ed548a6ee8eecb3a670cb8d", "canary-1733"},
-    {"7aafad1d206a445626133343041dece1a2e2cb5d", "canary-1734"},
-    {"21bfc5d0cb2b29b78b0ea22f0486522923d71fa3", "canary-1735"},
-    {"a04a0adc58c62c5a33f2a9e86cfc80da758898f2", "canary-1736"},
-    {"a76ed4fc98d85bc4fafde7bb6f0a39159f89ce63", "canary-1737"},
-    {"f26630628b9aae40f25ef3d09c4fe8ecb9560ea6", "canary-1738"},
-    {"35ae86d53d02f68b1414c54355994c621fb9df25", "canary-1739"},
-    {"b0745a05acb9737d58d00ca088411cfb4b0af5a4", "canary-1740"},
-    {"2927215a15b1e26d537e1fedddcc95ddaf6eadff", "canary-1741"},
-    {"4b9816ea0405c269acb8443f3b41ce7367c8460e", "canary-1742"},
-    {"ec93fb8e48255617b352747aac913119381378af", "canary-1743"},
-    {"8e9fce90ea802a3f25d477ed45ac513a7e20632e", "canary-1744"},
-    {"5f118ec69703ff9e3c758584d4dbbe0161bd3d04", "canary-1745"},
-    {"12471d3c17a6b61dbe67907f331fe850eea211b8", "canary-1746"},
-    {"cae107e5ce0d588963c135871543b07b3f6bb64c", "canary-1747"},
-    {"3009ec486ea762ef519c143d215e719c607e0cd1", "canary-1748"},
-    {"b78d27fad6e2bc5c9a5e5cd62421196d441919e2", "canary-1749"},
-    {"fecdb7e9e933a644c80992b476ed0002a2b119b9", "canary-1750"},
-    {"a7e85228c70562e0782b213b1e9417884677011a", "canary-1751"},
-    {"786c033f3d0fce82677b5ca575800b798b4f67fc", "canary-1752"},
-    {"4117a8df36fc669f5e371b99211a8953ae916583", "canary-1753"},
-    {"0ef6ba8e60056ac0e28cc22c156c7aa0c3106fe8", "canary-1754"},
-    {"41dc0b7e9620de885c147bc063046fe15847d9dd", "canary-1755"},
-    {"e185ce826be8defd23e6ef08a0fe545dd313f6bf", "canary-1756"},
-    {"7f9bd7a8e3b70e3ee40334b07a4061c7d60421a3", "canary-1757"},
-    {"9b0a1d178fbae4ede686895a8b1ba995654f29a4", "canary-1758"},
-    {"7180c4a55276a2c9ac2665d5ae198d0a9c63f4fa", "canary-1759"},
-    {"a9574d49011b4cbc061c14fa90cbea4a7e407333", "canary-1760"},
-    {"20dfa5c9ad0650b417f8703dd8098fd52a79bd4f", "canary-1761"},
-    {"d0ca49baa9c75a925fd373cc95124fb11a8674a6", "canary-1762"},
-    {"777c13f6d9532ea6dea582f786a9a174df5368a5", "canary-1763"},
-    {"dd8e082c55c4db763946a2759745e0b703f1f286", "canary-1764"},
-    {"27630ea1557df1ee0d946b1b2ca498482cd63106", "canary-1765"},
-    {"5e5d6db8e5dfac9e65ac029c730d88f99d9b49d1", "canary-1766"},
-    {"4fa68e30abd28d20eec38983b3598ea5bd31634b", "canary-1767"},
-    {"c83a2f2e983b803355f0fe97eb28a5412c120ae8", "canary-1768"},
-    {"f40be3ac452809698c6a152e349ce6faab2ac982", "canary-1769"},
-    {"44db15625fd58a2b6498a361448734750de48e73", "canary-1770"},
-    {"4c04c75d2a3ce639bd5a1c357916bb40350a0a04", "canary-1771"},
-    {"65fae8c989378bbc708339d149720519c282907a", "canary-1772"},
-    {"d2993552027f9a8cffaa645873305a6f536e9991", "canary-1773"},
-    {"5442e61a6c3b46ad6e2acc515ad6724660a352bd", "canary-1774"},
-    {"f004b111c0eed5080080da54237bcc948b14093c", "canary-1775"},
-    {"30d15091c952322db553eb05d10a3cb707c549f1", "canary-1776"},
-    {"3d6669d9fd1c5edc766bcebab0c67a24e20f69f5", "canary-1777"},
-    {"900c6bdde2f5519e09c6b8fbfcbf76943e3f83d2", "canary-1778"},
-    {"a5348655ebb8fe00f3b1dfba46cc90c5d5c7a294", "canary-1779"},
-    {"e733d99c6d5ca4c833668da799edf68cacd3505a", "canary-1780"},
-    {"d0c61b606a305a895b9763b7eb53c5eac75fbd4b", "canary-1781"},
-    {"08b26ba1121ea24727fb27fc017ecfcb0e93312a", "canary-1782"},
-    {"d66aab1d24ac6e1d21e01989c008b0d90fc6768b", "canary-1783"},
-    {"6cff89369ac8560533049672f26238bdb0403699", "canary-1784"},
-    {"6758fab4f5b9bfd4b2c54888bc1635bbe00d5991", "canary-1785"},
-    {"6ebf5e00e5d0107f5997ef74ef22bf7650971d18", "canary-1786"},
-    {"408778ad499ea3909b1d2d332a377e461fb1d3d9", "canary-1787"},
-    {"894d7f5a819e8ea6075a743800a595efe6afb760", "canary-1788"},
-    {"1eaa5ae3ad10a93cb9b3e3aa8b74f563e21fb30f", "canary-1789"},
-    {"ba9ecd4c2f0ed534f25d717858185b3bbd20903b", "canary-1790"},
-    {"0e9198ee233753f75dda80dd5abe9423ed8337e9", "canary-1791"},
-    {"4093bd25ef44a31f9ca1198a626ac8664c0feff7", "canary-1792"},
-    {"3a96164b710b6db0d940a29ba5ffc1d5d7af0544", "canary-1793"},
-    {"7e9145c892575663012a5f06bfdbd8d75642b28a", "canary-1794"},
-    {"61f0e5221d5414b01b36233e6338ff069efb69ad", "canary-1795"},
-    {"ff61700097cce1789700d1cda3521f1a72c2428a", "canary-1796"},
-    {"697ea32d5a892da6b5d65a64b54002649f5fa59d", "canary-1797"},
-    {"fb15c4b8914ab7036c5fac8a5ecd4e6738b9a41c", "canary-1798"},
-    {"22d22815ca7bd1fea11a761cd03df68b9997e14b", "canary-1799"},
-    {"a7a04ec06629329ee73354692efac85006768cb3", "canary-1800"},
-    {"25a841d3e2b02d2daa6f881fc831dce35cfbbff9", "canary-1801"},
-    {"750c0a5d880deec799eaef78042a6141a40195d9", "canary-1802"},
-    {"1cfba094a94eedb8353709e2e6a90821f7f60d3e", "canary-1803"},
-    {"c8b2c89fe5b5bd3502baef3239fefba9a27a7408", "canary-1804"},
-    {"3ee981ec7119e7d83bd279fe18d703cb72f36162", "canary-1805"},
-    {"e9c481cc253960dec4452dde06034ed8e1b9cef7", "canary-1806"},
-    {"b1b24d827f75d1ff9f8fd637d4393fc21a81806e", "canary-1807"},
-    {"234300db243bbf01d95b20a1e6609a765efe2f32", "canary-1808"},
-    {"bb4e341f214bbd99c8d479a04d1951f0c58fed23", "canary-1809"},
-    {"d8b1c8cc4b6797d1f70f3c8da8f5dece5ed3112c", "canary-1810"},
-    {"7c650f6b3316e00536c23b585fcf37bb65e73964", "canary-1811"},
-    {"bbf3a64e534f42e6235bfd53a062f944423b3562", "canary-1812"},
-    {"71521bb195151222d74f5e2df4db012d61bd7f39", "canary-1813"},
-    {"d3e12d29c4305ef1b5e22f92ed2ca71d11c15e56", "canary-1814"},
-    {"5f153e2919481937162fba27b3edde281b5a79e2", "canary-1815"},
-    {"c13db937fc90243d171dff3ad8d71a3e8e43123c", "canary-1816"},
-    {"26679095ed6b36412f8de2da93d7192d90dbdf92", "canary-1817"},
-    {"bdf2d786fd2f56d7619ece94dc6914e801840663", "canary-1818"},
-    {"94758cf85dfc3c1aed9e9e569d0785977a6b7145", "canary-1819"},
-    {"506f1dc9ce3f75999213fb32ac6ff69d1c393749", "canary-1820"},
-    {"a7fa0b2cdf2e06d582fe5c7e34a68d1be5746996", "canary-1821"},
-    {"8858cc8c3eb6897b87da98f87fe932ec38ecffe0", "canary-1822"},
-    {"e78b73004d1bf8860673358ee2d43b191d046885", "canary-1823"},
-    {"44728606cb405b4e0728aa4c83db70678bfe112b", "canary-1824"},
-    {"e1eca222b484a96765bbc0e9a21eb58c8e4917ff", "canary-1825"},
-    {"9b81c6cc54d32ce275d0e1224d7f0a0d45c083c3", "canary-1826"},
-    {"92c4ca3533d86bb944aa2e7bdd33f4699d1e1d35", "canary-1827"},
-    {"07a65a5ee1c92210bb3b27b74d294faf4b4ceacd", "canary-1828"},
-    {"6c7a01c0a79330b57dbbd9c216448bdaa0f02e40", "canary-1829"},
-    {"55b529b6f817e3d17088e4b1df374f61bccf1f84", "canary-1830"},
-    {"d0ec7c09a471f93b402e0d288298b42bb9fb5973", "canary-1831"},
-    {"f3f2ea7b077c3472cb96d9ee6338b0e5b84e2b6c", "canary-1832"},
-    {"4a6ed6d8beb0cfdf059cfcc2028f37303cd6e2bc", "canary-1833"},
-    {"dad352fb3b7ab213bed3b24c35b70a6339f11268", "canary-1834"},
-    {"a65f1a093d5b80d1725b732741c04e77f97ce35d", "canary-1835"},
-    {"16973a813c839f72186d09b0c17deab6402484ea", "canary-1836"},
-    {"037d1abae5367a3a7de911fa8ec852d75fc601f3", "canary-1837"},
-    {"317cf7aef19a1abe8e8c43b1cbf2abcdef1e9953", "canary-1838"},
-    {"7c77583ddfa5cb553355a1cb1fa460bfbaea8789", "canary-1839"},
-    {"f629b8cd72a246edbcba8fa7f047a03037c0f9ca", "canary-1840"},
-    {"f55ab9374bc83fdd678f10e34426e11b0198eec5", "canary-1841"},
-    {"745532a6172fa2b08dbf699e707322f361a027ee", "canary-1842"},
-    {"67126e301b2cbf3e88b8fe988022cfb5646a37f5", "canary-1843"},
-    {"70374c8ebaf6f7fa820dcdb85e7a592332c659fb", "canary-1844"},
-    {"964cb0671c4e41e84cd1dcf0ab5affc73b3cb179", "canary-1845"},
-    {"058afda8b0c6bfbb1f251cff8b3f88ec6e843328", "canary-1846"},
-    {"2f53020cd9f79de8ada0cc7d424cab1168a62a6b", "canary-1847"},
-    {"c99734738452f18a1c9e800968e092d74a102fea", "canary-1848"},
-    {"af5b0283abb85e51c91e938855ecfc4c33c6fbf6", "canary-1849"},
-    {"063cae9dd4c5e51eaeb4a979c075bd51861adb34", "canary-1850"},
-    {"e44a132f6c8ef6ce5a1bb52d72c60bcecfab8b77", "canary-1851"},
-    {"af546de70d88fa0612b4eb847aa4aaa7a5d023a8", "canary-1852"},
-    {"cce7bdb24d9d495c6e62f5f1cd31962d81673544", "canary-1853"},
-    {"367907780ee73ded585eeaa3c916cc5a2c00f323", "canary-1854"},
-    {"79b5bcc01ea4c14486849995fb15f017b6929275", "canary-1855"},
-    {"ee9df1448b9ca2c8082c31e8166de4e921b594d0", "canary-1856"},
-    {"f9e7514b3577af873234395e1551993132a58009", "canary-1857"},
-    {"a34b8e81d94497a3b55bbcd1bcb2a33fc7fd773d", "canary-1858"},
-    {"10aa692432fbf6b8dfc67e7b0b058dc10c4866f8", "canary-1859"},
-    {"3a37d6cc81513acbcd89ff1437a1d3c23bb07c2d", "canary-1860"},
-    {"9c0666d42d642ae681bb68f2928efa5e077b0ce9", "canary-1861"},
-    {"64fcc113e7a9738d7a20c77173bd98b88b104aac", "canary-1862"},
-    {"55f5cbb0f8cb821060ee4e1ed252717f794a69c9", "canary-1863"},
-    {"69ad9ddbc56bc4a6e3c2c52fb5d063b70309e812", "canary-1864"},
-    {"6cc34687b1f02d9c528cd4ad5b56f975637b21e4", "canary-1865"},
-    {"d35532496681addfbf0a046f54beb33f845e9cf3", "canary-1866"},
-    {"ec4251d9fa66bae1f43c29f974c73d55b2d3ed76", "canary-1867"},
-    {"288baa78526187cc9a8482cb12b1b912b8b561d8", "canary-1868"},
-    {"f63770cbc9698f5c09713676743774ec80722687", "canary-1869"},
-    {"385ab4a043a11b22a776d263081ac12fc38a24ec", "canary-1870"},
-    {"6701a95ff4b4c6f695ea383606723b82585221f3", "canary-1871"},
-    {"f24ddd7963c053cfac6e2aa20953dc396ce95475", "canary-1872"},
-    {"16f16affe8cefbee71bee5687f2741b584e5fda6", "canary-1873"},
-    {"99c95859156f2f2b9b0e9d47ddb72e944c6d2ff5", "canary-1874"},
-    {"dba62cdba3b87d4990c1819fa9eaf2fd09266f4b", "canary-1875"},
-    {"be309e3f992231046ca1b6c9a5432508d9c63b68", "canary-1876"},
-    {"15ba28aaecbb7b8791754bdaf32f76de49d449bf", "canary-1877"},
-    {"b95aa95df5ef33e38bb8931c278af1aadc2a9afc", "canary-1878"},
-    {"eca2c7286fabedbafaaabc8cb81f8b1a942c686d", "canary-1879"},
-    {"cffc3a8b3dc3ce5f78a56ec54cf599f19d7e574b", "canary-1880"},
-    {"019fded9f0f4734239afa6f0428d103dc7426867", "canary-1881"},
-    {"3d5527c8813450fac0b8bae967ab08586bcf05cd", "canary-1882"},
-    {"570304092f34b014cdc640e42e136fa5ccce9ce9", "canary-1883"},
-    {"30dcf3ba09a7eaa12ad0bc232a1fb5bff66af9c4", "canary-1884"},
-    {"95ec695301d81b76aa716f1932de7c855c0a056f", "canary-1885"},
-    {"6f8ea3cef0da61c5ca7292905f352da40d53d3d8", "canary-1886"},
-    {"4df6a3f706c6403ce98356647c7e9c3197dd6163", "canary-1887"},
-    {"ddc274d593c71ee14bdffbee13b9c6b0b032a2e9", "canary-1888"},
-    {"3b76c8a8312a7e10755bbe544863dfcb664c42b6", "canary-1889"},
-    {"d439c8ec9c9841286317447e1597b12f5dff6dc0", "canary-1890"},
-    {"020505a1c069d05df5166b18f1d47b5e9c4c3dbc", "canary-1891"},
-    {"7c3bf1703946208ebd08105e3d6177e369aef331", "canary-1892"},
-    {"519fdba8f7e9a409fa42083db9f8c953e0295247", "canary-1893"},
-    {"711aab0b97efc7e6db24ea18866b7a3dc7ff8937", "canary-1894"},
-    {"fe69cc656ad640735a4b5e96be50d2319f38e3fc", "canary-1895"},
-    {"5bcd21b36c3931245bb11f7f11fa66fbe415cabc", "canary-1896"},
-    {"ec5978773356a175b045a76b4acaa0a908b7b45a", "canary-1897"},
-    {"97a028178f8cbff53276eb674b05b818b346a56f", "canary-1898"},
-    {"aad9aefaf5cd5f745bbaa6a82fc72ec4a21c1081", "canary-1899"},
-    {"7c8884ca2fd552342d047a0bc77236231c239062", "canary-1900"},
-    {"91935ce74394d34e0ff36a02694f6b490dfab48c", "canary-1901"},
-    {"e97e9e4f509f72f72be133b1eb42f4488a34965f", "canary-1902"},
-    {"6385727a3afd3f16aabb3306b5d8d44acd28c918", "canary-1903"},
-    {"b9ce98c36fc209fc7f1e79926a1f97c1e6e84332", "canary-1904"},
-    {"9043f8dd556c58e8dcedc166c497c695b46ba510", "canary-1905"},
-    {"607907ce55dc7d3ac7c2a47028286f435e890c4f", "canary-1906"},
-    {"e489b84e88a424822d75254200fb0409e37c626a", "canary-1907"},
-    {"f6cc24e0647f38e4dfaa820b6ef35f748d14ffbe", "canary-1908"},
-    {"de929d2f7d7a587e951f99c274c39b9d6d66307a", "canary-1909"},
-    {"a258d9c6feacc1c17bebf2ec14d9f83f9c38b32a", "canary-1910"},
-    {"8a763cdb888c036f065b464aba00bf6f00adc998", "canary-1911"},
-    {"0048cade152bf7e5d7a0403409335c2f2c15e316", "canary-1912"},
-    {"5ab7a22ab5672bffef236f7791bf4c33dbee6291", "canary-1913"},
-    {"58b0f996eed8fac307896c1f5353cf5e6dc6d9a8", "canary-1914"},
-    {"3813c23074582d9c7352ea3453eeb2231774c283", "canary-1915"},
-    {"e3df6f3ca3438e26cecc385183999e7434c2a2c6", "canary-1916"},
-    {"778b2679f1f740cb83c03c161373b08862f2f207", "canary-1917"},
-    {"7c5bbf3121f54058d2a6e4b9217ac94e2517460d", "canary-1918"},
-    {"7328bd95b464cb95b2af5faaf04fae0b1f434a79", "canary-1919"},
-    {"327e813c6737354bef560b8960657b2f818fcec8", "canary-1920"},
-    {"b1b83ae3a972e52f967bc9f655da12fe4d50d99c", "canary-1921"},
-    {"adb0c6723e87dab48261aeb63ed20e309a51d47d", "canary-1922"},
-    {"b64a0fb5e5aac67f9798af74b3c881431118afa3", "canary-1923"},
-    {"eed14ff2966ede81bac066460a2ca68644ce9dff", "canary-1924"},
-    {"4e7630d1719f9feb3279b1200db73ef0213248db", "canary-1925"},
-    {"9b29fa3d51b79bf1d4e2f8ddf298d2e9884d4853", "canary-1926"},
-    {"0fff4f891f1f417692cec4e8fae8eba56684d778", "canary-1927"},
-    {"625639a53da4226f07fb4c57a32e7d807fc0968f", "canary-1928"},
-    {"dd2d5c32a4ca4205082a193b1ea1a0960ec01147", "canary-1929"},
-    {"6ace34c92b3bd64a3c46a1e701919c148b53e30b", "canary-1930"},
-    {"fbebbdd295cdccfb229deb25cb793fad90f71c2b", "canary-1931"},
-    {"ad7212ecc25ff94cd12567f61593768cbe53ffe0", "canary-1932"},
-    {"ff22387f58baad9cdac6ca991d7c188f510aa29a", "canary-1933"},
-    {"2ea07124aef3d927ba1e2ac5c758a070ec1a975b", "canary-1934"},
-    {"ee699b24ea71a19960aa9fd724f1cb756d4ce1a8", "canary-1935"},
-    {"fbf379a3408a3ef731b1d31067cf010e525cbc7b", "canary-1936"},
-    {"8c887f09e8fb80ab0ce03bfd07f34fcf80d71e01", "canary-1937"},
-    {"1d5dbf1a3c2be3ecbf737be9d9ff2cf4bcc33491", "canary-1938"},
-    {"8bb1c4960bab8cf13ae0fe13ab86201fbacd24d2", "canary-1939"},
-    {"50f093f30f10d0d199c99431e097b9d637de82b6", "canary-1940"},
-    {"2ae47cc3f74c2dc0187f974020e87c41f6ad16d0", "canary-1941"},
-    {"e172afb23d87dff773fe386d9175c39e9000109b", "canary-1942"},
-    {"e2402bcc375ae17aa495e5dd342c0e8a1f3dde1e", "canary-1943"},
-    {"82db62a3f8fdc27fabe0f75f906e88fedab6ab5b", "canary-1944"},
-    {"3934131240ecf9924c84b741fdf76dd9bc5040cf", "canary-1945"},
-    {"74ba307cb54c91172c9fefd37844ff24bd1f0382", "canary-1946"},
-    {"c2cfab82b55aa340958bc06c33f3ed3fe45a8b62", "canary-1947"},
-    {"6bbd080f2693e9a028712eaaad78c3a43554a025", "canary-1948"},
-    {"54dca2754a0a6076fd685eca278653a1714d132f", "canary-1949"},
-    {"b2b4fedf93b493747dd6b8647bbb41353142d94c", "canary-1950"},
-    {"3354b2738bb316d1306a600bf1c2e8219bbd6b67", "canary-1951"},
-    {"1d1f601c4a6d9c65fc9959b760c08167dad20ebe", "canary-1952"},
-    {"09100ece382760fd39be6668fa73e181f5b64880", "canary-1953"},
-    {"90ce055b029d06a41bf5bf91763d1f74ac208e06", "canary-1954"},
-    {"88ac3d3a4697150b04db5016efc581e5c332b112", "canary-1955"},
-    {"7a60d461c23b5e8273585ef1baba7c1c25ec8d72", "canary-1956"},
-    {"efdcb840cd65b62cbff33daf378381d1042c7a9c", "canary-1957"},
-    {"bff20a0b4af389429ca73205c46d7728552101ee", "canary-1958"},
-    {"651c9d0d69749bdb33e4a271dbb154c2c065b18f", "canary-1959"},
-    {"bc3718a9c90aefa81e27ad98e2b5cfc4a95796c2", "canary-1960"},
-    {"64ac2c94a07ce444fbf66e61dabc44919f74c176", "canary-1961"},
-    {"5e2c6e1a5d9b7d501e72627a025776d2d3f0e615", "canary-1962"},
-    {"c9d6de5568bafea422dcac7c0aa6de2a13f6d730", "canary-1963"},
-    {"c9104c8ed9ce2007b7ab2804f790b2d9f773e36e", "canary-1964"},
-    {"85a2b701ef72df2d70bc817eccf64230c680090d", "canary-1965"},
-    {"966f680d9ad9d6d3e596da386e5196d25025031c", "canary-1966"},
-    {"ecdf2ed8f05e06e9e4dc7bb01a6129e16fb88515", "canary-1967"},
-    {"e25fc4db6577dc7ade64f85e5938d0cd9bea8f5e", "canary-1968"},
-    {"311b2d53307bcfae1b4786e8854d5868c8a92d0a", "canary-1969"},
-    {"7ee5bf952faaf95f10e01033b734724b6c89807d", "canary-1970"},
-    {"523b29e5e1b3287d227cddbdf5bb31b16199aba0", "canary-1971"},
-    {"173deaccf415ec7c55476dd338c0786e3a42ad7f", "canary-1972"},
-    {"6e7fae86648f69dade661632726a696c36a1cabd", "canary-1973"},
-    {"4bf7e28070609d9b7a8d26b118659a51fdb7df08", "canary-1974"},
-    {"cd67f6338f8c750236d3bb0458594c6559f58bc6", "canary-1975"},
-    {"39265312b4ad9f2f311e47dbda8970b0b2b3e3c5", "canary-1976"},
-    {"6c8837ba3dda8bb1af2f01be2ca9b55838d44826", "canary-1977"},
-    {"4ca36e5c2dedd024a3e329ba02c1d0c380f02e01", "canary-1978"},
-    {"3a9b3691af1f44d509221172af1c886cddde8db0", "canary-1979"},
-    {"ffe9bf47349142cd5dd9fe2780158488fc07db08", "canary-1980"},
-    {"0cfc5f6460035388ec1b37ec504c7bcc5bd09b86", "canary-1981"},
-    {"40f8fcf59d17cb1cab052ad689622b186824c013", "canary-1982"},
-    {"23796db11a3d2ee1b6b86dc47a3c43f9cd88beb6", "canary-1983"},
-    {"1bc889a67b3db0645c375eb7bffe37e0ae75bba1", "canary-1984"},
-    {"f6ddea22fca8372c0049af256290d334a3d50b04", "canary-1985"},
-    {"f083b3a16c7d7f55a94216c5a60e5d52db5c58ae", "canary-1986"},
-    {"250e15fcfbd4d66d6362492f413767e199cc567d", "canary-1987"},
-    {"085788ea5b1311d5df1ed153b93779d446dda2d6", "canary-1988"},
-    {"fe7e1633461f65cb1fab44826d58403070425ce7", "canary-1989"},
-    {"2eb3e59f855241aa410d28227dbe68bd8bf45e30", "canary-1990"},
-    {"1e4cf0dbfeb65756abe9c2fc9b1c8f331df78c87", "canary-1991"},
-    {"9a40f51551f6774a0ec868b0b0bdf9e51a4aa2fc", "canary-1992"},
-    {"11d556a749d2dbb5a58013e45ead493872885ea2", "canary-1993"},
-    {"0827616ef431432c7e0c57feb263766209856fc4", "canary-1994"},
-    {"5daaab6025d69970d77cd0b30d6ee04c55ca38a1", "canary-1995"},
-    {"02f0cf89a1ac033fe899fadb6a880427f6b63270", "canary-1996"},
-    {"ff250859bc2072ac6af8574ed555a9638abbee53", "canary-1997"},
-    {"569b5fa268e54492e6d128ed6fe6c2cb9630be38", "canary-1998"},
-    {"a0434e363806fe94d2a25d49970b26004d971dd1", "canary-1999"},
-    {"c0aa6b4ab30fce3aa79c68d375088eefe2a0b003", "canary-2000"},
-    {"5a0c4bf8ea639282c4da31dd4df6a0851ba93163", "canary-2001"},
-    {"ed640fe14016cb17ef477a5aed54170430c865b6", "canary-2002"},
-    {"c2ae29257751f6d96e6e8e37dadc4ac76e110886", "canary-2003"},
-    {"4ed0d398147c845e509a95336f03a3ed063fed78", "canary-2004"},
-    {"356dc310137e5de8f19752ed52747c2b6a005425", "canary-2005"},
-    {"be99088228cacdbb29e1dbae03103f40978fe139", "canary-2006"},
-    {"ecbb434d63db92fba837eec1709ac54bee371ea8", "canary-2007"},
-    {"1cabff2e3eb25326a48e5ecec8db5ee378fe3fe2", "canary-2008"},
-    {"19274fa9419eb490174f89ce602ce14a4948d745", "canary-2009"},
-    {"94a04ff6f1144b3d1d4b13540b35fafadc7f202a", "canary-2010"},
-    {"ee20a4a4e074d5267e18283b40df1210ae7304ca", "canary-2011"},
-    {"48c3b2b0bb824b7256b4fd12151c97c3ee306920", "canary-2012"},
-    {"089b5388364f9439eb44fb079fa46ea3af8d4bdc", "canary-2013"},
-    {"fede559f374055baeded955de12590d7a3e42ef0", "canary-2014"},
-    {"7b05612011ea08e363ab3b0e50c3d9e2b2ed2166", "canary-2015"},
-    {"c14f7dbf7358cea668e2f9c7acb65297b9e73926", "canary-2016"},
-    {"b3e8e0ad7c029d81e7f2dd6268f262d0669ac61f", "canary-2017"},
-    {"6989669937a5f46560456ffc7c92c1a6a44db663", "canary-2018"},
-    {"b2596771c0047b594e59ac8532b004ba05a838b9", "canary-2019"},
-    {"9ee270ff0ba9dfc934d218ae8da32dc6c98598f8", "canary-2020"},
-    {"0a585c14673ea19c10b45952db504ca7c48456dc", "canary-2021"},
-    {"f5979074d530a5f203585716bc564762f1a289e0", "canary-2022"},
-    {"1709cec298e05138f664badeffd02185fc773770", "canary-2023"},
-    {"2c912da7e5587e406c25f92fe5def8ff4c51c2f0", "canary-2024"},
-    {"047544f1297b47e1d2964655afde5b8528c6b45a", "canary-2025"},
-    {"53cc251ac60a25b3ea374eb969ce7cabf7db7060", "canary-2026"},
-    {"45afd1494885f6113b5c2e93fa12208851003f40", "canary-2027"},
-    {"3043e4373219da9a7901f5df438ea9d14da73125", "canary-2028"},
-    {"ef118fbf27ac4dfd5fcd357325698ac78918c16c", "canary-2029"},
-    {"72e38f2453e6d7dbc6e061344247809abb9db8c2", "canary-2030"},
-    {"d1107edac7037fed58baeb5bb7d1bc74f90c3085", "canary-2031"},
-    {"259587795363684e51235be8252c5f1f6cf3c8bc", "canary-2032"},
-    {"cffb2a74c1dae07c965ae86c9dcc01530c72feca", "canary-2033"},
-    {"64c9fde24fb117ae87ddaa348bbf9ba272240afe", "canary-2034"},
-    {"5fb77b2f493a4f2ee6b7112f2423778e4d10147e", "canary-2035"},
-    {"c5220092bbd16ab162bf19da32acad71b5cc1537", "canary-2036"},
-    {"0a10560f6525b39ee0e27e39f56495341124d531", "canary-2037"},
-    {"288968b7040836717d8f8a7158180984d19bfdce", "canary-2038"},
-    {"d0bc9988e9de499f981da66565f6b0b897d8e322", "canary-2039"},
-    {"09a8d9f462e4dadd12eb5088dc10c56c62e148ac", "canary-2040"},
-    {"bcf9ca41bcc3dbd020add947bcb9cd17681561d7", "canary-2041"},
-    {"018ac98cb8adbb5895e7a9f24aec1f18738cef74", "canary-2042"},
-    {"b292d2965a0ca561b7268f55bc855f5937d47777", "canary-2043"},
-    {"e40e5a10536c3ca8de9604423acb75a1672837dd", "canary-2044"},
-    {"86a7cef21cca10255b3755d80ea554943a9830b7", "canary-2045"},
-    {"a773f3899a98c3b7fe1151c254d3c8aebc5459a3", "canary-2046"},
-    {"bd941b991e0a4a1d2f09468da721ba8a957d9f77", "canary-2047"},
-    {"286c6fbaa94492a300d8ca2bda032e0e136e3bc5", "canary-2048"},
-    {"26e3be682fa2807aab7389ce8f472214b029104b", "canary-2049"},
-    {"05d2c273ed660721fb2fe4b6af2f4994e1399a4c", "canary-2050"},
-    {"8ed72b8596d8a8b1fcd5e9ffaf675039699624d9", "canary-2051"},
-    {"c57ccfd01a7983f2ea413820ab07a3672516a3fb", "canary-2052"},
-    {"55a72789fdd2b644439f89bb0ea418326a897cf3", "canary-2053"},
-    {"364a24336ce9fc7abea421e98c996f23553fe407", "canary-2054"},
-    {"b208941acf1652a69e0f7058726e83d7e481547f", "canary-2055"},
-    {"f2456a79ef85be22a7fbfceb05d172efbae1c8aa", "canary-2056"},
-    {"4f324051f1b45f975ec35dec4c7c6d43f7f97c0e", "canary-2057"},
-    {"b856c987585e922410a206a6bc7d8cde7c1a72f7", "canary-2058"},
-    {"c48376533e05baa839f72200334ac0618d13788b", "canary-2059"},
-    {"ae6c86e534ee5ae30a6dce9028c2d5f2674d25b1", "canary-2060"},
-    {"891c89136918c0c22f1989e20d7e5e4c7258b423", "canary-2061"},
-    {"fa4f761383e9b01fbbba9964a8cd6830f9d577fd", "canary-2062"},
-    {"250f7061c28b7922592d75222e4f90aaf181312f", "canary-2063"},
-    {"892913efab41bf7c20508974485e2c893032d530", "canary-2064"},
-    {"10fd1c5cbe04187a9afb1c1c1ce499fc0177657c", "canary-2065"},
-    {"a6187481e9c85f60f981d5237a2e59faa7f18877", "canary-2066"},
-    {"ce95013f8e7e0bc470f9aac54344ba62aeda7adb", "canary-2067"},
-    {"1f96a31b70d5334845d7e07529ced9731e494c2c", "canary-2068"},
-    {"d3ccf18362dcc86f728fd7887a1573c799df9adb", "canary-2069"},
-    {"6f73b314dcfc28b8d3659f6b172d9df601fc8682", "canary-2070"},
-    {"e38e3e0a877a40669baea291fadc47bff413dd96", "canary-2071"},
-    {"8aa6f206f0a018d98e7387900045f72ea81babcf", "canary-2072"},
-    {"5744a83c5247b56f40aa4ea37e16530322d49d2e", "canary-2073"},
-    {"5484be2ed8c5ec937a2969d519695fc3253e6979", "canary-2074"},
-    {"b8504cbf36d4d1035883e4ca7247695eb9d7b86d", "canary-2075"},
-    {"6de1df1bf493e0fcb933e720b53b867eb932d00a", "canary-2076"},
-    {"b3dde3c37895c029c0735d52519852e73ceaf3bd", "canary-2077"},
-    {"68e99d8f4f1d2a2d1704026b9ebd17333743f22f", "canary-2078"},
-    {"5e224adf8dc2fbdee82f02a2e8b8ac34f0036a84", "canary-2079"},
-    {"06e916d4e1b9867e2d70684739fb2a88fb997bd5", "canary-2080"},
-    {"aa0c2da77983f611fb9f426b994ac1a0b4251b90", "canary-2081"},
-    {"4bab204f9cce7ccd4e73461524df5e6418dfef57", "canary-2082"},
-    {"e211c662571eadf9ba98efcfb5266188711de5e3", "canary-2083"},
-    {"be34f1fec6855899ae7f4c756ab0df201a95137f", "canary-2084"},
-    {"ba0bc9e58252d9df51576b09af91f9e3e7c9e35b", "canary-2085"},
-    {"bcaa6084e61a48005ffdb014bc76b6586cd5567c", "canary-2086"},
-    {"95a101f86cc96bd47fe1c6489de28d2178678ab9", "canary-2087"},
-    {"66156194c4762104a3f3d06b028e93242e36d9ac", "canary-2088"},
-    {"960dddb23f68e2ccd6c96a71b6e90432139bf30d", "canary-2089"},
-    {"403ea18f8ca2b9cac29702c9787d988c9848a934", "canary-2090"},
-    {"307675fa4405cd8c885c29114454ecffb8ae60a1", "canary-2091"},
-    {"4d8bc2c2c7cb94eef0c6ba129876097706005090", "canary-2092"},
-    {"0ab4fda53fe47e731564814e071b22b9f06d6503", "canary-2093"},
-    {"7135378321cc4d62f1d4d2fc35ce5db9046302aa", "canary-2094"},
-    {"82df460203f0b430884cef45fe17e6532bd152c5", "canary-2095"},
-    {"d9e64330cb1852446d6d739d9b6d712cdd696876", "canary-2096"},
-    {"17a444c98c55d125957095c70f4aab1a8b1322b8", "canary-2097"},
-    {"d4b55cbb36cf10b05ed626bd0bb789c891919404", "canary-2098"},
-    {"dd41795f116031e85cb5b15bdd46843396638e31", "canary-2099"},
-    {"7c806996ce6c62c35790ae3d9dc7777746f28521", "canary-2100"},
-    {"4b1cd0979a4b896fedb5093e97ed369643334b05", "canary-2101"},
-    {"83f7f6317a58477825f58440ae62abd303f059fd", "canary-2102"},
-    {"ee0e618273cfce9e170c47713b73fca2129b313c", "canary-2103"},
-    {"f616fb335329bd0d5b675a8f434038a3bb2f8044", "canary-2104"},
-    {"d99acc204737fff6d570bf702c6b4d5965fdc654", "canary-2105"},
-    {"b571b99a54ed3b92fc1cdae13efc0be70eb06542", "canary-2106"},
-    {"93f25598bedbbd1faad7914986843fe3fde0416a", "canary-2107"},
-    {"2732efcba37aab2c7c0b90f8a8ff2045a161293c", "canary-2108"},
-    {"de9ad8b328d3fb638aa94fed13be259140265586", "canary-2109"},
-    {"df8f2f627f31afd75dd508e57008f7140efe7ef0", "canary-2110"},
-    {"ecf9e171496db7b9633a1db71159c81354ff7f7a", "canary-2111"},
-    {"8fcdc9d66e6fda8dc16a856410cf4fa2011fc00b", "canary-2112"},
-    {"cc36e0f54d0253a7eb4382502d7b961eeb8a1b62", "canary-2113"},
-    {"c59ad7917654cd4ee0af71b4105a6dcc8189a043", "canary-2114"},
-    {"df4aa4a601fd32fd32109b06b0b2f63ccb022f6c", "canary-2115"},
-    {"5aa1987d55b2e3e258c7ac0e8a2e812f9b72b862", "canary-2116"},
-    {"a8b5bd30a8b0d5fd905980d49dd49ac23f578711", "canary-2117"},
-    {"17630edcd3662b88919c0d72cae401ea50712f74", "canary-2118"},
-    {"b3f246ce099d6ff3aad30fe2fbe28761a446ddeb", "canary-2119"},
-    {"b6df6cd62d04bf25173f516bcc11d8abda837704", "canary-2120"},
-    {"4ad3eac947ffc1b643fac4357a4741724d5dbb52", "canary-2121"},
-    {"3d62fefb8bf992bd8267ec83105ebd7e6ed95bee", "canary-2122"},
-    {"12b1a2dbcc196961f7b012d42ae38fbff979f7ea", "canary-2123"},
-    {"d8537cc3f540eeede5aa34ab7625c6833ecf20fc", "canary-2124"},
-    {"0c754fdd8ca5ec3311b6d3f648270b967c2f531f", "canary-2125"},
-    {"26ff8e7bfe1707053ae194e4cdf61c7146e23abe", "canary-2126"},
-    {"c32995347d859bbc6353524a3afe2974df6d56f8", "canary-2127"},
-    {"fe4841425158424693846df59e311e3b5e99d4a5", "canary-2128"},
-    {"3174fe02570394d64a23da7839729cd0065502d2", "canary-2129"},
-    {"9c96c145f3b36df0e58be398ea81283b7ec7c5ca", "canary-2130"},
-    {"efffbd7f82f8df63aee15ad9cfa181e1fdc511bc", "canary-2131"},
-    {"42c77b58f7afb3001b532690e388ef1b04a09a6c", "canary-2132"},
-    {"0cae5f586d4832104f5db5820c968e830a623505", "canary-2133"},
-    {"8afade060cf826e133022eb655dbe1259b78cd5f", "canary-2134"},
-    {"57891c04443d0db1be5b29817d8c85ad8e1fcce5", "canary-2135"},
-    {"49cc29e990ea680ffaaaf444f5e0ffffcb2645ec", "canary-2136"},
-    {"d0d0afdb18b20f68a5d4027daecbee683e3cac24", "canary-2137"},
-    {"fbe7fbdb7fb8ce22a661dee955d76a984d716acf", "canary-2138"},
-    {"77edcd97d16d733b42ec7e3daa12f3163fc16d50", "canary-2139"},
-    {"c4069c7362c0abb88108a4481efd5490c89aa99e", "canary-2140"},
-    {"55ed4c0409d59438ba4710638c50ae4c8773b04f", "canary-2141"},
-    {"fedf9a9b31443b64a71bf26747ac900694e4b017", "canary-2142"},
-    {"e5b9c950828bef6830bd94e4742fcf4fd3739aa8", "canary-2143"},
-    {"743e610494cfb047265ac52c61c98d8af06e84a1", "canary-2144"},
-    {"ce6ae36a45a599cf2fef82e79c07cbad562b6864", "canary-2145"},
-    {"605fd45fd2ebb1389698fd834fefde1c23a69c35", "canary-2146"},
-    {"ead203fad1c64765dde993def4dcfee9384dadc5", "canary-2147"},
-    {"1a5462b37490609be2fec0b3beb33c1ed3284a9b", "canary-2148"},
-    {"1132311449b0366dae77acd3a63aa5723145fc9b", "canary-2149"},
-    {"08ca904f094d340f6b4cc7e5208c63c23610bdf4", "canary-2150"},
-    {"76f59efc357209fd8711a88b008b640522d675a7", "canary-2151"},
-    {"da3788aa9a26b8518ddd3f97f874f6f019e657bd", "canary-2152"},
-    {"4c6d6f5d6defebfcbe257b3770f6bfff9b852672", "canary-2153"},
-    {"9a93fe978cf810b564411c354888c20771179fd8", "canary-2154"},
-    {"469f2786530ccb03361dee0261228b7aab17ede2", "canary-2155"},
-    {"1736232c88b63cd1b6345d4b835aaee167bd2947", "canary-2156"},
-    {"e252af9e8cfa3fcf7226eb939d6ff152fa814bab", "canary-2157"},
-    {"3e150456570a7081c530b7ec0bcd8e163b02af23", "canary-2158"},
-    {"56adea1074ea1b784217210150f38f745714504f", "canary-2159"},
-    {"e6f9f18db0c3efb2772b2695efa87a410dfcce5d", "canary-2160"},
-    {"bf3496820d9fbf363369bd80712172797f178e24", "canary-2161"},
-    {"33ee3902bc80ad67fe895b449f01fc5dca5dbcb5", "canary-2162"},
-    {"5b3b5aa3e4369f3c3272f71ce9621787fa78a5a7", "canary-2163"},
-    {"862c3eb0569677a156693c824f521aaa3222bdae", "canary-2164"},
-    {"27431c7e79e26ea93bc9c300c5c84da76a25d10f", "canary-2165"},
-    {"b9b66af246366a5221acde92cb01c42c756bd626", "canary-2166"},
-    {"06eadacf6e375f5270d3be00e5ee5f93579dcdad", "canary-2167"},
-    {"48f6c9e95aff2cc8fc1a9cbcb19ac128d17041c1", "canary-2168"},
-    {"9840c2defc936dba7afd3424923fb42516b7c034", "canary-2169"},
-    {"1a23026b5759cb3c0499732c2c8c8490e5640d05", "canary-2170"},
-    {"47d89f0a8cc266e2ac44a5777657800941e33414", "canary-2171"},
-    {"1fb57cabb71d3a48b007c54a48afb990e9eb7418", "canary-2172"},
-    {"d0cf14f99598913a6dca96a2c5d6c96bc9d53128", "canary-2173"},
-    {"14f9b973999f2888252181fa1d3ffb6cb55fb5d5", "canary-2174"},
-    {"3353aa4175a68f3a1c7304cb5d644b25cff520a1", "canary-2175"},
-    {"db7598416e9651c39b676ea3928fa3bc8235e3b0", "canary-2176"},
-    {"57e5ccef7738973b967c92b7c5ed309694571bb7", "canary-2177"},
-    {"a4009657e16f1aaf9aed40c906c8be5f712bebbc", "canary-2178"},
-    {"f30873d99be6a9e33c35bd4dcaf5f95b62789713", "canary-2179"},
-    {"479beb279079aa675ff8c5771d1c02e40857b923", "canary-2180"},
-    {"4207e97b3881a8d41a3ea8b39ba5e20f2e7d7904", "canary-2181"},
-    {"ae14756c62c8034e92e4d52c01645fd660d4897f", "canary-2182"},
-    {"d9302742ed77d33f4e407afc73386f3a607c8f78", "canary-2183"},
-    {"f4d60a043f064e748db00afeddd8ba01811a8adf", "canary-2184"},
-    {"27db4a5a63e9a09af62d917fc97fc7092b218486", "canary-2185"},
-    {"740c6a8c9c6a59d460de3ee9d2b687bd70215d81", "canary-2186"},
-    {"4bc95e08bd05a16a555d70fd8326dd364596f593", "canary-2187"},
-    {"3e5094a65ea2b8423937909fa6c7581d8d2abc1a", "canary-2188"},
-    {"1d9485c5a14d1a5e4f5ab3224e372d4952df2e6d", "canary-2189"},
-    {"546a8da7b78857ffe3df48257afb9bab34b60ebd", "canary-2190"},
-    {"06a951ddcd713de0f1098b173f2c993779496e8f", "canary-2191"},
-    {"7574727d1ec36d8654447f3091ae7eff4ad060b1", "canary-2192"},
-    {"b3f5a847a4cd5e2b991cf59af65c3ee95440a0d1", "canary-2193"},
-    {"f1899d3ea2f434bbd7af8c1b2a97208b16123c6d", "canary-2194"},
-    {"a77a99d457bcfc0b440694ea2352826628071770", "canary-2195"},
-    {"0725dde769e08be0c9500563a16038b40dac068f", "canary-2196"},
-    {"eef32fb41e7483a7d4f88b2661f116f6118739fc", "canary-2197"},
-    {"17ac375c67656b1ef21953fdebcc4f2d48a4a353", "canary-2198"},
-    {"39584f2ca3872e0c021c67664881fdfc1dadbbee", "canary-2199"},
-    {"9eef83c433ca8672cd748ba3fd05cff1ada17b4d", "canary-2200"},
-    {"8d2a97d840e553938b226871d5878db2eddde925", "canary-2201"},
-    {"e1674808b94e610e3cb4cb8fcb778111a1f9e005", "canary-2202"},
-    {"d81837472b2f68c057bf6c5c78c8029b39b2c1ac", "canary-2203"},
-    {"7e1cd897e6ef900979ba5ff35111dd53e794bf95", "canary-2204"},
-    {"21ce2b4c4c1949e718f267c0019a99de58db8923", "canary-2205"},
-    {"98a2aaa16b7c83ccd67a24d88df8ab5446cc7d54", "canary-2206"},
-    {"190471340506131ad41b6e8b287cc02c51dd0c42", "canary-2207"},
-    {"fe87ff36de4213bdb8f7cecab6e7f373cfd46aca", "canary-2208"},
-    {"1275a417c95a78cd22104c4ccb6dacb0482f3978", "canary-2209"},
-    {"9a21b19e56cf30ca688cf25995c5503215ae2eec", "canary-2210"},
-    {"ceea63d0f3348c55ba65e6eef67bda41e87b82d4", "canary-2211"},
-    {"3498dfce191a3738a51991e5ae20b923d3075083", "canary-2212"},
-    {"72fb90522059ccf7517837225c8ddbb78bd65176", "canary-2213"},
-    {"14115e175109ad8c3786aaea2372382009ac0be3", "canary-2214"},
-    {"dffe8e231417cb36925b892898bd001602b43dd8", "canary-2215"},
-    {"986173342504b2dbbf183031e92ba5d9422da1ab", "canary-2216"},
-    {"5af8b582547bb8da62e1dd100b76787f3e24d291", "canary-2217"},
-    {"cc3e9a84256cf58c29ec91aa816209ccff59ab97", "canary-2218"},
-    {"e115fd17d1f5b0da6aae9390fe56d02e02997284", "canary-2219"},
-    {"247ff064766d986c45e87ae2690cb2c5061badc9", "canary-2220"},
-    {"8063c6eda2cfed8b07260fab81d1fecba347d2f6", "canary-2221"},
-    {"9500f382569912732a47306309192fe3835aff92", "canary-2222"},
-    {"dd60b9bc65e46de5b833835831fe31ed81a67cac", "canary-2223"},
-    {"dc62a7b77caf0c34c890aee4a5c9ae0216d8ce76", "canary-2224"},
-    {"500e93cee72e05c3551dbc5c9668b374e478dc88", "canary-2225"},
-    {"77dcb704d859d321cae38b01bb3f4fcbda73f050", "canary-2226"},
-    {"a634dcee69928c3f94463e8fae1d3cacd20cf264", "canary-2227"},
-    {"b9fd8a8c3c4640bca852196596cf4e1a3e28ae62", "canary-2228"},
-    {"dd58cdc3a78517bf634d533b216518f7dd107b80", "canary-2229"},
-    {"5eeba8722b49f0f2369ba8c376c10b37145e0b14", "canary-2230"},
-    {"a72d785b20d6f300e1b5fd3f589728fb7280fbb8", "canary-2231"},
-    {"c8a0161a21e45c2f320dc014adaf60d832610703", "canary-2232"},
-    {"0e4bdbf57c156d01d14fc720e68c4afb566ecd10", "canary-2233"},
-    {"4e39a8d3e5a291b3111de14dea6a513e2c56c7f5", "canary-2234"},
-    {"159f73477857c7c56830d9109ee9be52439e4787", "canary-2235"},
-    {"976fa35e2a3b44e9e9b671239657d6ca3a00a7fe", "canary-2236"},
-    {"cde88be7a11d79b3903e6e58e78345865145559a", "canary-2237"},
-    {"6d388d0d0b85ae38d18b505e5aa49600335a2841", "canary-2238"},
-    {"82179e1caff53e7a1a93bc32b963e8894d04810c", "canary-2239"},
-    {"d427733092d8a9b5724e30883ee2684894cf40cc", "canary-2240"},
-    {"9b58b2ee28baca31687799109d3daecd6169af6e", "canary-2241"},
-    {"f0917f5a420ea577ab859b08da78d43a9db02e0b", "canary-2242"},
-    {"58cb375e83ce050792d8bedbd997efaa5d53719c", "canary-2243"},
-    {"c65d7140671b106daceb165de60d99f1e8fa8538", "canary-2244"},
-    {"fad6a3ba2f6786584ae8034e711497cd6ce29f87", "canary-2245"},
-    {"6127aa49ff3968f04691365625a3b7b90fe18b99", "canary-2246"},
-    {"a402381ff3ffbf8a581e25eb0da0e8ab56335bcb", "canary-2247"},
-    {"1a1852f4ba786bf46d1e80a1212c279f31190dfc", "canary-2248"},
-    {"02c74c878c1c0b382203ee0b1b3efb52f63e9e3d", "canary-2249"},
-    {"4daabe3dcfeb814aff779d1e437bbeb517b9ae21", "canary-2250"},
-    {"c80d81bed5d7bf6e23be3bc45b16f756b061217a", "canary-2251"},
-    {"0f87d01c9fb05997ae5c73b55fb6bc8f65e28124", "canary-2252"},
-    {"6dd51b32bf895906c053091fa63987966c659be2", "canary-2253"},
-    {"2df04fa1c608c22e2b55b6df0ecaac34092f4255", "canary-2254"},
-    {"68e131be11858ddbfdb954ba5c21518228ddca1f", "canary-2255"},
-    {"6e5db49acfa95d7105262dbf25710634db504ec1", "canary-2256"},
-    {"81ed9f9e850b17ae9061b9bc24ce9f263bb0ced4", "canary-2257"},
-    {"b9ea1619b9ba06edd5c31cf5f7cd4ce43e3da2c5", "canary-2258"},
-    {"9d4d5fba50a8f4e399b2b51578a941371c705a30", "canary-2259"},
-    {"44b85365b428f0061ec06f824e4e0fe480b86b44", "canary-2260"},
-    {"bd3ae3ad1cfedd7dd92e4c2ee96c6695675109a0", "canary-2261"},
-    {"e5a133e3898a9875fb4e4d55e95e98009c77dd94", "canary-2262"},
-    {"e0b7932195ca0b6ee1f10e52fa25526c1ebbdd7a", "canary-2263"},
-    {"1f65fa68bf5f060e32b4c996c0ab93b52519c403", "canary-2264"},
-    {"51c0d446c0e4b9958d8141247d5735e16cf5a61b", "canary-2265"},
-    {"baeff6eddb8cefee4650173feb607eabf7127a82", "canary-2266"},
-    {"d947e71f0719d5463d74108be734d22d69e232bb", "canary-2267"},
-    {"8a1c8c53f246aff24268d5fd185efc68229591e8", "canary-2268"},
-    {"b02d9c4a4e7bd4ac77b575157675377604c8052e", "canary-2269"},
-    {"1cb8bb700876fadbfb987f41b3fd208af4111cd5", "canary-2270"},
-    {"58a6502a16a99f5957d2744c7589b98ed3f866c0", "canary-2271"},
-    {"ac3ef658e212a62c0934d82fe562fd08bc84bc08", "canary-2272"},
-    {"aa36a3c0da8dc97b84ea79331bab6995e190f9c6", "canary-2273"},
-    {"96df489edff20d423aef5b6de7caf504e3b3ee71", "canary-2274"},
-    {"f3006178da3fe313d6d0f76c9b8fa524e1b8d31c", "canary-2275"},
-    {"071f7de6f75af2417f0a63aa7b81b2f76a333650", "canary-2276"},
-    {"ea7eb4062ce2f7fa8ce22aeabea7b8e24bf9bf7a", "canary-2277"},
-    {"c0e95440d14c7c27da386abb8031cf759082ba2a", "canary-2278"},
-    {"96cdf4cbc92b87e9fbac2b11e6df2a98820f3563", "canary-2279"},
-    {"fccf0982da29d723ef979671f752c8bd9de6ebf7", "canary-2280"},
-    {"bd172dd147e188e41c39b7459abf561f679dff88", "canary-2281"},
-    {"626c9dec254e8b3030f7e3d7f7f9d95fe11983b5", "canary-2282"},
-    {"8e53f6cbd527b5b9822999982dca046d9ffc6ec7", "canary-2283"},
-    {"8be213872f827cb4f2a77705cd189057f8316cec", "canary-2284"},
-    {"d937b05ba541da2b7ae34e0c933faa749b756d2a", "canary-2285"},
-    {"c2533f8fdb533ae2a3d1473b3544a85bee03f672", "canary-2286"},
-    {"c15eeee714e8c1d46c5d371a32c03af67ba76514", "canary-2287"},
-    {"c74049d76ab8e2f12836d8547bfd9cd9a0b0e30c", "canary-2288"},
-    {"b505cb5a21e3b73edccfe9dc3a2108f8960db3c8", "canary-2289"},
-    {"638c8c37717589520efb0c603a1f3b53e197a187", "canary-2290"},
-    {"f963aea4a1b270f5d8666e0c7a8fc9886f93652b", "canary-2291"},
-    {"3fe9ac1ee5c3777fdcc1efd49998a5222d06b15c", "canary-2292"},
-    {"702fa0098dd8724383e4ea09c0b11b3eb97e2996", "canary-2293"},
-    {"fee5f03c003a5904837887ceb714ec30c1570505", "canary-2294"},
-    {"0fbef6b0fc796a118fb255dbfb109b7c49b4de47", "canary-2295"},
-    {"c67d61a57bfeeec0b6a695af942c210c265b9b69", "canary-2296"},
-    {"7e93a7320250cc7ae11f58221ccddacdc1da0df5", "canary-2297"},
-    {"7d4074cf16a76eff5b6e3b4de33dd379b22773d5", "canary-2298"},
-    {"6a6f652baccd31c21e7b96e4a62086f8ab5eca04", "canary-2299"},
-    {"cd6855a653edf7982bae89bb6d23719f1b3ffcfb", "canary-2300"},
-    {"ca9d924edd34af4dc9cfb59c50fa3d79b7d64510", "canary-2301"},
-    {"ef7b48e25c5bd52ab7de0954dd296b5ea917e70c", "canary-2302"},
-    {"1fd334deed8450f687f527a2ffa0c948a7a180b9", "canary-2303"},
-    {"80a06ce823d9aba4a5a6dd5054f77fe8eacb2f5d", "canary-2304"},
-    {"f4099df0fc8d3571fa2a4e09585c5bc6e242e110", "canary-2305"},
-    {"0f8f1f9f1e58e7965d59e96b7722c1d620647a0e", "canary-2306"},
-    {"6669110544b72510392c30fb2e1bf0ac38f72364", "canary-2307"},
-    {"78608bf033d55e7729db434957df3960a705b12f", "canary-2308"},
-    {"b08517e2caa6de694f74d14c0184873050341d29", "canary-2309"},
-    {"12c9b5b0b7e86600e885214aae4c88de0c74dc8f", "canary-2310"},
-    {"55c4e61a1b8aba133dcf069df4c2a624ca836289", "canary-2311"},
-    {"62507595fddc6fafd2b64891163c50cd1e789652", "canary-2312"},
-    {"6e8d7b6d3ad4dfaef3798785609fb4615aab0219", "canary-2313"},
-    {"3b9afe36cadce455972674c5a8e4bffdefab8f6a", "canary-2314"},
-    {"b100f5e64b8fed3501b0535202971861a1caf3b0", "canary-2315"},
-    {"7b3bd2073c4479003ae4112743901c0b8ed86a8c", "canary-2316"},
-    {"ba7cdc41ffa9392d1774e3e15357af36df80d813", "canary-2317"},
-    {"bccef5e54410e76c8612876fe18a377ba8d8b351", "canary-2318"},
-    {"12c57dfffaabf48a440dee6a6cdc417b191f6748", "canary-2319"},
-    {"996ab19430fd6f05f4423697e6b1aaf3c5f5c0e4", "canary-2320"},
-    {"eadac48d56d373d5229041bcc085f4b4f2ea135d", "canary-2321"},
-    {"536a27a639c2927652550dc38be2afbc0f7bb63d", "canary-2322"},
-    {"31b894ce96267660227a67b0296389b46aae8e56", "canary-2323"},
-    {"e608d0fd5700539432a372bbe8c15de75d735789", "canary-2324"},
-    {"68680807a92896ebb23cdf63f6687dafdb6da9a5", "canary-2325"},
-    {"54a01c33bd1ab0cbe68261cdbbf3e422144b2501", "canary-2326"},
-    {"35b1ffaa3b9e081d633cc61eb6c9cd50dc76462a", "canary-2327"},
-    {"048deca412a5706d9c80d2f02962d5c3adc67bbd", "canary-2328"},
-    {"75cca0724adc3b9cbb181b3ffa3baf2255d68196", "canary-2329"},
-    {"bf469e328ef8dc5c0bf5811b3eb4dcb8c83e0f39", "canary-2330"},
-    {"5b9d126727d72c40a57a4138a36fa64024fb8c2c", "canary-2331"},
-    {"db0a13ddcf9931555f9a2b409430f0478592fb85", "canary-2332"},
-    {"21447152b9e2cc07dc421afad8e43b399fbe8fda", "canary-2333"},
-    {"a1159c0814a41e6789fd39acb1129fc3c6bc0b48", "canary-2334"},
-    {"18ba11250bb6fa5c850109307e6393895da6c7e3", "canary-2335"},
-    {"3e0d5df13c1d337dc022c3d67c73bc5fa0ea2de8", "canary-2336"},
-    {"009656592df7bb39b7fdb9e5e6fc78bbf3bc15f0", "canary-2337"},
-    {"7075be3b19654d7a337c531530d515de2a03cd95", "canary-2338"},
-    {"6c83402ed8d4e8656285c4cf486cd387a539cc97", "canary-2339"},
-    {"062c8927e7b117a4df5c8f056cda305d026054fd", "canary-2340"},
-    {"ac6ddf4aabfad72e10271ff0efdbd12e8494c852", "canary-2341"},
-    {"3b092dc9587193766ec5013ad48f26ec5da4b1a9", "canary-2342"},
-    {"cef48915d0e3cc862663537539af2777164deab0", "canary-2343"},
-    {"ca590eff7e45d9ded5b79c3c61e8b948b05f38a8", "canary-2344"},
-    {"93e5c657651b61d40a7700aa65d47abdc63de1da", "canary-2345"},
-    {"f61cf3a2db825f2f7972d79911f352b4d14469f9", "canary-2346"},
-    {"ae0abf49f0885c0fc936ae7b9a14b62d8728d25b", "canary-2347"},
-    {"4f9be7d7e0ef2ce224194c30214a30c07585db5a", "canary-2348"},
-    {"6142c04092733782182eeaf332219caa0aba6821", "canary-2349"},
-    {"6013af93f82988f846d8b85463d1c8b51e636dad", "canary-2350"},
-    {"1bec32697ba1f7dbd2da91e4cac0b17492e87f46", "canary-2351"},
-    {"3ab70c7539d44842f5870bc8aaae776549229aeb", "canary-2352"},
-    {"945a897acf17b7139422304de4f2644961335a1d", "canary-2353"},
-    {"c4026dc03ea71fd1274be4f5d5388b598bd903cb", "canary-2354"},
-    {"775dbc553f305ec655ccadbe7f9883a273311cac", "canary-2355"},
-    {"e45133b0fd466e4d510609fdd31055206039f07d", "canary-2356"},
-    {"be4fb8ecb71d52bc8432a06e64e31fb67c4b0efe", "canary-2357"},
-    {"dd96fc5dbb7731c3d7a6bf23116296eeb20acf29", "canary-2358"},
-    {"185cc6b428d51df2e98042234676eb43edf73e86", "canary-2359"},
-    {"95aa4457ab1837e0e7b6b8573a47f2f1742db4b5", "canary-2360"},
-    {"f119f19fd06a71ceb06077a9c362456b7385c4de", "canary-2361"},
-    {"f16706288e107670c2a469f67f41d162d6be0d3e", "canary-2362"},
-    {"cae7c105eeb5f31b697fe588ea53c588a3c467bf", "canary-2363"},
-    {"1a7c6f9daea11749523958f32efe129194341b0b", "canary-2364"},
-    {"af76af2a4de0f9bdfdddaf7c73546ebfd5724876", "canary-2365"},
-    {"0bbf367392616c53a18e469e4d82282ee9fccaec", "canary-2366"},
-    {"91e7576ca88b42fc640fb21209dc9ce584d8bbb2", "canary-2367"},
-    {"61c4859f773425e21b8789868e8fc480ae26a6c0", "canary-2368"},
-    {"f6c184f506ac576f68bf0a2a23b7295dda2f4198", "canary-2369"},
-    {"cb65b6ed9f943a74a24a95adcafa82e7692f3cc7", "canary-2370"},
-    {"66afc941fa0b4f3bfb577a1d4ec3ee04148c8532", "canary-2371"},
-    {"75c1f306794947a2ce9513b0371ef703621292c0", "canary-2372"},
-    {"d8ec62512b5fb38eb21e3812a89c214d11ab43e6", "canary-2373"},
-    {"60d583c68a91e77406f8bf7eb54f4f0d0a7289f2", "canary-2374"},
-    {"d4abf9e447586bea635c0816a581b005b4513434", "canary-2375"},
-    {"47d7e7ca22d832d5d505725bb4bd0347dd55420a", "canary-2376"},
-    {"e10a727a0a616a1465e7adbb2666361afefc3e5e", "canary-2377"},
-    {"36dcdf6a28495733b3485df5b9e770be8abfc395", "canary-2378"},
-    {"33aa5de88570085d77e0d3efa62527d6ba5333b2", "canary-2379"},
-    {"61789f19ae7afac351d33367fddd6ab7c300f45b", "canary-2380"},
-    {"7168317abc2d10396a7ee3ab9e3cdd78a8181d99", "canary-2381"},
-    {"26613b182647a7630d4ad6d58094014f347bd227", "canary-2382"},
-    {"7d479d089129314c80a1ff70e148cdf9a4df85eb", "canary-2383"},
-    {"8f02c57757cf7eb9c1ed2d13271f5852fd6086ba", "canary-2384"},
-    {"67421ff0c0e722c7738bd8ba74282b7d2eaeb78b", "canary-2385"},
-    {"76c947ffdfdd3e03012f7d80912d63fb71b4d1e5", "canary-2386"},
-    {"897fae3a33fd96dbf3e27a049867745bdae1d9d0", "canary-2387"},
-    {"7666bfc037cca0cdb11a0111f5650e53969bfe4b", "canary-2388"},
-    {"b9c5b95db5f9ec98c12ee83a6e845986d4cd2209", "canary-2389"},
-    {"a5a13128b4769cf8dfcfc5289707c6eb8ac13c61", "canary-2390"},
-    {"5bd0047b513dd29f446e3ae29b6283a0b70e7f60", "canary-2391"},
-    {"2807d3e2fec27518976a50bdaf3f837560ae290a", "canary-2392"},
-    {"25e44b4d02c830a390acd6262976a48622fc5eed", "canary-2393"},
-    {"373786e5be9948d0f4a25a83fc939df43ede423f", "canary-2394"},
-    {"183fcc32d52a640a4c0de1ae2721c4ed410bdae9", "canary-2395"},
-    {"27dcd6dc4ec34ca65722f501b83c1d08947140d1", "canary-2396"},
-    {"eb79a2a1612f6b339fbd18b695d7f579642bb1e6", "canary-2397"},
-    {"ec1934d23a0f2791d812c10bc9ca7797308fc24a", "canary-2398"},
-    {"0daab8b7ff793947ebca48595a70d6a88df66d58", "canary-2399"},
-    {"4e9fae5020d244808b9fc9ccd6bf07d810f6d9d3", "canary-2400"},
-    {"1ef395f4f00fa567c82ec1611c9fc07707da4970", "canary-2401"},
-    {"5ed7a3c1a980993dd94f2f8e0497053e5285f758", "canary-2402"},
-    {"7eabe1a79bf70e975b4e1f3e813d9566522b15c4", "canary-2403"},
-    {"b879b864620af3a52e067c8b82832b40354ae7af", "canary-2404"},
-    {"fe18c662054c15a3f4cbccacefea3c504ff86cd7", "canary-2405"},
-    {"726c74840775b8b6f3c2f860a86c12019c9231ea", "canary-2406"},
-    {"c93abdeae44be27ccd691d82d74f9959bd6b74aa", "canary-2407"},
-    {"f8fc54154750c036d62cecf9f2b504bc13347a52", "canary-2408"},
-    {"8d4dd0cd1f47adddea0b3027b88680ca4e964911", "canary-2409"},
-    {"01b3a00b9c5b07ddb603be5d342a28d21526f04f", "canary-2410"},
-    {"c621e5887d866b20aa3c1f449d438045207e4f5f", "canary-2411"},
-    {"3402c4f105664e813752162e9f955617ab16a70a", "canary-2412"},
-    {"c7a27f8789fb07e8edf34ef49ecd9d2723650a90", "canary-2413"},
-    {"9946596523c6e62ad7a8187f0c82e3e46ed97e44", "canary-2414"},
-    {"e509bf96a3cdece9ab7babb61a7279af799ff39b", "canary-2415"},
-    {"f5dba7be36b44a9bc7ed8fe3b854981a8ff42983", "canary-2416"},
-    {"68ec5d2d59b283633e0ae5ea7ea9960d6d9fc0f4", "canary-2417"},
-    {"34e696544ce2774a0bfe1f7f4ebca7509c9d9fca", "canary-2418"},
-    {"1a2e04a5da17b36d600db4950e5b638c6681fd31", "canary-2419"},
-    {"6853081f306e932f0aa2e041b0d4c29475f8b9da", "canary-2420"},
-    {"83eee44f180c134368801d60f6ad39423aa32d1f", "canary-2421"},
-    {"4e6725464574729f40880fdf6b22c7d99f26c55a", "canary-2422"},
-    {"ae6f757258eb5cad6da8b282378e61d991c004b3", "canary-2423"},
-    {"37dcc2c8dd5a49de5dfb24f8151ef55806dd820d", "canary-2424"},
-    {"61fdf0553097c56c836246092979c77bcaee00ad", "canary-2425"},
-    {"c218d30390e507706643d0814c283789706de2b3", "canary-2426"},
-    {"97b5cb539cec9f52f308e1fdbf880aff9fe07955", "canary-2427"},
-    {"2036a8f8d646eb519aca3461ad7633c1b8c37925", "canary-2428"},
-    {"c59d34fedb80830bd45b41270696eb74d18a3a77", "canary-2429"},
-    {"76d8035c7c8d4cdc4f4c3eb5e8f58db9e8ae2850", "canary-2430"},
-    {"ec968319fbfe725b5c4330b4cf7051b121607675", "canary-2431"},
-    {"aec48b6422c1a385c95118cd3869b00db28944cd", "canary-2432"},
-    {"51cbd53c02726a283a27242f6ed4d51e171bb2fd", "canary-2433"},
-    {"c5b836d6d96a52243fad812e4b54e587176cd65c", "canary-2434"},
-    {"ef5fba91640c10ca2a8b0b7e6e6e25da4bf2de74", "canary-2435"},
-    {"1db9c74f737414365881f8c5c15d623fb8b204d8", "canary-2436"},
-    {"daf0b9069cd4d4574e0a0503bb57b15462ed8cca", "canary-2437"},
-    {"dd426d73c9a1795d6d5b425cc1698f7d1f523706", "canary-2438"},
-    {"ddbe932d7aebf5c226d403be44c485c1d75bb507", "canary-2439"},
-    {"494cab41a4860d80306657b648297039f488f17e", "canary-2440"},
-    {"2b40cc5db3d357752d62c998610c213cdd5d6769", "canary-2441"},
-    {"3e1cdfcc198d5992de3e220d7ed1419f4e0282ed", "canary-2442"},
-    {"325890d5da808e47b8c81e7e6f0baba6f4a4d2ba", "canary-2443"},
-    {"eb65e3037de14be165bde2580b8c88e46bfc5266", "canary-2444"},
-    {"b68f5893cb8b25d72595ad47cb6046351daef2b5", "canary-2445"},
-    {"37442ca8e2db36a4a8a72016667ce9f4786a3522", "canary-2446"},
-    {"6a48182f745773ae305d2205170d5fd01b100697", "canary-2447"},
-    {"054278a903561db287294d125b6afa7412c91994", "canary-2448"},
-    {"550f653df51f2b070a9f37f6b023e2deba703e20", "canary-2449"},
-    {"ddde883a5610e3e0a36f9867024249dc598f5c78", "canary-2450"},
-    {"da8c25cfa766f3c61781b2dadd1a78419aa80185", "canary-2451"},
-    {"761d29b2d20612244e7bd0a5af32e308887e1513", "canary-2452"},
-    {"11a99d3fbf20e769be84a6f073c4bd067e603f1f", "canary-2453"},
-    {"48d3739c861acb0563432eec3569edca68288b12", "canary-2454"},
-    {"f12b48c6f22deb5a015021cf71e0541689d01849", "canary-2455"},
-    {"60414674db6e46a55c1faafbf8de8ee2429708a5", "canary-2456"},
-    {"325150d7d766043e5316593726a2bce494b586ce", "canary-2457"},
-    {"40d6b80ea1473e10c33e003d79be58d0e8776ada", "canary-2458"},
-    {"a5ec92f2ad698bc46b4db2d05c8acb7308262c58", "canary-2459"},
-    {"a74c448cacf59fd016739bee2befd8ae25f39851", "canary-2460"},
-    {"7a191051c8554238837919839c783c80f142714b", "canary-2461"},
-    {"631c3f66a0401aaba48b28d0aee037e5071e9b9c", "canary-2462"},
-    {"2bc03b1e04a248da094c3bfbaab828020c391558", "canary-2463"},
-    {"123a2f37268250e5bb53a1c332248d657bf32731", "canary-2464"},
-    {"5d043164581ce63ab7095344974d08ba9db1f721", "canary-2465"},
-    {"2b2133e20e2aa21d6411439a1df9628ec8a377ce", "canary-2466"},
-    {"c8c2a90e46dffe585aaf5f75f9a4e42ee0a82c67", "canary-2467"},
-    {"419926afaca11ed2d297e1012943971e03c0b106", "canary-2468"},
-    {"c327be0c191df7c56e6bc0d69fedeb516bb83f31", "canary-2469"},
-    {"cdcd487d379baf6ad70dc33444722f551370602d", "canary-2470"},
-    {"a8d8fdbceaf07f6588d915f5e458ba1a64415e04", "canary-2471"},
-    {"1e6cd354b80eafde38971d898f27614d75b0383c", "canary-2472"},
-    {"1be12ac6c0c31b80c041588e8a5c2e8b27bb8722", "canary-2473"},
-    {"1529e316a6678db7e3cc33eb4d640e5e3a1cbf54", "canary-2474"},
-    {"3ee62c4f65b0a5d2e83857aa7d933f40a2a55f1e", "canary-2475"},
-    {"b43c06653f17ce83a3d627d51c9e4c65a9cd62ae", "canary-2476"},
-    {"e0e394f48974a6352aacf66e742b0298dea552ac", "canary-2477"},
-    {"9ab82a11e23d722e741490052ca300e723fac650", "canary-2478"},
-    {"bfd715cf8fe3d7d1f29f609f5cb4d8b862161510", "canary-2479"},
-    {"851bcfdab6958b93ce273b3e4e183757ed724352", "canary-2480"},
-    {"aa4e3e367dab18c52041dffb6b00e570cb129da1", "canary-2481"},
-    {"858c4d9d86a1c1d64a072a44455daf8740b32150", "canary-2482"},
-    {"0b96b1147d0396ad649528764a595c27528dd791", "canary-2483"},
-    {"c987a45b56e51c7367ac40be90a6f622c3d027b8", "canary-2484"},
-    {"391fbec3ed339a94c078c6aff6686649a918aaea", "canary-2485"},
-    {"0311e3eb22885ef4ef1160f890de3495697a1e44", "canary-2486"},
-    {"45b11a4467490ccbb3b49d6619631e5cb56d199f", "canary-2487"},
-    {"1b984f8930fd5e19fdbad2d978e112074bec4257", "canary-2488"},
-    {"d1b74644c9af7bf148df8bc1499638dae507c98e", "canary-2489"},
-    {"4ab64484e710954916cdff98f2c4017ca470690b", "canary-2490"},
-    {"ff02694ddadf2ca7fffb5769caa51541e22a4b15", "canary-2491"},
-    {"d8b4012b476a17046187ef6aeacd7c756a1ba609", "canary-2492"},
-    {"87144004438ae12bbe2491551641aed7eef75701", "canary-2493"},
-    {"5f01661e762a569baa33694bd2162ef17573d5b9", "canary-2494"},
-    {"84fd965394e169a3a4dba4b91c87ad124dcbbcc8", "canary-2495"},
-    {"399ed10f30617b4ca02fc3d136453969ffbb8ba9", "canary-2496"},
-    {"e8bfb9991add79d2f47810f8d9a8f3a03318f038", "canary-2497"},
-    {"c71f31b0034ba2d9ca737727d832207b9e9027b2", "canary-2498"},
-    {"e63fe1eb194d3f084afa118545d89d549b33d364", "canary-2499"},
-    {"37a696dd041a3becc4cf91a293563bfdf6cc893c", "canary-2500"},
-    {"da564ca624c9a23005a1aaeeccfaefbcb49e19e3", "canary-2501"},
-    {"af2db7328886d104f79ee218c0743647d685bee5", "canary-2502"},
-    {"2fd5b184814034eb5cff474b54900e59cc884af6", "canary-2503"},
-    {"8b61c9bb1ac60cb0f1c82863c89ffe7545ed2a02", "canary-2504"},
-    {"2e5377c127f096fce7ff0228ce86056e3e9ced17", "canary-2505"},
-    {"27c009e36d285e7c9c94d64ccb4c5bc758d0bff7", "canary-2506"},
-    {"83748c04b9b5f7a99d742ddd4c30946568472b5a", "canary-2507"},
-    {"4e9604ac1d32bf67d189483f1ca37c57076fbab0", "canary-2508"},
-    {"e52b7e655c4263ebee887b9a7f1900c6d4d5c1c9", "canary-2509"},
-    {"14290bc2fa2b73687c5e43000eeb6f9365fe5dc7", "canary-2510"},
-    {"eae26a9359d8b5a8081509e03eca55abe5131b5c", "canary-2511"},
-    {"2f01abf9080285465a16f2e468dd60e3bfe041db", "canary-2512"},
-    {"bf49a6b2d0dfb5c55245804890d19859423c5846", "canary-2513"},
-    {"b5ab621a1014386cd85e16db8b9a60de0d236b5d", "canary-2514"},
-    {"d3ba6078b8a1730ce2c42f69136767646f31f5c4", "canary-2515"},
-    {"04c5f04cbdfbdabbba317de902bbaed507793c71", "canary-2516"},
-    {"b2f7814b172c81f01ad2bab86c0a523696a3948d", "canary-2517"},
-    {"7dda646b52f942432e65b5700ba3b8e29ec634fc", "canary-2518"},
-    {"fa011fc4967620d4fa6fcaa73e38c275316bc0e8", "canary-2519"},
-    {"4a2a73d87adf338e28442ec2f893674a39327b55", "canary-2520"},
-    {"61d28b3d358a5b53456326a565d9ac40843684d8", "canary-2521"},
-    {"17436144e4ff79f915c9540f35aeff225d74a5c6", "canary-2522"},
-    {"1ec747e83a23b97875ee6fe0f05c455cdb8781ba", "canary-2523"},
-    {"190968c458496861359c64a7a2fd9a0edf2a0eae", "canary-2524"},
-    {"2c494c74b02c45988389baab959e65a973172c2e", "canary-2525"},
-    {"1d94d2058f795959555d4953818855025bbdacff", "canary-2526"},
-    {"fdfc868e2e20a143f5e668df160c5c2a8c1dd550", "canary-2527"},
-    {"b221e73aadace0260a304e3cc19aa84630f447ef", "canary-2528"},
-    {"fe5e2fbd5ef47f495164f200ca2c26a8529f1d54", "canary-2529"},
-    {"7fb3648dfa744c62d5ae683705f2447368c2fc2d", "canary-2530"},
-    {"721b7a719979e3db405babd83eefd240ae24d502", "canary-2531"},
-    {"bd4c0fb32cf46f737e036856561c875224e82779", "canary-2532"},
-    {"0bd28cbd67358ba92754d6ea0725f62d1685d88c", "canary-2533"},
-    {"80acb73faa30e85192bb3c33d0feec9841a0d180", "canary-2534"},
-    {"3d33319fe18d74c768c39cd008ed1de4a88fa06f", "canary-2535"},
-    {"7b55223d9291613857e07eaf622c161212186a5e", "canary-2536"},
-    {"cc251a3bfb5d17563ae0fac6bf82827e1564adc6", "canary-2537"},
-    {"4ec3b43672d44410df34ef4535ee0709c83b3d6f", "canary-2538"},
-    {"b4458640591ddb3fa9338ae7012114161defbbe4", "canary-2539"},
-    {"9e79cbe503fdbef8d385e294e1e5efd2008d0e69", "canary-2540"},
-    {"3bfb605e85cf70497037a66cc1ce801734006190", "canary-2541"},
-    {"6dc61e18b1e3a5e81a83bd286f4307a133e28aea", "canary-2542"},
-    {"3c6566fdb92b5f7b1e80ddba91b9bd6b891b1544", "canary-2543"},
-    {"3812bf653b47f3983422a3e8fee2c9eb01385809", "canary-2544"},
-    {"1872ada841a0b8166a167d4333572433ed733521", "canary-2545"},
-    {"2b3fb8da5f31455f07e785a58eff05bd6f00410d", "canary-2546"},
-    {"db15a46df09656047cb4ad17e04f2009ab9044de", "canary-2547"},
-    {"79f72b90925e00dfeb85b2c1194c14b525768fd2", "canary-2548"},
-    {"6d9fa46d4dc0d1ac7ba6d57e96fa322fd5ef9607", "canary-2549"},
-    {"56d6addd66f57dcbf454066174dcf1a0527825bc", "canary-2550"},
-    {"f0d164e12826cc61eb6441920d94369978d0fd64", "canary-2551"},
-    {"08decc47d38eea9e50cd9e76d56c03ecfcf9edc9", "canary-2552"},
-    {"d528d07f1130eb2d7368963e0dc4713d69a00ccf", "canary-2553"},
-    {"f5f60952ce13ffc1aef38120ca66be4d05f68f97", "canary-2554"},
-    {"c3f23f374355637712878b4e24bf50ddfbde2ac4", "canary-2555"},
-    {"de746b574acff63b8c6fb859630e86f8744fc2b6", "canary-2556"},
-    {"da979398400ee91db5cfb75edfea44874be18cfb", "canary-2557"},
-    {"ae697e0c79253c5c483d79145bae43baff935e88", "canary-2558"},
-    {"9d492c84db35925b042dd30321538a62340eaafe", "canary-2559"},
-    {"5cd20ee78790631b462cd990170debdbbea6ea15", "canary-2560"},
-    {"c2f54595c6ee1edb818d266faf579acebcf82601", "canary-2561"},
-    {"0b5c899ecb8bda89b4a4b5adeb4466a787d3156b", "canary-2562"},
-    {"4327d1219d36d5563bc7369c62bc323f6ed0fa16", "canary-2563"},
-    {"4b299f3ecde1160648a3b9f29d3e09c4a848b129", "canary-2564"},
-    {"0c0967e517b926fb83b141c4fb1a939ca520ed11", "canary-2565"},
-    {"1ae4365a314bfa5eca57d685fc3f3f3e68632f26", "canary-2566"},
-    {"052251edfab9716a699a436b6e408fe3d7cb541e", "canary-2567"},
-    {"bfcce2f98838e884a8421d82c7457c452ad0dd10", "canary-2568"},
-    {"a2cda5ce2c4e5c349b19001b47ea39c0dc666bb6", "canary-2569"},
-    {"63a467a465be01b1dc9d6c339fd07c79c58b6728", "canary-2570"},
-    {"1e557a46e3ac713354443ceae7d0132c2258114d", "canary-2571"},
-    {"aaf177267b8a7bdb86d3f5e41430b11798caff95", "canary-2572"},
-    {"68f20dd4f79d9eea15deb33e0b11292575939cfd", "canary-2573"},
-    {"0b24ce88b522064e7ac533fa91d2021c81e0a452", "canary-2574"},
-    {"64f26948fe2c2076857731621934be82a6ea3e93", "canary-2575"},
-    {"57cc95b0c07ac92ff76a9e1b1de676e1e5deae5a", "canary-2576"},
-    {"b65bfc57c71cc5b970046499dc480dc5ddf07928", "canary-2577"},
-    {"95d26f48446351cea6323897625297eb16b7d221", "canary-2578"},
-    {"82d498c75de034323817c58901f595a4120db630", "canary-2579"},
-    {"068fecb8e56c49557fc41e8934a57d2d4538d8ae", "canary-2580"},
-    {"11e0ddb870455811a221016c745f1c58ca46d027", "canary-2581"},
-    {"4e4ac3d054235476794eb1ecb9a31128f43b7ffc", "canary-2582"}};
-}
diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt
index d8058dfd2..73b00d75c 100644
--- a/src/network/CMakeLists.txt
+++ b/src/network/CMakeLists.txt
@@ -22,7 +22,7 @@ if (ENABLE_WEB_SERVICE)
     target_link_libraries(network PRIVATE web_service)
 endif()
 
-target_link_libraries(network PRIVATE citra_common enet Boost::serialization httplib)
+target_link_libraries(network PRIVATE citra_common enet httplib)
 
 if (CITRA_USE_PRECOMPILED_HEADERS)
     target_precompile_headers(network PRIVATE precompiled_headers.h)
diff --git a/src/network/room_member.h b/src/network/room_member.h
index ee1c921d4..ad5d14b44 100644
--- a/src/network/room_member.h
+++ b/src/network/room_member.h
@@ -8,7 +8,6 @@
 #include <memory>
 #include <string>
 #include <vector>
-#include <boost/serialization/vector.hpp>
 #include "common/common_types.h"
 #include "network/room.h"
 
@@ -31,17 +30,6 @@ struct WifiPacket {
     MacAddress transmitter_address; ///< Mac address of the transmitter.
     MacAddress destination_address; ///< Mac address of the receiver.
     u8 channel;                     ///< WiFi channel where this frame was transmitted.
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& type;
-        ar& data;
-        ar& transmitter_address;
-        ar& destination_address;
-        ar& channel;
-    }
-    friend class boost::serialization::access;
 };
 
 /// Represents a chat message.
diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt
index f2c084017..519318180 100644
--- a/src/video_core/CMakeLists.txt
+++ b/src/video_core/CMakeLists.txt
@@ -205,7 +205,7 @@ target_include_directories(video_core PRIVATE ${HOST_SHADERS_INCLUDE})
 create_target_directory_groups(video_core)
 
 target_link_libraries(video_core PUBLIC citra_common citra_core)
-target_link_libraries(video_core PRIVATE Boost::serialization dds-ktx json-headers nihstro-headers tsl::robin_map)
+target_link_libraries(video_core PRIVATE dds-ktx json-headers nihstro-headers tsl::robin_map)
 
 if ("x86_64" IN_LIST ARCHITECTURE)
     target_link_libraries(video_core PUBLIC xbyak)
diff --git a/src/video_core/gpu.cpp b/src/video_core/gpu.cpp
index cc06078b9..4140bcbb1 100644
--- a/src/video_core/gpu.cpp
+++ b/src/video_core/gpu.cpp
@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/archives.h"
 #include "common/microprofile.h"
 #include "core/core.h"
 #include "core/core_timing.h"
@@ -418,11 +417,4 @@ void GPU::VBlankCallback(std::uintptr_t user_data, s64 cycles_late) {
     impl->timing.ScheduleEvent(FRAME_TICKS - cycles_late, impl->vblank_event);
 }
 
-template <class Archive>
-void GPU::serialize(Archive& ar, const u32 file_version) {
-    ar & impl->pica;
-}
-
-SERIALIZE_IMPL(GPU)
-
 } // namespace VideoCore
diff --git a/src/video_core/gpu.h b/src/video_core/gpu.h
index c5dd2c868..8cff86f11 100644
--- a/src/video_core/gpu.h
+++ b/src/video_core/gpu.h
@@ -6,7 +6,6 @@
 
 #include <functional>
 #include <memory>
-#include <boost/serialization/access.hpp>
 
 #include "core/hle/service/gsp/gsp_interrupt.h"
 
@@ -101,10 +100,6 @@ private:
 
     void VBlankCallback(uintptr_t user_data, s64 cycles_late);
 
-    friend class boost::serialization::access;
-    template <class Archive>
-    void serialize(Archive& ar, const u32 file_version);
-
 private:
     struct Impl;
     std::unique_ptr<Impl> impl;
diff --git a/src/video_core/pica/geometry_pipeline.cpp b/src/video_core/pica/geometry_pipeline.cpp
index 8b2d8d697..bab10a4d7 100644
--- a/src/video_core/pica/geometry_pipeline.cpp
+++ b/src/video_core/pica/geometry_pipeline.cpp
@@ -2,10 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <boost/serialization/base_object.hpp>
-#include <boost/serialization/export.hpp>
-#include <boost/serialization/unique_ptr.hpp>
-#include "common/archives.h"
 #include "core/core.h"
 #include "video_core/gpu.h"
 #include "video_core/pica/geometry_pipeline.h"
@@ -36,11 +32,6 @@ public:
      * @return if the buffer is full and the geometry shader should be invoked
      */
     virtual bool SubmitVertex(const AttributeBuffer& input) = 0;
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int file_version) {}
-    friend class boost::serialization::access;
 };
 
 // In the Point mode, vertex attributes are sent to the input registers in the geometry shader unit.
@@ -91,41 +82,6 @@ private:
     Common::Vec4<f24>* buffer_cur;
     Common::Vec4<f24>* buffer_end;
     u32 vs_output_num;
-
-    // TODO: REMOVE THIS
-    GeometryPipeline_Point()
-        : regs(Core::System::GetInstance().GPU().PicaCore().regs.internal),
-          unit(Core::System::GetInstance().GPU().PicaCore().gs_unit) {}
-
-    template <typename Class, class Archive>
-    static void serialize_common(Class* self, Archive& ar, const unsigned int version) {
-        ar& boost::serialization::base_object<GeometryPipelineBackend>(*self);
-        ar & self->attribute_buffer;
-        ar & self->vs_output_num;
-    }
-
-    template <class Archive>
-    void save(Archive& ar, const unsigned int version) const {
-        serialize_common(this, ar, version);
-        auto buffer_idx = static_cast<u32>(buffer_cur - attribute_buffer.data());
-        auto buffer_size = static_cast<u32>(buffer_end - attribute_buffer.data());
-        ar << buffer_idx;
-        ar << buffer_size;
-    }
-
-    template <class Archive>
-    void load(Archive& ar, const unsigned int version) {
-        serialize_common(this, ar, version);
-        u32 buffer_idx, buffer_size;
-        ar >> buffer_idx;
-        ar >> buffer_size;
-        buffer_cur = attribute_buffer.data() + buffer_idx;
-        buffer_end = attribute_buffer.data() + buffer_size;
-    }
-
-    BOOST_SERIALIZATION_SPLIT_MEMBER()
-
-    friend class boost::serialization::access;
 };
 
 // In VariablePrimitive mode, vertex attributes are buffered into the uniform registers in the
@@ -191,39 +147,6 @@ private:
     u32 total_vertex_num;
     Common::Vec4<f24>* buffer_cur;
     u32 vs_output_num;
-
-    // TODO: REMOVE THIS
-    GeometryPipeline_VariablePrimitive()
-        : regs(Core::System::GetInstance().GPU().PicaCore().regs.internal),
-          setup(Core::System::GetInstance().GPU().PicaCore().gs_setup) {}
-
-    template <typename Class, class Archive>
-    static void serialize_common(Class* self, Archive& ar, const unsigned int version) {
-        ar& boost::serialization::base_object<GeometryPipelineBackend>(*self);
-        ar & self->need_index;
-        ar & self->main_vertex_num;
-        ar & self->total_vertex_num;
-        ar & self->vs_output_num;
-    }
-
-    template <class Archive>
-    void save(Archive& ar, const unsigned int version) const {
-        serialize_common(this, ar, version);
-        auto buffer_idx = static_cast<u32>(buffer_cur - setup.uniforms.f.data());
-        ar << buffer_idx;
-    }
-
-    template <class Archive>
-    void load(Archive& ar, const unsigned int version) {
-        serialize_common(this, ar, version);
-        u32 buffer_idx;
-        ar >> buffer_idx;
-        buffer_cur = setup.uniforms.f.data() + buffer_idx;
-    }
-
-    BOOST_SERIALIZATION_SPLIT_MEMBER()
-
-    friend class boost::serialization::access;
 };
 
 // In FixedPrimitive mode, vertex attributes are buffered into the uniform registers in the geometry
@@ -231,7 +154,7 @@ private:
 // particle system.
 class GeometryPipeline_FixedPrimitive : public GeometryPipelineBackend {
 public:
-    GeometryPipeline_FixedPrimitive(const RegsInternal& regs, ShaderSetup& setup) : setup(setup) {
+    GeometryPipeline_FixedPrimitive(const RegsInternal& regs, ShaderSetup& setup) {
         ASSERT(regs.pipeline.variable_primitive == 0);
         ASSERT(regs.gs.input_to_uniform == 1);
         vs_output_num = regs.pipeline.vs_outmap_total_minus_1_a + 1;
@@ -263,48 +186,10 @@ public:
     }
 
 private:
-    ShaderSetup& setup;
     Common::Vec4<f24>* buffer_begin;
     Common::Vec4<f24>* buffer_cur;
     Common::Vec4<f24>* buffer_end;
     u32 vs_output_num;
-
-    // TODO: REMOVE THIS
-    GeometryPipeline_FixedPrimitive()
-        : setup(Core::System::GetInstance().GPU().PicaCore().gs_setup) {}
-
-    template <typename Class, class Archive>
-    static void serialize_common(Class* self, Archive& ar, const unsigned int version) {
-        ar& boost::serialization::base_object<GeometryPipelineBackend>(*self);
-        ar & self->vs_output_num;
-    }
-
-    template <class Archive>
-    void save(Archive& ar, const unsigned int version) const {
-        serialize_common(this, ar, version);
-        auto buffer_offset = static_cast<u32>(buffer_begin - setup.uniforms.f.data());
-        auto buffer_idx = static_cast<u32>(buffer_cur - setup.uniforms.f.data());
-        auto buffer_size = static_cast<u32>(buffer_end - setup.uniforms.f.data());
-        ar << buffer_offset;
-        ar << buffer_idx;
-        ar << buffer_size;
-    }
-
-    template <class Archive>
-    void load(Archive& ar, const unsigned int version) {
-        serialize_common(this, ar, version);
-        u32 buffer_offset, buffer_idx, buffer_size;
-        ar >> buffer_offset;
-        ar >> buffer_idx;
-        ar >> buffer_size;
-        buffer_begin = setup.uniforms.f.data() + buffer_offset;
-        buffer_cur = setup.uniforms.f.data() + buffer_idx;
-        buffer_end = setup.uniforms.f.data() + buffer_size;
-    }
-
-    BOOST_SERIALIZATION_SPLIT_MEMBER()
-
-    friend class boost::serialization::access;
 };
 
 GeometryPipeline::GeometryPipeline(RegsInternal& regs_, GeometryShaderUnit& gs_unit_,
@@ -387,15 +272,4 @@ void GeometryPipeline::SubmitVertex(const AttributeBuffer& input) {
     }
 }
 
-template <class Archive>
-void GeometryPipeline::serialize(Archive& ar, const unsigned int version) {
-    // vertex_handler and shader_engine are always set to the same value
-    ar& backend;
-}
-
 } // namespace Pica
-
-SERIALIZE_EXPORT_IMPL(Pica::GeometryPipeline_Point)
-SERIALIZE_EXPORT_IMPL(Pica::GeometryPipeline_VariablePrimitive)
-SERIALIZE_EXPORT_IMPL(Pica::GeometryPipeline_FixedPrimitive)
-SERIALIZE_IMPL(Pica::GeometryPipeline)
diff --git a/src/video_core/pica/geometry_pipeline.h b/src/video_core/pica/geometry_pipeline.h
index 048a4bb7e..81d4d6b1b 100644
--- a/src/video_core/pica/geometry_pipeline.h
+++ b/src/video_core/pica/geometry_pipeline.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include <memory>
-#include <boost/serialization/export.hpp>
 #include "video_core/pica/shader_unit.h"
 
 namespace Pica {
@@ -51,14 +50,5 @@ private:
     RegsInternal& regs;
     GeometryShaderUnit& gs_unit;
     ShaderSetup& gs;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int version);
-
-    friend class boost::serialization::access;
 };
 } // namespace Pica
-
-BOOST_CLASS_EXPORT_KEY(Pica::GeometryPipeline_Point)
-BOOST_CLASS_EXPORT_KEY(Pica::GeometryPipeline_VariablePrimitive)
-BOOST_CLASS_EXPORT_KEY(Pica::GeometryPipeline_FixedPrimitive)
diff --git a/src/video_core/pica/output_vertex.h b/src/video_core/pica/output_vertex.h
index d39210327..c7e930261 100644
--- a/src/video_core/pica/output_vertex.h
+++ b/src/video_core/pica/output_vertex.h
@@ -28,20 +28,6 @@ struct OutputVertex {
     Common::Vec3<f24> view;
     INSERT_PADDING_WORDS(1);
     Common::Vec2<f24> tc2;
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const u32) {
-        ar& pos;
-        ar& quat;
-        ar& color;
-        ar& tc0;
-        ar& tc1;
-        ar& tc0_w;
-        ar& view;
-        ar& tc2;
-    }
-    friend class boost::serialization::access;
 };
 static_assert(std::is_trivial_v<OutputVertex>, "Structure is not POD");
 static_assert(sizeof(OutputVertex) == 24 * sizeof(f32), "OutputVertex has invalid size");
diff --git a/src/video_core/pica/packed_attribute.h b/src/video_core/pica/packed_attribute.h
index 0e6e716e0..41a9c5133 100644
--- a/src/video_core/pica/packed_attribute.h
+++ b/src/video_core/pica/packed_attribute.h
@@ -4,8 +4,6 @@
 
 #pragma once
 
-#include <boost/serialization/binary_object.hpp>
-
 #include "common/vector_math.h"
 #include "video_core/pica_types.h"
 
@@ -61,14 +59,6 @@ private:
         }
         return uniform;
     }
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const u32) {
-        ar& buffer;
-        ar& index;
-    }
-    friend class boost::serialization::access;
 };
 
 } // namespace Pica
diff --git a/src/video_core/pica/pica_core.cpp b/src/video_core/pica/pica_core.cpp
index 6450e669b..dcccf75fd 100644
--- a/src/video_core/pica/pica_core.cpp
+++ b/src/video_core/pica/pica_core.cpp
@@ -3,7 +3,7 @@
 // Refer to the license.txt file included.
 
 #include "common/arch.h"
-#include "common/archives.h"
+
 #include "common/microprofile.h"
 #include "common/scope_exit.h"
 #include "common/settings.h"
@@ -611,17 +611,4 @@ void PicaCore::LoadVertices(bool is_indexed) {
     }
 }
 
-template <class Archive>
-void PicaCore::CommandList::serialize(Archive& ar, const u32 file_version) {
-    ar& addr;
-    ar& length;
-    ar& current_index;
-    if (Archive::is_loading::value) {
-        const u8* ptr = Core::System::GetInstance().Memory().GetPhysicalPointer(addr);
-        head = reinterpret_cast<const u32*>(ptr);
-    }
-}
-
-SERIALIZE_IMPL(PicaCore::CommandList)
-
 } // namespace Pica
diff --git a/src/video_core/pica/pica_core.h b/src/video_core/pica/pica_core.h
index cfd43f5a6..8bb7c7533 100644
--- a/src/video_core/pica/pica_core.h
+++ b/src/video_core/pica/pica_core.h
@@ -86,11 +86,6 @@ public:
             this->length = size / sizeof(u32);
             current_index = 0;
         }
-
-    private:
-        friend class boost::serialization::access;
-        template <class Archive>
-        void serialize(Archive& ar, const u32 file_version);
     };
 
     struct ImmediateModeState {
@@ -104,16 +99,6 @@ public:
             reset_geometry_pipeline = true;
             queue.Reset();
         }
-
-    private:
-        friend class boost::serialization::access;
-        template <class Archive>
-        void serialize(Archive& ar, const u32 file_version) {
-            ar& input_vertex;
-            ar& current_attribute;
-            ar& reset_geometry_pipeline;
-            ar& queue;
-        }
     };
 
     struct ProcTex {
@@ -167,13 +152,6 @@ public:
         std::array<ValueEntry, 128> alpha_map_table;
         std::array<ColorEntry, 256> color_table;
         std::array<ColorDifferenceEntry, 256> color_diff_table;
-
-    private:
-        friend class boost::serialization::access;
-        template <class Archive>
-        void serialize(Archive& ar, const u32 file_version) {
-            ar& boost::serialization::make_binary_object(this, sizeof(ProcTex));
-        }
     };
 
     struct Lighting {
@@ -196,21 +174,9 @@ public:
                 const f32 diff = static_cast<f32>(difference) / 2047.f;
                 return neg_difference ? -diff : diff;
             }
-
-            template <class Archive>
-            void serialize(Archive& ar, const u32 file_version) {
-                ar& raw;
-            }
         };
 
         std::array<std::array<LutEntry, 256>, 24> luts;
-
-    private:
-        friend class boost::serialization::access;
-        template <class Archive>
-        void serialize(Archive& ar, const u32 file_version) {
-            ar& boost::serialization::make_binary_object(this, sizeof(Lighting));
-        }
     };
 
     struct Fog {
@@ -231,13 +197,6 @@ public:
         };
 
         std::array<LutEntry, 128> lut;
-
-    private:
-        friend class boost::serialization::access;
-        template <class Archive>
-        void serialize(Archive& ar, const u32 file_version) {
-            ar& boost::serialization::make_binary_object(this, sizeof(Fog));
-        }
     };
 
     RegsLcd regs_lcd{};
@@ -252,25 +211,6 @@ public:
     AttributeBuffer input_default_attributes{};
     ImmediateModeState immediate{};
 
-private:
-    friend class boost::serialization::access;
-    template <class Archive>
-    void serialize(Archive& ar, const u32 file_version) {
-        ar& regs_lcd;
-        ar& regs.reg_array;
-        ar& gs_unit;
-        ar& vs_setup;
-        ar& gs_setup;
-        ar& proctex;
-        ar& lighting;
-        ar& fog;
-        ar& input_default_attributes;
-        ar& immediate;
-        ar& geometry_pipeline;
-        ar& primitive_assembler;
-        ar& cmd_list;
-    }
-
 private:
     Memory::MemorySystem& memory;
     VideoCore::RasterizerInterface* rasterizer;
diff --git a/src/video_core/pica/primitive_assembly.h b/src/video_core/pica/primitive_assembly.h
index dc900749e..cb51165dd 100644
--- a/src/video_core/pica/primitive_assembly.h
+++ b/src/video_core/pica/primitive_assembly.h
@@ -6,8 +6,6 @@
 
 #include <array>
 #include <functional>
-#include <boost/serialization/access.hpp>
-#include <boost/serialization/array.hpp>
 #include "video_core/pica/output_vertex.h"
 #include "video_core/pica/regs_pipeline.h"
 
@@ -77,16 +75,6 @@ private:
     std::array<OutputVertex, 2> buffer;
     bool strip_ready = false;
     bool winding = false;
-
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int version) {
-        ar& topology;
-        ar& buffer_index;
-        ar& buffer;
-        ar& strip_ready;
-        ar& winding;
-    }
-    friend class boost::serialization::access;
 };
 
 } // namespace Pica
diff --git a/src/video_core/pica/regs_lcd.h b/src/video_core/pica/regs_lcd.h
index 7848b0aad..6e8974095 100644
--- a/src/video_core/pica/regs_lcd.h
+++ b/src/video_core/pica/regs_lcd.h
@@ -4,8 +4,6 @@
 
 #pragma once
 
-#include <boost/serialization/access.hpp>
-
 #include "common/bit_field.h"
 #include "common/common_funcs.h"
 #include "common/common_types.h"
@@ -52,16 +50,6 @@ struct RegsLcd {
         u32* content = reinterpret_cast<u32*>(this);
         return content[index];
     }
-
-private:
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {
-        ar& color_fill_top.raw;
-        ar& backlight_top;
-        ar& color_fill_bottom.raw;
-        ar& backlight_bottom;
-    }
-    friend class boost::serialization::access;
 };
 static_assert(std::is_standard_layout_v<RegsLcd>, "Structure does not use standard layout");
 
diff --git a/src/video_core/pica/shader_setup.h b/src/video_core/pica/shader_setup.h
index 2df6ccdf4..aa192c704 100644
--- a/src/video_core/pica/shader_setup.h
+++ b/src/video_core/pica/shader_setup.h
@@ -33,15 +33,6 @@ struct Uniforms {
     static std::size_t GetIntUniformOffset(u32 index) {
         return offsetof(Uniforms, i) + index * sizeof(Common::Vec4<u8>);
     }
-
-private:
-    friend class boost::serialization::access;
-    template <class Archive>
-    void serialize(Archive& ar, const u32 file_version) {
-        ar& f;
-        ar& b;
-        ar& i;
-    }
 };
 
 struct ShaderRegs;
@@ -86,19 +77,6 @@ private:
     bool swizzle_data_hash_dirty{true};
     u64 program_code_hash{0xDEADC0DE};
     u64 swizzle_data_hash{0xDEADC0DE};
-
-    friend class boost::serialization::access;
-    template <class Archive>
-    void serialize(Archive& ar, const u32 file_version) {
-        ar& uniforms;
-        ar& uniform_queue;
-        ar& program_code;
-        ar& swizzle_data;
-        ar& program_code_hash_dirty;
-        ar& swizzle_data_hash_dirty;
-        ar& program_code_hash;
-        ar& swizzle_data_hash;
-    }
 };
 
 } // namespace Pica
diff --git a/src/video_core/pica/shader_unit.h b/src/video_core/pica/shader_unit.h
index 4fa9a1496..86b411c7d 100644
--- a/src/video_core/pica/shader_unit.h
+++ b/src/video_core/pica/shader_unit.h
@@ -6,7 +6,6 @@
 
 #include <functional>
 #include <span>
-#include <boost/serialization/base_object.hpp>
 
 #include "video_core/pica/output_vertex.h"
 
@@ -52,17 +51,6 @@ public:
     alignas(16) std::array<Common::Vec4<f24>, 16> temporary;
     alignas(16) std::array<Common::Vec4<f24>, 16> output;
     GeometryEmitter* emitter_ptr;
-
-private:
-    friend class boost::serialization::access;
-    template <class Archive>
-    void serialize(Archive& ar, const u32 file_version) {
-        ar& input;
-        ar& temporary;
-        ar& output;
-        ar& conditional_code;
-        ar& address_registers;
-    }
 };
 
 struct Handlers {
@@ -81,17 +69,6 @@ public:
     bool winding;
     u32 output_mask;
     Handlers* handlers;
-
-private:
-    friend class boost::serialization::access;
-    template <class Archive>
-    void serialize(Archive& ar, const u32 file_version) {
-        ar& buffer;
-        ar& vertex_id;
-        ar& prim_emit;
-        ar& winding;
-        ar& output_mask;
-    }
 };
 
 /**
@@ -107,14 +84,6 @@ struct GeometryShaderUnit : public ShaderUnit {
     void ConfigOutput(const ShaderRegs& config);
 
     GeometryEmitter emitter;
-
-private:
-    friend class boost::serialization::access;
-    template <class Archive>
-    void serialize(Archive& ar, const u32 file_version) {
-        ar& boost::serialization::base_object<ShaderUnit>(*this);
-        ar& emitter;
-    }
 };
 
 } // namespace Pica
diff --git a/src/video_core/pica_types.h b/src/video_core/pica_types.h
index 4fd27f9fe..0dddf0720 100644
--- a/src/video_core/pica_types.h
+++ b/src/video_core/pica_types.h
@@ -6,7 +6,6 @@
 
 #include <cmath>
 #include <cstring>
-#include <boost/serialization/access.hpp>
 #include "common/common_types.h"
 
 namespace Pica {
@@ -145,12 +144,6 @@ private:
     // Stored as a regular float, merely for convenience
     // TODO: Perform proper arithmetic on this!
     float value;
-
-    friend class boost::serialization::access;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int file_version) {
-        ar& value;
-    }
 };
 
 using f24 = Pica::Float<16, 7>;