diff --git a/client/ui/pages_logic/AppSettingsLogic.cpp b/client/ui/pages_logic/AppSettingsLogic.cpp
index ff018775..d1ebcd8e 100644
--- a/client/ui/pages_logic/AppSettingsLogic.cpp
+++ b/client/ui/pages_logic/AppSettingsLogic.cpp
@@ -1,53 +1,12 @@
-#include <QApplication>
-#include <QClipboard>
-#include <QDebug>
-#include <QDesktopServices>
-#include <QFileDialog>
-#include <QHBoxLayout>
-#include <QHostInfo>
-#include <QItemSelectionModel>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QKeyEvent>
-#include <QMenu>
-#include <QMessageBox>
-#include <QMetaEnum>
-#include <QSysInfo>
-#include <QThread>
-#include <QTimer>
-#include <QRegularExpression>
-#include <QSaveFile>
-
-//#include "configurators/cloak_configurator.h"
-//#include "configurators/vpn_configurator.h"
-//#include "configurators/openvpn_configurator.h"
-//#include "configurators/shadowsocks_configurator.h"
-//#include "configurators/ssh_configurator.h"
-
-//#include "core/servercontroller.h"
-//#include "core/server_defs.h"
-//#include "core/errorstrings.h"
-
-//#include "protocols/protocols_defs.h"
-//#include "protocols/shadowsocksvpnprotocol.h"
-
-#include "ui/qautostart.h"
+#include "AppSettingsLogic.h"
 
 #include "debug.h"
 #include "defines.h"
-#include "AppSettingsLogic.h"
-#include "utils.h"
-#include "vpnconnection.h"
-#include <functional>
-
-#if defined Q_OS_MAC || defined Q_OS_LINUX
-#include "ui/macos_util.h"
-#endif
+#include "ui/qautostart.h"
 
 using namespace amnezia;
 using namespace PageEnumNS;
 
-
 AppSettingsLogic::AppSettingsLogic(UiLogic *uiLogic, QObject *parent):
     QObject(parent),
     m_uiLogic(uiLogic),
diff --git a/client/ui/pages_logic/GeneralSettingsLogic.cpp b/client/ui/pages_logic/GeneralSettingsLogic.cpp
index bde225f1..dde5ec1f 100644
--- a/client/ui/pages_logic/GeneralSettingsLogic.cpp
+++ b/client/ui/pages_logic/GeneralSettingsLogic.cpp
@@ -1,11 +1,11 @@
 #include "GeneralSettingsLogic.h"
+
 #include "../uilogic.h"
 #include "ShareConnectionLogic.h"
 
 using namespace amnezia;
 using namespace PageEnumNS;
 
-
 GeneralSettingsLogic::GeneralSettingsLogic(UiLogic *uiLogic, QObject *parent):
     QObject(parent),
     m_uiLogic(uiLogic)
diff --git a/client/ui/pages_logic/NetworkSettingsLogic.cpp b/client/ui/pages_logic/NetworkSettingsLogic.cpp
index f33ef040..f28b75ca 100644
--- a/client/ui/pages_logic/NetworkSettingsLogic.cpp
+++ b/client/ui/pages_logic/NetworkSettingsLogic.cpp
@@ -1,32 +1,11 @@
-//#include <QApplication>
-//#include <QClipboard>
-//#include <QDebug>
-//#include <QDesktopServices>
-//#include <QFileDialog>
-//#include <QHBoxLayout>
-//#include <QHostInfo>
-//#include <QItemSelectionModel>
-//#include <QJsonDocument>
-//#include <QJsonObject>
-//#include <QKeyEvent>
-//#include <QMenu>
-//#include <QMessageBox>
-//#include <QMetaEnum>
-//#include <QSysInfo>
-//#include <QThread>
-//#include <QTimer>
-//#include <QRegularExpression>
-//#include <QSaveFile>
+#include "NetworkSettingsLogic.h"
 
 #include "defines.h"
-#include "NetworkSettingsLogic.h"
 #include "utils.h"
 
-
 using namespace amnezia;
 using namespace PageEnumNS;
 
-
 NetworkSettingsLogic::NetworkSettingsLogic(UiLogic *uiLogic, QObject *parent):
     QObject(parent),
     m_uiLogic(uiLogic),
diff --git a/client/ui/pages_logic/NewServerLogic.cpp b/client/ui/pages_logic/NewServerLogic.cpp
index b3221890..5a6b91f8 100644
--- a/client/ui/pages_logic/NewServerLogic.cpp
+++ b/client/ui/pages_logic/NewServerLogic.cpp
@@ -1,51 +1,8 @@
-#include <QApplication>
-#include <QClipboard>
-#include <QDebug>
-#include <QDesktopServices>
-#include <QFileDialog>
-#include <QHBoxLayout>
-#include <QHostInfo>
-#include <QItemSelectionModel>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QKeyEvent>
-#include <QMenu>
-#include <QMessageBox>
-#include <QMetaEnum>
-#include <QSysInfo>
-#include <QThread>
-#include <QTimer>
-#include <QRegularExpression>
-#include <QSaveFile>
-
-//#include "configurators/cloak_configurator.h"
-//#include "configurators/vpn_configurator.h"
-//#include "configurators/openvpn_configurator.h"
-//#include "configurators/shadowsocks_configurator.h"
-//#include "configurators/ssh_configurator.h"
-
-//#include "core/servercontroller.h"
-//#include "core/server_defs.h"
-//#include "core/errorstrings.h"
-
-//#include "protocols/protocols_defs.h"
-//#include "protocols/shadowsocksvpnprotocol.h"
-
-#include "debug.h"
-#include "defines.h"
 #include "NewServerLogic.h"
-#include "utils.h"
-#include "vpnconnection.h"
-#include <functional>
-
-#if defined Q_OS_MAC || defined Q_OS_LINUX
-#include "ui/macos_util.h"
-#endif
 
 using namespace amnezia;
 using namespace PageEnumNS;
 
-
 NewServerLogic::NewServerLogic(UiLogic *uiLogic, QObject *parent):
     QObject(parent),
     m_uiLogic(uiLogic)
diff --git a/client/ui/pages_logic/ServerListLogic.cpp b/client/ui/pages_logic/ServerListLogic.cpp
index 093e6832..ad562530 100644
--- a/client/ui/pages_logic/ServerListLogic.cpp
+++ b/client/ui/pages_logic/ServerListLogic.cpp
@@ -1,49 +1,11 @@
-#include <QApplication>
-#include <QClipboard>
-#include <QDebug>
-#include <QDesktopServices>
-#include <QFileDialog>
-#include <QHBoxLayout>
-#include <QHostInfo>
-#include <QItemSelectionModel>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QKeyEvent>
-#include <QMenu>
-#include <QMessageBox>
-#include <QMetaEnum>
-#include <QSysInfo>
-#include <QThread>
-#include <QTimer>
-#include <QRegularExpression>
-#include <QSaveFile>
-
-//#include "configurators/cloak_configurator.h"
-//#include "configurators/vpn_configurator.h"
-//#include "configurators/openvpn_configurator.h"
-//#include "configurators/shadowsocks_configurator.h"
-//#include "configurators/ssh_configurator.h"
-
-//#include "core/servercontroller.h"
-//#include "core/server_defs.h"
-//#include "core/errorstrings.h"
-
-//#include "protocols/protocols_defs.h"
-//#include "protocols/shadowsocksvpnprotocol.h"
-
-#include "debug.h"
-#include "defines.h"
 #include "ServerListLogic.h"
-#include "utils.h"
-#include "vpnconnection.h"
-#include <functional>
 
+#include "vpnconnection.h"
 #include "../uilogic.h"
 
 using namespace amnezia;
 using namespace PageEnumNS;
 
-
 ServerListLogic::ServerListLogic(UiLogic *uiLogic, QObject *parent):
     QObject(parent),
     m_uiLogic(uiLogic),
diff --git a/client/ui/pages_logic/ShareConnectionLogic.cpp b/client/ui/pages_logic/ShareConnectionLogic.cpp
index a3513315..82ff1248 100644
--- a/client/ui/pages_logic/ShareConnectionLogic.cpp
+++ b/client/ui/pages_logic/ShareConnectionLogic.cpp
@@ -1,42 +1,20 @@
-#include <QApplication>
+#include <QApplication>
 #include <QBuffer>
 #include <QClipboard>
-//#include <QDesktopServices>
 #include <QFileDialog>
-//#include <QHBoxLayout>
-//#include <QHostInfo>
-//#include <QItemSelectionModel>
-//#include <QJsonDocument>
-//#include <QJsonObject>
-//#include <QKeyEvent>
-//#include <QMenu>
-//#include <QMessageBox>
-//#include <QMetaEnum>
-//#include <QSysInfo>
-//#include <QThread>
 #include <QTimer>
-//#include <QRegularExpression>
 #include <QSaveFile>
 #include <QStandardPaths>
 
+#include "ShareConnectionLogic.h"
+
 #include "configurators/cloak_configurator.h"
 #include "configurators/vpn_configurator.h"
 #include "configurators/openvpn_configurator.h"
 #include "configurators/shadowsocks_configurator.h"
 #include "configurators/ssh_configurator.h"
 
-//#include "core/servercontroller.h"
-//#include "core/server_defs.h"
-//#include "core/errorstrings.h"
-
-//#include "protocols/protocols_defs.h"
-//#include "protocols/shadowsocksvpnprotocol.h"
-
-//#include "debug.h"
 #include "defines.h"
-#include "ShareConnectionLogic.h"
-//#include "utils.h"
-//#include "vpnconnection.h"
 #include <functional>
 
 #include "../uilogic.h"
@@ -44,7 +22,6 @@
 using namespace amnezia;
 using namespace PageEnumNS;
 
-
 ShareConnectionLogic::ShareConnectionLogic(UiLogic *uiLogic, QObject *parent):
     QObject(parent),
     m_uiLogic(uiLogic),
diff --git a/client/ui/pages_logic/SitesLogic.cpp b/client/ui/pages_logic/SitesLogic.cpp
index 9ec7149c..44bf0925 100644
--- a/client/ui/pages_logic/SitesLogic.cpp
+++ b/client/ui/pages_logic/SitesLogic.cpp
@@ -1,9 +1,8 @@
-#include <QDebug>
+#include <QDebug>
 #include <QDesktopServices>
 #include <QFile>
 #include <QHostInfo>
 
-
 #include "SitesLogic.h"
 #include "utils.h"
 #include "vpnconnection.h"
@@ -12,7 +11,6 @@
 #include "../uilogic.h"
 #include "../sites_model.h"
 
-
 using namespace amnezia;
 using namespace PageEnumNS;
 
diff --git a/client/ui/pages_logic/StartPageLogic.cpp b/client/ui/pages_logic/StartPageLogic.cpp
index 129f4cdc..6f0753d1 100644
--- a/client/ui/pages_logic/StartPageLogic.cpp
+++ b/client/ui/pages_logic/StartPageLogic.cpp
@@ -6,7 +6,6 @@
 using namespace amnezia;
 using namespace PageEnumNS;
 
-
 StartPageLogic::StartPageLogic(UiLogic *uiLogic, QObject *parent):
     QObject(parent),
     m_uiLogic(uiLogic),
diff --git a/client/ui/pages_logic/WizardLogic.cpp b/client/ui/pages_logic/WizardLogic.cpp
index 6f7e405f..cfa9aa42 100644
--- a/client/ui/pages_logic/WizardLogic.cpp
+++ b/client/ui/pages_logic/WizardLogic.cpp
@@ -1,49 +1,9 @@
-#include <QApplication>
-#include <QClipboard>
-#include <QDebug>
-#include <QDesktopServices>
-#include <QFileDialog>
-#include <QHBoxLayout>
-#include <QHostInfo>
-#include <QItemSelectionModel>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QKeyEvent>
-#include <QMenu>
-#include <QMessageBox>
-#include <QMetaEnum>
-#include <QSysInfo>
-#include <QThread>
-#include <QTimer>
-#include <QRegularExpression>
-#include <QSaveFile>
-
-//#include "configurators/cloak_configurator.h"
-//#include "configurators/vpn_configurator.h"
-//#include "configurators/openvpn_configurator.h"
-//#include "configurators/shadowsocks_configurator.h"
-//#include "configurators/ssh_configurator.h"
-
-//#include "core/servercontroller.h"
-//#include "core/server_defs.h"
-//#include "core/errorstrings.h"
-
-//#include "protocols/protocols_defs.h"
-//#include "protocols/shadowsocksvpnprotocol.h"
-
-//#include "debug.h"
-//#include "defines.h"
 #include "WizardLogic.h"
-//#include "utils.h"
-//#include "vpnconnection.h"
-//#include <functional>
-
 #include "../uilogic.h"
 
 using namespace amnezia;
 using namespace PageEnumNS;
 
-
 WizardLogic::WizardLogic(UiLogic *uiLogic, QObject *parent):
     QObject(parent),
     m_uiLogic(uiLogic),