diff --git a/Source/Assistants/CRC/Source/xToolsCRCAssistant.cpp b/Source/Assistants/CRC/Source/xToolsCRCAssistant.cpp
index 29a74f17..1b8caaa7 100644
--- a/Source/Assistants/CRC/Source/xToolsCRCAssistant.cpp
+++ b/Source/Assistants/CRC/Source/xToolsCRCAssistant.cpp
@@ -11,7 +11,6 @@
 
 #include <QComboBox>
 #include <QDesktopServices>
-#include <QLoggingCategory>
 #include <QMetaEnum>
 
 #include "xToolsCrcInterface.h"
@@ -156,7 +155,10 @@ void xToolsCRCAssistant::textFormatControl()
     if (m_asciiRadioBt->isChecked()) {
         return;
     }
-    disconnect(m_inputTextEdit, &QTextEdit::textChanged, this, &xToolsCRCAssistant::textFormatControl);
+    disconnect(m_inputTextEdit,
+               &QTextEdit::textChanged,
+               this,
+               &xToolsCRCAssistant::textFormatControl);
 
     QString strTemp;
     QString plaintext = m_inputTextEdit->toPlainText();
@@ -170,7 +172,7 @@ void xToolsCRCAssistant::textFormatControl()
     }
     m_inputTextEdit->setText(strTemp.toUpper());
     m_inputTextEdit->moveCursor(QTextCursor::End);
-    
+
     connect(m_inputTextEdit, &QTextEdit::textChanged, this, &xToolsCRCAssistant::textFormatControl);
 }
 
diff --git a/Source/Common/Common/xToolsCrcInterface.h b/Source/Common/Common/xToolsCrcInterface.h
index 3f61957f..2fabf1e6 100644
--- a/Source/Common/Common/xToolsCrcInterface.h
+++ b/Source/Common/Common/xToolsCrcInterface.h
@@ -8,7 +8,6 @@
  **************************************************************************************************/
 #pragma once
 
-#include <QLoggingCategory>
 #include <QObject>
 #include <QStringList>
 
diff --git a/Source/Common/Common/xToolsSettings.cpp b/Source/Common/Common/xToolsSettings.cpp
index 6d4c66ca..8f56decf 100644
--- a/Source/Common/Common/xToolsSettings.cpp
+++ b/Source/Common/Common/xToolsSettings.cpp
@@ -11,8 +11,8 @@
 #include <QApplication>
 #include <QDesktopServices>
 #include <QStandardPaths>
-#include <QUrl>
 #include <QStyle>
+#include <QUrl>
 
 static const QString fileName()
 {
@@ -52,9 +52,9 @@ QString xToolsSettings::settingsPath()
 int xToolsSettings::hdpiPolicy()
 {
 #ifdef X_TOOLS_ENABLE_HIGH_DPI_POLICY
-    auto var = value(mSettingsKey.hdpiPolicy);
+    auto var = value(m_settingsKey.hdpiPolicy);
     if (var.isValid()) {
-        return value(mSettingsKey.hdpiPolicy).toInt();
+        return value(m_settingsKey.hdpiPolicy).toInt();
     }
 
     return int(QGuiApplication::highDpiScaleFactorRoundingPolicy());
@@ -66,7 +66,7 @@ int xToolsSettings::hdpiPolicy()
 void xToolsSettings::setHdpiPolicy(int policy)
 {
 #ifdef X_TOOLS_ENABLE_HIGH_DPI_POLICY
-    setValue(mSettingsKey.hdpiPolicy, policy);
+    setValue(m_settingsKey.hdpiPolicy, policy);
     emit hdpiPolicyChanged();
 #else
     Q_UNUSED(policy)
@@ -75,9 +75,9 @@ void xToolsSettings::setHdpiPolicy(int policy)
 
 QString xToolsSettings::appStyle()
 {
-    auto var = value(mSettingsKey.appStyle);
+    auto var = value(m_settingsKey.appStyle);
     if (var.isValid()) {
-        return value(mSettingsKey.appStyle).toString();
+        return value(m_settingsKey.appStyle).toString();
     }
 
     if (QApplication::instance()) {
@@ -89,38 +89,38 @@ QString xToolsSettings::appStyle()
 
 void xToolsSettings::setAppStyle(const QString& style)
 {
-    setValue(mSettingsKey.appStyle, style);
+    setValue(m_settingsKey.appStyle, style);
 }
 
 QString xToolsSettings::language()
 {
-    return value(mSettingsKey.language).toString();
+    return value(m_settingsKey.language).toString();
 }
 
 void xToolsSettings::setLanguage(const QString& lan)
 {
-    setValue(mSettingsKey.language, lan);
+    setValue(m_settingsKey.language, lan);
 }
 
 bool xToolsSettings::clearSettings()
 {
-    return value(mSettingsKey.clearSettings).toBool();
+    return value(m_settingsKey.clearSettings).toBool();
 }
 
 void xToolsSettings::setClearSettings(bool clear)
 {
-    setValue(mSettingsKey.clearSettings, clear);
+    setValue(m_settingsKey.clearSettings, clear);
     emit clearSettingsChanged();
 }
 
 QString xToolsSettings::palette()
 {
-    return value(mSettingsKey.palette).toString();
+    return value(m_settingsKey.palette).toString();
 }
 
 void xToolsSettings::setPalette(const QString& fileName)
 {
-    setValue(mSettingsKey.palette, fileName);
+    setValue(m_settingsKey.palette, fileName);
     emit paletteChanged();
 }
 
diff --git a/Source/Common/Common/xToolsSettings.h b/Source/Common/Common/xToolsSettings.h
index f39a2781..f5a91a4d 100644
--- a/Source/Common/Common/xToolsSettings.h
+++ b/Source/Common/Common/xToolsSettings.h
@@ -8,7 +8,6 @@
  **************************************************************************************************/
 #pragma once
 
-#include <QLoggingCategory>
 #include <QSettings>
 #include <Qt>
 
@@ -69,7 +68,5 @@ private:
         const QString isTextBesideIcon{"isTextBesideIcon"};
         const QString palette{"palette"};
         const QString customPalette{"customPalette"};
-    } mSettingsKey;
-
-    QLoggingCategory mLoggingCategory{"sak.settings"};
+    } m_settingsKey;
 };
diff --git a/Source/Common/CommonUI/xToolsMainWindow.cpp b/Source/Common/CommonUI/xToolsMainWindow.cpp
index 3941f521..b17cb42c 100644
--- a/Source/Common/CommonUI/xToolsMainWindow.cpp
+++ b/Source/Common/CommonUI/xToolsMainWindow.cpp
@@ -16,7 +16,6 @@
 #include <QFileDialog>
 #include <QHBoxLayout>
 #include <QLabel>
-#include <QLoggingCategory>
 #include <QMenu>
 #include <QMenuBar>
 #include <QMessageBox>
diff --git a/Source/Common/CommonUI/xToolsMainWindow.h b/Source/Common/CommonUI/xToolsMainWindow.h
index 5342d1b9..705970cc 100644
--- a/Source/Common/CommonUI/xToolsMainWindow.h
+++ b/Source/Common/CommonUI/xToolsMainWindow.h
@@ -10,7 +10,6 @@
 
 #include <QActionGroup>
 #include <QApplication>
-#include <QLoggingCategory>
 #include <QMainWindow>
 #include <QMenu>
 #include <QStyleFactory>
diff --git a/Source/MainWindow.h b/Source/MainWindow.h
index ff311d7d..32d27acd 100644
--- a/Source/MainWindow.h
+++ b/Source/MainWindow.h
@@ -12,7 +12,6 @@
 #include <QButtonGroup>
 #include <QHBoxLayout>
 #include <QLabel>
-#include <QLoggingCategory>
 #include <QMenu>
 #include <QMessageBox>
 #include <QMetaEnum>
diff --git a/Source/ToolBox/ToolBoxUI/xToolsToolBoxUi.h b/Source/ToolBox/ToolBoxUI/xToolsToolBoxUi.h
index f4df3017..45707ed3 100644
--- a/Source/ToolBox/ToolBoxUI/xToolsToolBoxUi.h
+++ b/Source/ToolBox/ToolBoxUI/xToolsToolBoxUi.h
@@ -10,7 +10,6 @@
 
 #include <QIcon>
 #include <QList>
-#include <QLoggingCategory>
 #include <QTimer>
 #include <QWidget>
 
diff --git a/Source/ToolBox/ToolBoxUI/xToolsToolBoxUiCommunicationMenu.h b/Source/ToolBox/ToolBoxUI/xToolsToolBoxUiCommunicationMenu.h
index ec18fecc..2d0bfa52 100644
--- a/Source/ToolBox/ToolBoxUI/xToolsToolBoxUiCommunicationMenu.h
+++ b/Source/ToolBox/ToolBoxUI/xToolsToolBoxUiCommunicationMenu.h
@@ -8,7 +8,6 @@
  **************************************************************************************************/
 #pragma once
 
-#include <QLoggingCategory>
 #include <QMenu>
 #include <QTextDocument>
 
@@ -27,9 +26,6 @@ public:
 
     void initialize(xToolsToolBox *toolBox, const QString &settingsGroup);
 
-private:
-    const QLoggingCategory mLoggingCategory{"SAK.CustomBoxUiParameters"};
-
 private:
     Ui::xToolsToolBoxUiCommunicationMenu *ui;
 };
diff --git a/Source/Tools/Tools/xToolsBaseTool.h b/Source/Tools/Tools/xToolsBaseTool.h
index 9ecdd24d..a76e2a34 100644
--- a/Source/Tools/Tools/xToolsBaseTool.h
+++ b/Source/Tools/Tools/xToolsBaseTool.h
@@ -10,7 +10,6 @@
 
 #include <atomic>
 #include <QJsonObject>
-#include <QLoggingCategory>
 #include <QThread>
 
 class xToolsBaseTool : public QThread
diff --git a/Source/Tools/ToolsUI/xToolsAnalyzerToolUi.cpp b/Source/Tools/ToolsUI/xToolsAnalyzerToolUi.cpp
index a539992b..250971b8 100644
--- a/Source/Tools/ToolsUI/xToolsAnalyzerToolUi.cpp
+++ b/Source/Tools/ToolsUI/xToolsAnalyzerToolUi.cpp
@@ -40,7 +40,7 @@ void xToolsAnalyzerToolUi::onBaseToolUiInitialized(xToolsBaseTool *tool, const Q
     static QByteArray tips("invalid SAKAnalyzerTool");
     Q_ASSERT_X(cookedTool, __FUNCTION__, tips.constData());
     if (!cookedTool) {
-        qCWarning((*mLoggingCategory)) << QString::fromLatin1(tips);
+        qWarning() << QString::fromLatin1(tips);
         return;
     }
 
diff --git a/Source/Tools/ToolsUI/xToolsBaseToolUi.cpp b/Source/Tools/ToolsUI/xToolsBaseToolUi.cpp
index 06b16084..67ffa4bb 100644
--- a/Source/Tools/ToolsUI/xToolsBaseToolUi.cpp
+++ b/Source/Tools/ToolsUI/xToolsBaseToolUi.cpp
@@ -18,15 +18,8 @@ void xToolsBaseToolUi::initialize(xToolsBaseTool *tool,
                                   const char *loggingCategory)
 {
     m_tool = tool;
-    if (mLoggingCategory) {
-        delete mLoggingCategory;
-        mLoggingCategory = nullptr;
-    }
-
-    mLoggingCategory = new QLoggingCategory(loggingCategory);
-
     if (!tool) {
-        qCWarning((*mLoggingCategory)) << "The value of tool is nullptr!";
+        qWarning() << "The value of tool is nullptr!";
         return;
     }
 
diff --git a/Source/Tools/ToolsUI/xToolsBaseToolUi.h b/Source/Tools/ToolsUI/xToolsBaseToolUi.h
index 6ffed279..b3516781 100644
--- a/Source/Tools/ToolsUI/xToolsBaseToolUi.h
+++ b/Source/Tools/ToolsUI/xToolsBaseToolUi.h
@@ -8,7 +8,6 @@
  **************************************************************************************************/
 #pragma once
 
-#include <QLoggingCategory>
 #include <QWidget>
 
 class xToolsBaseTool;
diff --git a/Source/Tools/ToolsUI/xToolsEmitterToolUi.cpp b/Source/Tools/ToolsUI/xToolsEmitterToolUi.cpp
index c45e0139..94698e5e 100644
--- a/Source/Tools/ToolsUI/xToolsEmitterToolUi.cpp
+++ b/Source/Tools/ToolsUI/xToolsEmitterToolUi.cpp
@@ -12,7 +12,7 @@
 #include "xToolsApplication.h"
 
 xToolsEmitterToolUi::xToolsEmitterToolUi(QWidget *parent)
-    : xToolsTableModelToolUi{"sak.emittertoolui", parent}
+    : xToolsTableModelToolUi{parent}
 {
     mEditor = new xToolsEmitterToolUiEditor(xToolsApplication::mainWindow());
 }
diff --git a/Source/Tools/ToolsUI/xToolsMaskerToolUi.cpp b/Source/Tools/ToolsUI/xToolsMaskerToolUi.cpp
index 84df955a..d55a9e11 100644
--- a/Source/Tools/ToolsUI/xToolsMaskerToolUi.cpp
+++ b/Source/Tools/ToolsUI/xToolsMaskerToolUi.cpp
@@ -37,7 +37,7 @@ void xToolsMaskerToolUi::onBaseToolUiInitialized(xToolsBaseTool *tool, const QSt
 
     xToolsMaskerTool *cookedTool = qobject_cast<xToolsMaskerTool *>(tool);
     if (!cookedTool) {
-        qCWarning((*mLoggingCategory)) << "Invalid tool type!";
+        qWarning() << "Invalid tool type!";
         return;
     }
 
diff --git a/Source/Tools/ToolsUI/xToolsPrestorerToolUi.cpp b/Source/Tools/ToolsUI/xToolsPrestorerToolUi.cpp
index d88aa9e6..7e091838 100644
--- a/Source/Tools/ToolsUI/xToolsPrestorerToolUi.cpp
+++ b/Source/Tools/ToolsUI/xToolsPrestorerToolUi.cpp
@@ -21,7 +21,7 @@
 #include "xToolsApplication.h"
 
 xToolsPrestorerToolUi::xToolsPrestorerToolUi(QWidget *parent)
-    : xToolsTableModelToolUi{"SAK.PrestorerToolUi", parent}
+    : xToolsTableModelToolUi(parent)
 {
     mEditor = new xToolsPrestorerToolUiEditor(xToolsApplication::mainWindow());
     mMenu = new xToolsMenu();
diff --git a/Source/Tools/ToolsUI/xToolsResponserToolUi.cpp b/Source/Tools/ToolsUI/xToolsResponserToolUi.cpp
index ab19ea28..f9643cd9 100644
--- a/Source/Tools/ToolsUI/xToolsResponserToolUi.cpp
+++ b/Source/Tools/ToolsUI/xToolsResponserToolUi.cpp
@@ -20,7 +20,7 @@
 #include "xToolsApplication.h"
 
 xToolsResponserToolUi::xToolsResponserToolUi(QWidget *parent)
-    : xToolsTableModelToolUi{"sak.responsertoolui", parent}
+    : xToolsTableModelToolUi{parent}
 {
     mEditor = new xToolsResponserToolUiEditor(xToolsApplication::mainWindow());
 }
diff --git a/Source/Tools/ToolsUI/xToolsSerialPortToolUi.h b/Source/Tools/ToolsUI/xToolsSerialPortToolUi.h
index 9e2382f0..f96f6617 100644
--- a/Source/Tools/ToolsUI/xToolsSerialPortToolUi.h
+++ b/Source/Tools/ToolsUI/xToolsSerialPortToolUi.h
@@ -9,7 +9,6 @@
 #pragma once
 
 #include "xToolsCommunicationToolUi.h"
-#include <QLoggingCategory>
 
 namespace Ui {
 class xToolsSerialPortToolUi;
@@ -26,7 +25,6 @@ public:
 
 private:
     xToolsSerialPortTool *m_tool{nullptr};
-    const QLoggingCategory mLoggingCategory{"sak.serialporttoolui"};
 
 private:
     void checkInitializingStatus();
diff --git a/Source/Tools/ToolsUI/xToolsSerialPortTransmitterToolUi.cpp b/Source/Tools/ToolsUI/xToolsSerialPortTransmitterToolUi.cpp
index 183ced5a..2b47b19c 100644
--- a/Source/Tools/ToolsUI/xToolsSerialPortTransmitterToolUi.cpp
+++ b/Source/Tools/ToolsUI/xToolsSerialPortTransmitterToolUi.cpp
@@ -11,9 +11,9 @@
 #include "xToolsApplication.h"
 
 xToolsSerialPortTransmitterToolUi::xToolsSerialPortTransmitterToolUi(QWidget *parent)
-    : xToolsTransmitterToolUi("SAK.SerialPortTransmitterToolUi", parent)
+    : xToolsTransmitterToolUi(parent)
 {
-    mEditor = new xToolsSerialPortTransmitterToolUiEditor(xToolsApplication::mainWindow());
+    m_Editor = new xToolsSerialPortTransmitterToolUiEditor(xToolsApplication::mainWindow());
 }
 
 void xToolsSerialPortTransmitterToolUi::onBaseToolUiInitialized(xToolsBaseTool *tool,
@@ -25,5 +25,5 @@ void xToolsSerialPortTransmitterToolUi::onBaseToolUiInitialized(xToolsBaseTool *
 
 QDialog *xToolsSerialPortTransmitterToolUi::itemEditor()
 {
-    return mEditor;
+    return m_Editor;
 }
diff --git a/Source/Tools/ToolsUI/xToolsSerialPortTransmitterToolUi.h b/Source/Tools/ToolsUI/xToolsSerialPortTransmitterToolUi.h
index 45002452..15159955 100644
--- a/Source/Tools/ToolsUI/xToolsSerialPortTransmitterToolUi.h
+++ b/Source/Tools/ToolsUI/xToolsSerialPortTransmitterToolUi.h
@@ -22,5 +22,5 @@ protected:
     virtual QDialog *itemEditor() override;
 
 private:
-    xToolsSerialPortTransmitterToolUiEditor *mEditor;
+    xToolsSerialPortTransmitterToolUiEditor *m_Editor;
 };
diff --git a/Source/Tools/ToolsUI/xToolsSocketClientToolUi.h b/Source/Tools/ToolsUI/xToolsSocketClientToolUi.h
index 26dee148..b0070e77 100644
--- a/Source/Tools/ToolsUI/xToolsSocketClientToolUi.h
+++ b/Source/Tools/ToolsUI/xToolsSocketClientToolUi.h
@@ -9,7 +9,6 @@
 #pragma once
 
 #include "xToolsCommunicationToolUi.h"
-#include <QLoggingCategory>
 
 namespace Ui {
 class xToolsSocketClientToolUi;
diff --git a/Source/Tools/ToolsUI/xToolsSocketClientTransmitterToolUi.cpp b/Source/Tools/ToolsUI/xToolsSocketClientTransmitterToolUi.cpp
index 19b6460f..6d524c2c 100644
--- a/Source/Tools/ToolsUI/xToolsSocketClientTransmitterToolUi.cpp
+++ b/Source/Tools/ToolsUI/xToolsSocketClientTransmitterToolUi.cpp
@@ -10,15 +10,15 @@
 
 #include "xToolsApplication.h"
 
-xToolsSocketClientTransmitterToolUi::xToolsSocketClientTransmitterToolUi(const char *lg, QWidget *parent)
-    : xToolsTransmitterToolUi(lg, parent)
+xToolsSocketClientTransmitterToolUi::xToolsSocketClientTransmitterToolUi(QWidget *parent)
+    : xToolsTransmitterToolUi(parent)
 {
-    mEditor = new xToolsSocketClientTransmitterToolUiEditor(xToolsApplication::mainWindow());
+    m_editor = new xToolsSocketClientTransmitterToolUiEditor(xToolsApplication::mainWindow());
 }
 
 QDialog *xToolsSocketClientTransmitterToolUi::itemEditor()
 {
-    return mEditor;
+    return m_editor;
 }
 
 void xToolsSocketClientTransmitterToolUi::onBaseToolUiInitialized(xToolsBaseTool *tool,
@@ -27,5 +27,5 @@ void xToolsSocketClientTransmitterToolUi::onBaseToolUiInitialized(xToolsBaseTool
     xToolsTransmitterToolUi::onBaseToolUiInitialized(tool, settingGroup);
     setColumnVisible(4, false);
     setSectionResizeModeToStretch();
-    mEditor->setWebSocketContextVisible(false);
+    m_editor->setWebSocketContextVisible(false);
 }
diff --git a/Source/Tools/ToolsUI/xToolsSocketClientTransmitterToolUi.h b/Source/Tools/ToolsUI/xToolsSocketClientTransmitterToolUi.h
index 02315847..f199999f 100644
--- a/Source/Tools/ToolsUI/xToolsSocketClientTransmitterToolUi.h
+++ b/Source/Tools/ToolsUI/xToolsSocketClientTransmitterToolUi.h
@@ -14,12 +14,12 @@
 class xToolsSocketClientTransmitterToolUi : public xToolsTransmitterToolUi
 {
 public:
-    xToolsSocketClientTransmitterToolUi(const char *lg, QWidget *parent = nullptr);
+    xToolsSocketClientTransmitterToolUi(QWidget *parent = nullptr);
     virtual QDialog *itemEditor() override;
 
 protected:
     virtual void onBaseToolUiInitialized(xToolsBaseTool *tool, const QString &settingGroup) override;
 
 protected:
-    xToolsSocketClientTransmitterToolUiEditor *mEditor{nullptr};
+    xToolsSocketClientTransmitterToolUiEditor *m_editor{nullptr};
 };
diff --git a/Source/Tools/ToolsUI/xToolsSocketServerToolUi.h b/Source/Tools/ToolsUI/xToolsSocketServerToolUi.h
index 7746013e..e752d5cb 100644
--- a/Source/Tools/ToolsUI/xToolsSocketServerToolUi.h
+++ b/Source/Tools/ToolsUI/xToolsSocketServerToolUi.h
@@ -9,7 +9,6 @@
 #pragma once
 
 #include "xToolsCommunicationToolUi.h"
-#include <QLoggingCategory>
 
 namespace Ui {
 class xToolsSocketServerToolUi;
@@ -27,7 +26,6 @@ public:
 
 private:
     xToolsSocketServerTool *m_tool{nullptr};
-    const QLoggingCategory mLoggingCategory{"sak.socketservertoolui"};
 
 private:
     Ui::xToolsSocketServerToolUi *ui{nullptr};
diff --git a/Source/Tools/ToolsUI/xToolsStorerToolUi.cpp b/Source/Tools/ToolsUI/xToolsStorerToolUi.cpp
index d5903567..690dea3d 100644
--- a/Source/Tools/ToolsUI/xToolsStorerToolUi.cpp
+++ b/Source/Tools/ToolsUI/xToolsStorerToolUi.cpp
@@ -33,13 +33,13 @@ xToolsStorerToolUi::~xToolsStorerToolUi()
 void xToolsStorerToolUi::onBaseToolUiInitialized(xToolsBaseTool *tool, const QString &settingsGroup)
 {
     if (!tool) {
-        qCWarning((*mLoggingCategory)) << "The tool value is nullptr!";
+        qWarning() << "The tool value is nullptr!";
         return;
     }
 
     xToolsStorerTool *cookedTool = qobject_cast<xToolsStorerTool *>(tool);
     if (!cookedTool) {
-        qCWarning((*mLoggingCategory)) << "The cookedTool value is nullptr!";
+        qWarning() << "The cookedTool value is nullptr!";
         return;
     }
 
diff --git a/Source/Tools/ToolsUI/xToolsTableModelToolUi.cpp b/Source/Tools/ToolsUI/xToolsTableModelToolUi.cpp
index c0f272da..4ba58da4 100644
--- a/Source/Tools/ToolsUI/xToolsTableModelToolUi.cpp
+++ b/Source/Tools/ToolsUI/xToolsTableModelToolUi.cpp
@@ -21,9 +21,8 @@
 #include "xToolsTableModelTool.h"
 #include "xToolsApplication.h"
 
-xToolsTableModelToolUi::xToolsTableModelToolUi(const char *lg, QWidget *parent)
+xToolsTableModelToolUi::xToolsTableModelToolUi(QWidget *parent)
     : xToolsBaseToolUi{parent}
-    , mLoggingCategory{lg}
     , ui(new Ui::xToolsTableModelToolUi)
 {
     ui->setupUi(this);
diff --git a/Source/Tools/ToolsUI/xToolsTableModelToolUi.h b/Source/Tools/ToolsUI/xToolsTableModelToolUi.h
index 14c64fe0..38f39b48 100644
--- a/Source/Tools/ToolsUI/xToolsTableModelToolUi.h
+++ b/Source/Tools/ToolsUI/xToolsTableModelToolUi.h
@@ -11,7 +11,6 @@
 #include <QAbstractTableModel>
 #include <QActionGroup>
 #include <QJsonObject>
-#include <QLoggingCategory>
 #include <QMenu>
 #include <QModelIndex>
 #include <QWidget>
@@ -27,7 +26,7 @@ class xToolsTableModelToolUi : public xToolsBaseToolUi
 {
     Q_OBJECT
 public:
-    explicit xToolsTableModelToolUi(const char *lg, QWidget *parent = nullptr);
+    explicit xToolsTableModelToolUi(QWidget *parent = nullptr);
     ~xToolsTableModelToolUi();
     void setStretchSections(QList<int> columns);
     void setSectionResizeModeToStretch();
@@ -40,7 +39,6 @@ protected:
     virtual QDialog *itemEditor() = 0;
 
 protected:
-    const QLoggingCategory mLoggingCategory;
     QAbstractTableModel *mTableModel{nullptr};
     xToolsTableModelTool *mTableModelTool{nullptr};
 
diff --git a/Source/Tools/ToolsUI/xToolsTcpTransmitterToolUi.cpp b/Source/Tools/ToolsUI/xToolsTcpTransmitterToolUi.cpp
index 3cfb1ec9..050d3912 100644
--- a/Source/Tools/ToolsUI/xToolsTcpTransmitterToolUi.cpp
+++ b/Source/Tools/ToolsUI/xToolsTcpTransmitterToolUi.cpp
@@ -9,5 +9,5 @@
 #include "xToolsTcpTransmitterToolUi.h"
 
 xToolsTcpTransmitterToolUi::xToolsTcpTransmitterToolUi(QWidget *parent)
-    : xToolsSocketClientTransmitterToolUi{"SAK.TcpTransmitterToolUi", parent}
+    : xToolsSocketClientTransmitterToolUi{parent}
 {}
diff --git a/Source/Tools/ToolsUI/xToolsTransmitterToolUi.cpp b/Source/Tools/ToolsUI/xToolsTransmitterToolUi.cpp
index 382fbbc4..660eaea5 100644
--- a/Source/Tools/ToolsUI/xToolsTransmitterToolUi.cpp
+++ b/Source/Tools/ToolsUI/xToolsTransmitterToolUi.cpp
@@ -10,8 +10,8 @@
 
 #include "xToolsTransmitterTool.h"
 
-xToolsTransmitterToolUi::xToolsTransmitterToolUi(const char *lg, QWidget *parent)
-    : xToolsTableModelToolUi{lg, parent}
+xToolsTransmitterToolUi::xToolsTransmitterToolUi(QWidget *parent)
+    : xToolsTableModelToolUi{parent}
 {}
 
 void xToolsTransmitterToolUi::afterRowEdited(int row)
diff --git a/Source/Tools/ToolsUI/xToolsTransmitterToolUi.h b/Source/Tools/ToolsUI/xToolsTransmitterToolUi.h
index b4e2b8ce..9731701b 100644
--- a/Source/Tools/ToolsUI/xToolsTransmitterToolUi.h
+++ b/Source/Tools/ToolsUI/xToolsTransmitterToolUi.h
@@ -14,7 +14,7 @@ class xToolsTransmitterToolUi : public xToolsTableModelToolUi
 {
     Q_OBJECT
 public:
-    xToolsTransmitterToolUi(const char *lg, QWidget *parent = nullptr);
+    xToolsTransmitterToolUi(QWidget *parent = nullptr);
 
 protected:
     virtual void afterRowEdited(int row) override;
diff --git a/Source/Tools/ToolsUI/xToolsUdpTransmitterToolUi.cpp b/Source/Tools/ToolsUI/xToolsUdpTransmitterToolUi.cpp
index 0115473a..4e0ed308 100644
--- a/Source/Tools/ToolsUI/xToolsUdpTransmitterToolUi.cpp
+++ b/Source/Tools/ToolsUI/xToolsUdpTransmitterToolUi.cpp
@@ -9,5 +9,5 @@
 #include "xToolsUdpTransmitterToolUi.h"
 
 xToolsUdpTransmitterToolUi::xToolsUdpTransmitterToolUi(QWidget *parent)
-    : xToolsSocketClientTransmitterToolUi("SAK.SocketClientTransmitterToolUi", parent)
+    : xToolsSocketClientTransmitterToolUi(parent)
 {}
diff --git a/Source/Tools/ToolsUI/xToolsVelometerToolUi.h b/Source/Tools/ToolsUI/xToolsVelometerToolUi.h
index 9d4d2dee..13acf2c0 100644
--- a/Source/Tools/ToolsUI/xToolsVelometerToolUi.h
+++ b/Source/Tools/ToolsUI/xToolsVelometerToolUi.h
@@ -9,7 +9,6 @@
 #pragma once
 
 #include "xToolsBaseToolUi.h"
-#include <QLoggingCategory>
 
 namespace Ui {
 class xToolsVelometerToolUi;
@@ -26,6 +25,5 @@ protected:
     virtual void onBaseToolUiInitialized(xToolsBaseTool *tool, const QString &settingsGroup) final;
 
 private:
-    const QLoggingCategory mLoggingCategory{"sak.velometertoolui"};
     Ui::xToolsVelometerToolUi *ui;
 };
diff --git a/Source/Tools/ToolsUI/xToolsWebSocketTransmitterToolUi.cpp b/Source/Tools/ToolsUI/xToolsWebSocketTransmitterToolUi.cpp
index 5bac5f85..46d9175e 100644
--- a/Source/Tools/ToolsUI/xToolsWebSocketTransmitterToolUi.cpp
+++ b/Source/Tools/ToolsUI/xToolsWebSocketTransmitterToolUi.cpp
@@ -9,7 +9,7 @@
 #include "xToolsWebSocketTransmitterToolUi.h"
 
 xToolsWebSocketTransmitterToolUi::xToolsWebSocketTransmitterToolUi(QWidget *parent)
-    : xToolsSocketClientTransmitterToolUi("SAK.WebSocketTransmitterToolUi", parent)
+    : xToolsSocketClientTransmitterToolUi(parent)
 {}
 
 void xToolsWebSocketTransmitterToolUi::onBaseToolUiInitialized(xToolsBaseTool *tool,
@@ -18,5 +18,5 @@ void xToolsWebSocketTransmitterToolUi::onBaseToolUiInitialized(xToolsBaseTool *t
     xToolsSocketClientTransmitterToolUi::onBaseToolUiInitialized(tool, settingGroup);
 
     setColumnVisible(4, true);
-    mEditor->setWebSocketContextVisible(true);
+    m_editor->setWebSocketContextVisible(true);
 }