diff --git a/CMakeLists.txt b/CMakeLists.txt
index cd28e798..36d9f0d9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -172,7 +172,6 @@ set(QV2RAY_SOURCES_NO_MAIN
     src/core/connection/ConnectionIO.hpp
     src/core/connection/Generation.hpp
     src/core/connection/Serialization.hpp
-    src/core/CoreSafeTypes.hpp
     src/core/CoreUtils.hpp
     src/core/handler/ConfigHandler.hpp
     src/core/handler/KernelInstanceHandler.hpp
diff --git a/makespec/BUILDVERSION b/makespec/BUILDVERSION
index 45288809..406727db 100644
--- a/makespec/BUILDVERSION
+++ b/makespec/BUILDVERSION
@@ -1 +1 @@
-5444
+5445
diff --git a/src/components/latency/QvTCPing.hpp b/src/components/latency/QvTCPing.hpp
index 98bb6411..3a341bf8 100644
--- a/src/components/latency/QvTCPing.hpp
+++ b/src/components/latency/QvTCPing.hpp
@@ -1,6 +1,5 @@
 #pragma once
 #include "base/Qv2rayBase.hpp"
-#include "core/CoreSafeTypes.hpp"
 
 namespace Qv2ray::components::tcping
 {
diff --git a/src/core/CoreSafeTypes.hpp b/src/core/CoreSafeTypes.hpp
deleted file mode 100644
index bd4860cd..00000000
--- a/src/core/CoreSafeTypes.hpp
+++ /dev/null
@@ -1,25 +0,0 @@
-//#pragma once
-//#include "base/models/QvConfigIdentifier.hpp"
-
-////#include <QString>
-
-//// namespace Qv2ray::core
-////{
-////    template<typename IDType>
-////    QList<IDType> StringsToIdList(const QList<QString> &strings)
-////    {
-////        QList<IDType> list;
-////        for (const auto &str : strings) list << IDType(str);
-////        return list;
-////    }
-
-////    template<typename IDType>
-////    QList<QString> IdListToStrings(const QList<IDType> &ids)
-////    {
-////        QList<QString> list;
-////        for (const auto &id : ids) list << id.toString();
-////        return list;
-////    }
-////} // namespace Qv2ray::core
-
-//// using namespace Qv2ray::core;
diff --git a/src/core/CoreUtils.hpp b/src/core/CoreUtils.hpp
index 9ca73751..81bc2226 100644
--- a/src/core/CoreUtils.hpp
+++ b/src/core/CoreUtils.hpp
@@ -1,10 +1,7 @@
-#pragma once
+#pragma once
 #include "base/models/CoreObjectModels.hpp"
 #include "base/models/QvConfigIdentifier.hpp"
 #include "base/models/QvSafeType.hpp"
-#include "core/CoreSafeTypes.hpp"
-
-#include <QString>
 
 namespace Qv2ray::core
 {
diff --git a/src/core/connection/ConnectionIO.hpp b/src/core/connection/ConnectionIO.hpp
index 0bb01a4f..09e9c866 100644
--- a/src/core/connection/ConnectionIO.hpp
+++ b/src/core/connection/ConnectionIO.hpp
@@ -1,6 +1,5 @@
 #pragma once
 #include "base/Qv2rayBase.hpp"
-#include "core/CoreSafeTypes.hpp"
 namespace Qv2ray::core::connection
 {
     namespace ConnectionIO
diff --git a/src/core/connection/Serialization.hpp b/src/core/connection/Serialization.hpp
index 883095be..5803decb 100644
--- a/src/core/connection/Serialization.hpp
+++ b/src/core/connection/Serialization.hpp
@@ -1,6 +1,5 @@
 #pragma once
 #include "base/Qv2rayBase.hpp"
-#include "core/CoreSafeTypes.hpp"
 
 namespace Qv2ray::core::connection
 {
diff --git a/src/core/handler/ConfigHandler.hpp b/src/core/handler/ConfigHandler.hpp
index 6766bf77..9aa2f6e6 100644
--- a/src/core/handler/ConfigHandler.hpp
+++ b/src/core/handler/ConfigHandler.hpp
@@ -3,7 +3,6 @@
 #include "base/Qv2rayBase.hpp"
 #include "common/HTTPRequestHelper.hpp"
 #include "components/latency/QvTCPing.hpp"
-#include "core/CoreSafeTypes.hpp"
 #include "core/CoreUtils.hpp"
 #include "core/connection/ConnectionIO.hpp"
 #include "core/handler/KernelInstanceHandler.hpp"
diff --git a/src/core/handler/KernelInstanceHandler.hpp b/src/core/handler/KernelInstanceHandler.hpp
index 504edfbe..0d430193 100644
--- a/src/core/handler/KernelInstanceHandler.hpp
+++ b/src/core/handler/KernelInstanceHandler.hpp
@@ -1,6 +1,5 @@
 #pragma once
 #include "components/plugins/QvPluginHost.hpp"
-#include "core/CoreSafeTypes.hpp"
 #include "core/kernel/V2rayKernelInteractions.hpp"
 
 #include <QObject>
diff --git a/src/core/kernel/V2rayKernelInteractions.hpp b/src/core/kernel/V2rayKernelInteractions.hpp
index bd286772..b1f9eced 100644
--- a/src/core/kernel/V2rayKernelInteractions.hpp
+++ b/src/core/kernel/V2rayKernelInteractions.hpp
@@ -1,6 +1,5 @@
-#pragma once
+#pragma once
 #include "base/Qv2rayBase.hpp"
-#include "core/CoreSafeTypes.hpp"
 #include "core/kernel/QvKernelABIChecker.hpp"
 
 #include <QProcess>
diff --git a/src/ui/editors/w_InboundEditor.hpp b/src/ui/editors/w_InboundEditor.hpp
index 9e6a8333..8c06b5c9 100644
--- a/src/ui/editors/w_InboundEditor.hpp
+++ b/src/ui/editors/w_InboundEditor.hpp
@@ -1,11 +1,10 @@
-#pragma once
+#pragma once
 
 #include "base/Qv2rayBase.hpp"
 #include "ui/messaging/QvMessageBus.hpp"
 #include "ui_w_InboundEditor.h"
 
 #include <QDialog>
-#include <QJsonObject>
 #include <QListWidgetItem>
 
 class InboundEditor
diff --git a/src/ui/editors/w_JsonEditor.hpp b/src/ui/editors/w_JsonEditor.hpp
index 9d314380..23550397 100644
--- a/src/ui/editors/w_JsonEditor.hpp
+++ b/src/ui/editors/w_JsonEditor.hpp
@@ -7,7 +7,6 @@
 #include "ui_w_JsonEditor.h"
 
 #include <QDialog>
-#include <QtCore>
 
 class JsonEditor
     : public QDialog
diff --git a/src/ui/editors/w_OutboundEditor.cpp b/src/ui/editors/w_OutboundEditor.cpp
index 6beeaea5..1ffb94a1 100644
--- a/src/ui/editors/w_OutboundEditor.cpp
+++ b/src/ui/editors/w_OutboundEditor.cpp
@@ -1,9 +1,8 @@
-#include "w_OutboundEditor.hpp"
+#include "w_OutboundEditor.hpp"
 
 #include "core/connection/Generation.hpp"
 #include "ui/editors/w_JsonEditor.hpp"
 #include "ui/editors/w_RoutesEditor.hpp"
-#include "ui/w_MainWindow.hpp"
 
 #include <QFile>
 #include <QIntValidator>
diff --git a/src/ui/w_GroupManager.hpp b/src/ui/w_GroupManager.hpp
index 9b012339..225319e9 100644
--- a/src/ui/w_GroupManager.hpp
+++ b/src/ui/w_GroupManager.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "base/Qv2rayBase.hpp"
-#include "core/CoreSafeTypes.hpp"
 #include "ui/messaging/QvMessageBus.hpp"
 #include "ui_w_GroupManager.h"
 
diff --git a/src/ui/w_ImportConfig.hpp b/src/ui/w_ImportConfig.hpp
index 44273438..e662448c 100644
--- a/src/ui/w_ImportConfig.hpp
+++ b/src/ui/w_ImportConfig.hpp
@@ -1,12 +1,10 @@
-#pragma once
+#pragma once
 
 #include "base/Qv2rayBase.hpp"
 #include "ui/messaging/QvMessageBus.hpp"
 #include "ui_w_ImportConfig.h"
 
 #include <QDialog>
-#include <QJsonObject>
-#include <QString>
 
 class ImportConfigWindow
     : public QDialog
diff --git a/src/ui/w_MainWindow.cpp b/src/ui/w_MainWindow.cpp
index acb5e68a..e110b47e 100644
--- a/src/ui/w_MainWindow.cpp
+++ b/src/ui/w_MainWindow.cpp
@@ -3,6 +3,7 @@
 #include "components/plugins/QvPluginHost.hpp"
 #include "components/proxy/QvProxyConfigurator.hpp"
 #include "components/update/UpdateChecker.hpp"
+#include "core/handler/ConfigHandler.hpp"
 #include "core/settings/SettingsBackend.hpp"
 #include "ui/editors/w_JsonEditor.hpp"
 #include "ui/editors/w_OutboundEditor.hpp"
diff --git a/src/ui/w_MainWindow.hpp b/src/ui/w_MainWindow.hpp
index 6b2d0780..fc404d95 100644
--- a/src/ui/w_MainWindow.hpp
+++ b/src/ui/w_MainWindow.hpp
@@ -3,7 +3,6 @@
 #include "common/HTTPRequestHelper.hpp"
 #include "common/LogHighlighter.hpp"
 #include "components/speedchart/speedwidget.hpp"
-#include "core/handler/ConfigHandler.hpp"
 #include "ui/messaging/QvMessageBus.hpp"
 #include "ui_w_MainWindow.h"
 
diff --git a/src/ui/w_PreferencesWindow.hpp b/src/ui/w_PreferencesWindow.hpp
index 5a8cfa58..9888ab24 100644
--- a/src/ui/w_PreferencesWindow.hpp
+++ b/src/ui/w_PreferencesWindow.hpp
@@ -2,9 +2,9 @@
 
 #include "base/Qv2rayBase.hpp"
 #include "ui/messaging/QvMessageBus.hpp"
+#include "ui_w_PreferencesWindow.h"
 
 #include <QDialog>
-#include <ui_w_PreferencesWindow.h>
 
 class RouteSettingsMatrixWidget;
 
diff --git a/src/ui/widgets/ConnectionItemWidget.cpp b/src/ui/widgets/ConnectionItemWidget.cpp
index e3ad9e4d..83b008e5 100644
--- a/src/ui/widgets/ConnectionItemWidget.cpp
+++ b/src/ui/widgets/ConnectionItemWidget.cpp
@@ -1,6 +1,7 @@
 #include "ConnectionItemWidget.hpp"
 
 #include "common/QvHelpers.hpp"
+#include "core/handler/ConfigHandler.hpp"
 
 #include <QStyleFactory>
 
@@ -89,6 +90,27 @@ void ConnectionItemWidget::BeginConnection()
     }
 }
 
+bool ConnectionItemWidget::NameMatched(const QString &arg) const
+{
+    auto searchString = arg.toLower();
+    auto headerMatched = GetDisplayName(groupId).toLower().contains(arg);
+
+    if (itemType != NODE_ITEM)
+    {
+        return headerMatched;
+    }
+    else
+    {
+        return headerMatched || GetDisplayName(connectionId).toLower().contains(searchString);
+    }
+}
+
+void ConnectionItemWidget::RecalculateConnectionsCount()
+{
+    auto connectionCount = ConnectionManager->Connections(groupId).count();
+    latencyLabel->setText(QSTRN(connectionCount) + " " + (connectionCount < 2 ? tr("connection") : tr("connections")));
+}
+
 void ConnectionItemWidget::OnConnected(const ConnectionGroupPair &id)
 {
     if (id == ConnectionGroupPair{ connectionId, groupId })
diff --git a/src/ui/widgets/ConnectionItemWidget.hpp b/src/ui/widgets/ConnectionItemWidget.hpp
index 4683b0c7..cb886ff7 100644
--- a/src/ui/widgets/ConnectionItemWidget.hpp
+++ b/src/ui/widgets/ConnectionItemWidget.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "core/handler/ConfigHandler.hpp"
+#include "base/models/QvConfigIdentifier.hpp"
 #include "ui_ConnectionItemWidget.h"
 
 #include <QWidget>
@@ -25,26 +25,10 @@ class ConnectionItemWidget
     //
     void BeginRename();
     void CancelRename();
-    inline bool NameMatched(const QString &arg)
-    {
-        auto searchString = arg.toLower();
-        auto headerMatched = GetDisplayName(groupId).toLower().contains(arg);
-
-        if (itemType != NODE_ITEM)
-        {
-            return headerMatched;
-        }
-        else
-        {
-            return headerMatched || GetDisplayName(connectionId).toLower().contains(searchString);
-        }
-    }
+    bool NameMatched(const QString &arg) const;
     inline const ConnectionGroupPair Identifier() const
     {
-        ConnectionGroupPair i;
-        i.connectionId = this->connectionId;
-        i.groupId = this->groupId;
-        return i;
+        return { this->connectionId, this->groupId };
     }
     inline bool IsRenaming() const
     {
@@ -63,11 +47,7 @@ class ConnectionItemWidget
     void OnLatencyTestStart(const ConnectionId &id);
     void OnConnectionModified(const ConnectionId &id);
     void OnLatencyTestFinished(const ConnectionId &id, const uint average);
-    inline void RecalculateConnectionsCount()
-    {
-        auto connectionCount = ConnectionManager->Connections(groupId).count();
-        latencyLabel->setText(QSTRN(connectionCount) + " " + (connectionCount < 2 ? tr("connection") : tr("connections")));
-    }
+    void RecalculateConnectionsCount();
     void OnConnectionItemRenamed(const ConnectionId &id, const QString &, const QString &newName);
     void OnGroupItemRenamed(const GroupId &id, const QString &, const QString &newName);
     void on_doRenameBtn_clicked();
diff --git a/src/ui/widgets/StreamSettingsWidget.hpp b/src/ui/widgets/StreamSettingsWidget.hpp
index 8393a9a4..172d89c3 100644
--- a/src/ui/widgets/StreamSettingsWidget.hpp
+++ b/src/ui/widgets/StreamSettingsWidget.hpp
@@ -1,10 +1,11 @@
 #pragma once
 
-#include "QWidget"
 #include "base/Qv2rayBase.hpp"
 #include "ui/messaging/QvMessageBus.hpp"
 #include "ui_StreamSettingsWidget.h"
 
+#include <QWidget>
+
 class StreamSettingsWidget
     : public QWidget
     , private Ui::StreamSettingsWidget