diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
index e20db2408d..f3b289f519 100644
--- a/src/slic3r/GUI/Plater.cpp
+++ b/src/slic3r/GUI/Plater.cpp
@@ -938,17 +938,6 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame)
         BOOST_LOG_TRIVIAL(error) << "Failed communication with Prusa Account: " << evt.data;
         user_account->on_communication_fail();
     });
-#if 0
-    // for debug purposes only
-    this->q->Bind(EVT_UA_SUCCESS, [this](UserAccountSuccessEvent& evt) {
-        this->notification_manager->close_notification_of_type(NotificationType::UserAccountID);
-        this->notification_manager->push_notification(NotificationType::UserAccountID, NotificationManager::NotificationLevel::ImportantNotificationLevel, evt.data);
-    });
-    this->q->Bind(EVT_UA_CONNECT_USER_DATA_SUCCESS, [this](UserAccountSuccessEvent& evt) {
-        BOOST_LOG_TRIVIAL(error) << evt.data;
-        user_account->on_connect_user_data_success(evt.data);
-    });
-#endif // 0
     this->q->Bind(EVT_UA_PRUSACONNECT_PRINTERS_SUCCESS, [this](UserAccountSuccessEvent& evt) {
         std::string text;
         bool printers_changed = false;
diff --git a/src/slic3r/GUI/UserAccount.cpp b/src/slic3r/GUI/UserAccount.cpp
index 7304c22ec4..594febc6d8 100644
--- a/src/slic3r/GUI/UserAccount.cpp
+++ b/src/slic3r/GUI/UserAccount.cpp
@@ -84,20 +84,6 @@ boost::filesystem::path UserAccount::get_avatar_path(bool logged) const
     }
 }
 
-#if 0
-void UserAccount::enqueue_user_id_action()
-{
-    m_communication->enqueue_user_id_action();
-}
-void UserAccount::enqueue_connect_dummy_action()
-{
-    m_communication->enqueue_connect_dummy_action();
-}
-void UserAccount::enqueue_connect_user_data_action()
-{
-    m_communication->enqueue_connect_user_data_action();
-}
-#endif
 
 void UserAccount::enqueue_connect_printers_action()
 {
diff --git a/src/slic3r/GUI/UserAccount.hpp b/src/slic3r/GUI/UserAccount.hpp
index 91edd207f9..d70c1bf2f6 100644
--- a/src/slic3r/GUI/UserAccount.hpp
+++ b/src/slic3r/GUI/UserAccount.hpp
@@ -41,11 +41,6 @@ public:
     void set_remember_session(bool remember);
     void toggle_remember_session();
     bool get_remember_session();
-#if 0
-    void enqueue_user_id_action();
-    void enqueue_connect_dummy_action();
-    void enqueue_connect_user_data_action();
-#endif
     void enqueue_connect_printers_action();
     void enqueue_avatar_action();
 
diff --git a/src/slic3r/GUI/UserAccountCommunication.cpp b/src/slic3r/GUI/UserAccountCommunication.cpp
index 83c1ba316d..25b6b75c26 100644
--- a/src/slic3r/GUI/UserAccountCommunication.cpp
+++ b/src/slic3r/GUI/UserAccountCommunication.cpp
@@ -274,43 +274,7 @@ void UserAccountCommunication::on_login_code_recieved(const std::string& url_mes
     wakeup_session_thread();
 }
 
-#if 0
-void UserAccountCommunication::enqueue_user_id_action()
-{
-    {
-        std::lock_guard<std::mutex> lock(m_session_mutex);
-        if (!m_session->is_initialized()) {
-            return;
-        }
-        m_session->enqueue_action(UserAccountActionID::USER_ID, nullptr, nullptr, {});
-    }
-    wakeup_session_thread();
-}
-void UserAccountCommunication::enqueue_connect_dummy_action()
-{
-    {
-        std::lock_guard<std::mutex> lock(m_session_mutex);
-        if (!m_session->is_initialized()) {
-            BOOST_LOG_TRIVIAL(error) << "Connect Dummy endpoint connection failed - Not Logged in.";
-            return;
-        }
-        m_session->enqueue_action(UserAccountActionID::CONNECT_DUMMY, nullptr, nullptr, {});
-    }
-    wakeup_session_thread();
-}
-void UserAccountCommunication::enqueue_connect_user_data_action()
-{
-    {
-        std::lock_guard<std::mutex> lock(m_session_mutex);
-        if (!m_session->is_initialized()) {
-            BOOST_LOG_TRIVIAL(error) << "Connect Printers endpoint connection failed - Not Logged in.";
-            return;
-        }
-        m_session->enqueue_action(UserAccountActionID::USER_ACCOUNT_ACTION_CONNECT_USER_DATA, nullptr, nullptr, {});
-    }
-    wakeup_session_thread();
-}
-#endif // 0
+
 
 void UserAccountCommunication::enqueue_connect_printers_action()
 {
diff --git a/src/slic3r/GUI/UserAccountCommunication.hpp b/src/slic3r/GUI/UserAccountCommunication.hpp
index 168ff11836..408861f85d 100644
--- a/src/slic3r/GUI/UserAccountCommunication.hpp
+++ b/src/slic3r/GUI/UserAccountCommunication.hpp
@@ -39,11 +39,6 @@ public:
     void do_logout();
     void do_clear();
     // Trigger function starts various remote operations
-#if 0
-    void enqueue_user_id_action();
-    void enqueue_connect_dummy_action();
-    void enqueue_connect_user_data_action();
-#endif
     void enqueue_connect_printers_action();
     void enqueue_avatar_action(const std::string& url);
     void enqueue_test_connection();
diff --git a/src/slic3r/GUI/UserAccountSession.cpp b/src/slic3r/GUI/UserAccountSession.cpp
index 879e461872..d5839a6648 100644
--- a/src/slic3r/GUI/UserAccountSession.cpp
+++ b/src/slic3r/GUI/UserAccountSession.cpp
@@ -26,9 +26,6 @@ wxDEFINE_EVENT(EVT_UA_PRUSACONNECT_PRINTERS_SUCCESS, UserAccountSuccessEvent);
 wxDEFINE_EVENT(EVT_UA_AVATAR_SUCCESS, UserAccountSuccessEvent); 
 wxDEFINE_EVENT(EVT_UA_FAIL, UserAccountFailEvent);
 wxDEFINE_EVENT(EVT_UA_RESET, UserAccountFailEvent);
-#if 0
-wxDEFINE_EVENT(EVT_UA_FAIL, UserAccountFailEvent);
-#endif // 0
 
 void UserActionPost::perform(/*UNUSED*/ wxEvtHandler* evt_handler, /*UNUSED*/ const std::string& access_token, UserActionSuccessFn success_callback, UserActionFailFn fail_callback, const std::string& input) const
 {
diff --git a/src/slic3r/GUI/UserAccountSession.hpp b/src/slic3r/GUI/UserAccountSession.hpp
index 49eff3779f..f28f195e13 100644
--- a/src/slic3r/GUI/UserAccountSession.hpp
+++ b/src/slic3r/GUI/UserAccountSession.hpp
@@ -24,9 +24,6 @@ wxDECLARE_EVENT(EVT_UA_PRUSACONNECT_PRINTERS_SUCCESS, UserAccountSuccessEvent);
 wxDECLARE_EVENT(EVT_UA_AVATAR_SUCCESS, UserAccountSuccessEvent);
 wxDECLARE_EVENT(EVT_UA_FAIL, UserAccountFailEvent); // Soft fail - clears only after some number of fails
 wxDECLARE_EVENT(EVT_UA_RESET, UserAccountFailEvent); // Hard fail - clears all
-#if 0
-wxDECLARE_EVENT(EVT_UA_CONNECT_USER_DATA_SUCCESS, UserAccountSuccessEvent);
-#endif // 0
 
 
 typedef std::function<void(const std::string& body)> UserActionSuccessFn;
@@ -42,12 +39,6 @@ enum class UserAccountActionID {
     USER_ACCOUNT_ACTION_TEST_CONNECTION,
     USER_ACCOUNT_ACTION_CONNECT_STATUS, // status of all printers
     USER_ACCOUNT_ACTION_AVATAR,
-#if 0
-    USER_ACCOUNT_ACTION_CONNECT_PRINTERS, // all info about all printers
-    USER_ACCOUNT_ACTION_CONNECT_USER_DATA,
-    USER_ACCOUNT_ACTION_CONNECT_DUMMY,
-#endif // 0
-
 };
 class UserAction
 {
@@ -121,12 +112,6 @@ public:
         m_actions[UserAccountActionID::USER_ACCOUNT_ACTION_TEST_CONNECTION] = std::make_unique<UserActionGetWithEvent>("TEST_CONNECTION", "https://account.prusa3d.com/api/v1/me/", wxEVT_NULL, EVT_UA_RESET);
         m_actions[UserAccountActionID::USER_ACCOUNT_ACTION_CONNECT_STATUS] = std::make_unique<UserActionGetWithEvent>("CONNECT_STATUS", "https://connect.prusa3d.com/slicer/status", EVT_UA_PRUSACONNECT_PRINTERS_SUCCESS, EVT_UA_FAIL);
         m_actions[UserAccountActionID::USER_ACCOUNT_ACTION_AVATAR] = std::make_unique<UserActionGetWithEvent>("AVATAR", "https://media.printables.com/media/", EVT_UA_AVATAR_SUCCESS, EVT_UA_FAIL);
-#if 0
-        m_actions[UserAccountActionID::USER_ACCOUNT_ACTION_CONNECT_USER_DATA] = std::make_unique<UserActionGetWithEvent>("CONNECT_USER_DATA", "https://connect.prusa3d.com/app/login", EVT_UA_CONNECT_USER_DATA_SUCCESS, EVT_UA_FAIL);
-        m_actions[UserAccountActionID::USER_ACCOUNT_ACTION_CONNECT_DUMMY] = std::make_unique<UserActionGetWithEvent>("CONNECT_DUMMY", "https://connect.prusa3d.com/slicer/dummy", EVT_UA_SUCCESS, EVT_UA_FAIL);
-        m_actions[UserAccountActionID::USER_ACCOUNT_ACTION_CONNECT_PRINTERS] = std::make_unique<UserActionGetWithEvent>("CONNECT_PRINTERS", "https://connect.prusa3d.com/slicer/printers", EVT_UA_PRUSACONNECT_PRINTERS_SUCCESS, EVT_UA_FAIL);
-#endif // 0
-
     }
     ~UserAccountSession()
     {
@@ -138,13 +123,6 @@ public:
         m_actions[UserAccountActionID::USER_ACCOUNT_ACTION_TEST_CONNECTION].reset(nullptr);
         m_actions[UserAccountActionID::USER_ACCOUNT_ACTION_CONNECT_STATUS].reset(nullptr);
         m_actions[UserAccountActionID::USER_ACCOUNT_ACTION_AVATAR].reset(nullptr);
-#if 0
-        m_actions[UserAccountActionID::USER_ACCOUNT_ACTION_CONNECT_USER_DATA].reset(nullptr);
-        m_actions[UserAccountActionID::USER_ACCOUNT_ACTION_CONNECT_DUMMY].reset(nullptr);
-        m_actions[UserAccountActionID::USER_ACCOUNT_ACTION_CONNECT_PRINTERS].reset(nullptr);
-
-#endif // 0
-
     }
     void clear() {
         m_access_token.clear();
diff --git a/src/slic3r/GUI/WebView.cpp b/src/slic3r/GUI/WebView.cpp
index a2d2e41dc7..c73fe7bc3b 100644
--- a/src/slic3r/GUI/WebView.cpp
+++ b/src/slic3r/GUI/WebView.cpp
@@ -1,8 +1,8 @@
 #include "WebView.hpp"
 #include "slic3r/GUI/GUI_App.hpp"
-#include "slic3r/Utils/MacDarkMode.hpp"
 
 #include <wx/uri.h>
+#include <wx/webview.h>
 
 #include <boost/log/trivial.hpp>
 
@@ -93,16 +93,7 @@ wxWebView* WebView::CreateWebView(wxWindow * parent, const wxString& url)
     return webView;
 }
 
-void WebView::LoadUrl(wxWebView * webView, wxString const &url)
-{
-    auto url2  = url;
-#ifdef __WIN32__
-    url2.Replace("\\", "/");
-#endif
-    if (!url2.empty()) { url2 = wxURI(url2).BuildURI(); }
-    BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << url2.ToUTF8();
-    webView->LoadURL(url2);
-}
+
 
 bool WebView::run_script(wxWebView *webView, wxString const &javascript)
 {
diff --git a/src/slic3r/GUI/WebView.hpp b/src/slic3r/GUI/WebView.hpp
index 21ace5c15f..6893e8965e 100644
--- a/src/slic3r/GUI/WebView.hpp
+++ b/src/slic3r/GUI/WebView.hpp
@@ -1,16 +1,14 @@
 #ifndef slic3r_GUI_WebView_hpp_
 #define slic3r_GUI_WebView_hpp_
 
-#include <wx/webview.h>
+class wxWebView;
+class wxWindow;
+class wxString;
 
-class WebView
+namespace WebView
 {
-public:
-    static wxWebView *CreateWebView(wxWindow *parent, wxString const &url);
-    
-    static void LoadUrl(wxWebView * webView, wxString const &url);
-
-    static bool run_script(wxWebView * webView, wxString const & msg);
+    wxWebView *CreateWebView(wxWindow *parent, const wxString& url);
+    bool run_script(wxWebView * webView, const wxString& msg);
 };
 
 #endif // !slic3r_GUI_WebView_hpp_
diff --git a/src/slic3r/GUI/WebViewDialog.cpp b/src/slic3r/GUI/WebViewDialog.cpp
index afb28d430f..c145068c06 100644
--- a/src/slic3r/GUI/WebViewDialog.cpp
+++ b/src/slic3r/GUI/WebViewDialog.cpp
@@ -1,26 +1,20 @@
 #include "WebViewDialog.hpp"
 
 #include "slic3r/GUI/I18N.hpp"
-#include "slic3r/GUI/wxExtensions.hpp"
 #include "slic3r/GUI/GUI_App.hpp"
-#include "slic3r/GUI/GUI.hpp"
 #include "slic3r/GUI/MainFrame.hpp"
 #include "slic3r/GUI/Plater.hpp"
-#include "libslic3r_version.h"
-#include "libslic3r/Utils.hpp"
-#include "libslic3r/libslic3r.h"
 #include "slic3r/GUI/UserAccount.hpp"
 #include "slic3r/GUI/format.hpp"
+#include "slic3r/GUI/WebView.hpp"
 
-#include <wx/sizer.h>
-#include <wx/toolbar.h>
-#include <wx/textdlg.h>
+
+#include <wx/webview.h>
 
 #include <boost/log/trivial.hpp>
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/json_parser.hpp>
 
-#include "slic3r/GUI/WebView.hpp"
 
 namespace pt = boost::property_tree;
 
diff --git a/src/slic3r/GUI/WebViewDialog.hpp b/src/slic3r/GUI/WebViewDialog.hpp
index 2dfbcbf6a7..e9a23b1a67 100644
--- a/src/slic3r/GUI/WebViewDialog.hpp
+++ b/src/slic3r/GUI/WebViewDialog.hpp
@@ -1,31 +1,11 @@
 #ifndef slic3r_WebViewDialog_hpp_
 #define slic3r_WebViewDialog_hpp_
 
-
-#include "wx/artprov.h"
-#include "wx/cmdline.h"
-#include "wx/notifmsg.h"
-#include "wx/settings.h"
-#include "wx/webview.h"
-
-#if wxUSE_WEBVIEW_EDGE
-#include "wx/msw/webview_edge.h"
-#endif
-
-#include "wx/webviewarchivehandler.h"
-#include "wx/webviewfshandler.h"
-#include "wx/numdlg.h"
-#include "wx/infobar.h"
-#include "wx/filesys.h"
-#include "wx/fs_arc.h"
-#include "wx/fs_mem.h"
-#include "wx/stdpaths.h"
-#include <wx/panel.h>
-#include <wx/tbarbase.h>
-#include "wx/textctrl.h"
-#include <wx/timer.h>
 #include <map>
 
+class wxWebView;
+class wxWebViewEvent;
+
 namespace Slic3r {
 namespace GUI {
 
diff --git a/src/slic3r/Utils/MacDarkMode.hpp b/src/slic3r/Utils/MacDarkMode.hpp
index 9e3701ea91..696d697bc3 100644
--- a/src/slic3r/Utils/MacDarkMode.hpp
+++ b/src/slic3r/Utils/MacDarkMode.hpp
@@ -13,7 +13,6 @@ namespace GUI {
 #if __APPLE__
 extern bool mac_dark_mode();
 extern double mac_max_scaling_factor();
-void WKWebView_evaluateJavaScript(void * web, wxString const & script, void (*callback)(wxString const &));
 #endif