diff --git a/GUI/Model/Data/SpecularDataItem.h b/GUI/Model/Data/SpecularDataItem.h
index 8ccb1d78ab46bf7ccccd8ea08d1f8e9154e5b29d..75f578b08df869e8ddb974a538c2c9882707a977 100644
--- a/GUI/Model/Data/SpecularDataItem.h
+++ b/GUI/Model/Data/SpecularDataItem.h
@@ -20,7 +20,6 @@
 
 class SpecularDataItem : public DataItem {
     Q_OBJECT
-
 public:
     static constexpr auto M_TYPE{"SpecularData"};
 
diff --git a/GUI/Model/Device/PointwiseAxisItem.h b/GUI/Model/Device/PointwiseAxisItem.h
index 56b96c1249c586113e0b0ae92de729ba2e3e7ad5..dd921d996fa62db93e23fc00f313260a35812170 100644
--- a/GUI/Model/Device/PointwiseAxisItem.h
+++ b/GUI/Model/Device/PointwiseAxisItem.h
@@ -22,8 +22,6 @@ class SpecularInstrumentItem;
 
 //! Item for non-uniform axis with specified coordinates.
 class PointwiseAxisItem : public BasicAxisItem {
-    Q_OBJECT
-
 public:
     explicit PointwiseAxisItem(QObject* parent = nullptr);
     ~PointwiseAxisItem() override;
diff --git a/GUI/Model/Model/FitParameterModel.h b/GUI/Model/Model/FitParameterModel.h
index 99e2a8708597ed3bf997561c256ee63a35dd17dc..8da67f9b4335d07d12cdccfdea06d6bb65065fc9 100644
--- a/GUI/Model/Model/FitParameterModel.h
+++ b/GUI/Model/Model/FitParameterModel.h
@@ -24,7 +24,6 @@ class JobItem;
 //! Model to show items from FitParameterContainer in 5 column tree view.
 class FitParameterModel : public QAbstractItemModel {
     Q_OBJECT
-
 public:
     explicit FitParameterModel(FitParameterContainerItem* fitParContainer, JobItem* jobItem);
 
diff --git a/GUI/Model/Model/ParameterTuningModel.h b/GUI/Model/Model/ParameterTuningModel.h
index dda681b88c28d90b79edcded562258cfcec3dd71..a3b5633f1ec9ad719197c881f3b38410e47f6bdc 100644
--- a/GUI/Model/Model/ParameterTuningModel.h
+++ b/GUI/Model/Model/ParameterTuningModel.h
@@ -20,15 +20,10 @@ class ParameterLabelItem;
 
 #include <QAbstractItemModel>
 
-//!
-//! \brief The ParameterTuningModel class represents parameters which can be tuned in real time
-//! in ParameterTuningWidget. In the fitting activity context handles dragging of ParameterItem's
-//! to the FitParametersWidget.
-//!
+//! Represents parameters which can be tuned in real time in ParameterTuningWidget.
+//! In the fitting activity context handles dragging of ParameterItem's to the FitParametersWidget.
 
 class ParameterTuningModel : public QAbstractItemModel {
-    Q_OBJECT
-
 public:
     ParameterTuningModel(QObject* rootObject, QObject* parent = nullptr);
 
diff --git a/GUI/View/Job/JobPropertiesTableModel.cpp b/GUI/View/Job/JobPropertiesTableModel.cpp
index 04706806137728cb43fcbcba0969aa2e8e913fc3..3a85463a14010576bbf94c4417e4665677236267 100644
--- a/GUI/View/Job/JobPropertiesTableModel.cpp
+++ b/GUI/View/Job/JobPropertiesTableModel.cpp
@@ -20,14 +20,12 @@
 namespace {
 
 namespace Column {
-
 enum Columns { Name, Value };
 }
 const QString ColumnNames[] = {"Name", "Value"};
 const int NumColumns = (int)std::size(ColumnNames);
 
 namespace Row {
-
 enum Rows { Name, Sample, Instrument, Status, Begin, End, Duration };
 }
 const QString RowNames[] = {"Name", "Sample", "Instrument", "Status", "Begin", "End", "Duration"};
@@ -37,14 +35,6 @@ const QString ModelDateShortFormat = "yyyy.MM.dd hh:mm:ss";
 
 } // namespace
 
-//==================================================================================================
-// JobPropertiesTableModel
-//==================================================================================================
-
-//--------------------------------------------------------------------------------------------------
-// public member functions
-//--------------------------------------------------------------------------------------------------
-
 JobPropertiesTableModel::JobPropertiesTableModel(QObject* parent)
     : QAbstractTableModel(parent)
     , m_item(nullptr)
@@ -151,10 +141,6 @@ void JobPropertiesTableModel::setJobItem(JobItem* jobItem)
     endResetModel();
 }
 
-//--------------------------------------------------------------------------------------------------
-// private member functions
-//--------------------------------------------------------------------------------------------------
-
 void JobPropertiesTableModel::notifyJobPropertyChange()
 {
     // name
diff --git a/GUI/View/Job/JobPropertiesTableModel.h b/GUI/View/Job/JobPropertiesTableModel.h
index bf8c665d2b560c7b46863609d35511b21554eae7..f11f76230432393561e3042e61172424b622a6f5 100644
--- a/GUI/View/Job/JobPropertiesTableModel.h
+++ b/GUI/View/Job/JobPropertiesTableModel.h
@@ -19,12 +19,10 @@
 
 class JobItem;
 
-
-//! The JobPropertiesTableModel is a table model for the properties of a job except for the comment.
+//! A table model for the properties of a job except for the comment.
 //! The name of the job is editable, all other fields are read only.
 
 class JobPropertiesTableModel : public QAbstractTableModel {
-    Q_OBJECT
 public:
     explicit JobPropertiesTableModel(QObject* parent = nullptr);
     ~JobPropertiesTableModel() override;
diff --git a/GUI/View/Job/JobResultsPresenter.h b/GUI/View/Job/JobResultsPresenter.h
index ee42d0df114840e2a3041d5005a96e25bc2c2072..73311c841c34a2f8737324d63d33d8bfaf3a85d8 100644
--- a/GUI/View/Job/JobResultsPresenter.h
+++ b/GUI/View/Job/JobResultsPresenter.h
@@ -24,7 +24,6 @@ enum class JobViewActivity;
 //! right top corner of JobView, to switch between widgets.
 
 class JobResultsPresenter : public ItemComboWidget {
-    Q_OBJECT
 public:
     explicit JobResultsPresenter(QWidget* parent = nullptr);
 
diff --git a/GUI/View/Numeric/SafeSpinBox.h b/GUI/View/Numeric/SafeSpinBox.h
index 8370c3e7cf97ec35d6b3d0b4a2dba85babd5b787..ed57c6f647679629203d9c8c31a672ba635b2719 100644
--- a/GUI/View/Numeric/SafeSpinBox.h
+++ b/GUI/View/Numeric/SafeSpinBox.h
@@ -20,7 +20,6 @@
 //! Spinbox that enables scrolling only on focus
 
 class SafeSpinBox : public QSpinBox {
-    Q_OBJECT
 public:
     explicit SafeSpinBox(bool easyScrollable = false, QWidget* parent = nullptr);