diff --git a/Applications/DataExplorer/DataView/GEOModels.cpp b/Applications/DataExplorer/DataView/GEOModels.cpp
index 07956cace675ba0171eb2beba61c1dd6ea9947cb..ccb787e712a73517f929009d0a261923c7af8789 100644
--- a/Applications/DataExplorer/DataView/GEOModels.cpp
+++ b/Applications/DataExplorer/DataView/GEOModels.cpp
@@ -104,7 +104,8 @@ std::vector<std::string> GEOModels::getGeometryNames() const
 {
     return _geo_objects.getGeometryNames();
 }
-const std::vector<GeoLib::Point*>* GEOModels::getPointVec(const std::string& name) const
+const std::vector<GeoLib::Point*>* GEOModels::getPointVec(
+    const std::string& name) const
 {
     return _geo_objects.getPointVec(name);
 }
diff --git a/Applications/DataExplorer/DataView/ModellingTabWidget.cpp b/Applications/DataExplorer/DataView/ModellingTabWidget.cpp
index 553ba4622b9ec3ecd7f46e3d0389ce9d6be990c7..a72f055d741567c77022d07f429e248ae59809ca 100644
--- a/Applications/DataExplorer/DataView/ModellingTabWidget.cpp
+++ b/Applications/DataExplorer/DataView/ModellingTabWidget.cpp
@@ -12,8 +12,6 @@
  *
  */
 
-// ** INCLUDES **
-//#include "ProcessModel.h"
 #include "ModellingTabWidget.h"
 
 ModellingTabWidget::ModellingTabWidget(QWidget* parent /*= 0*/)
diff --git a/Applications/DataExplorer/DataView/ProcessView.cpp b/Applications/DataExplorer/DataView/ProcessView.cpp
index 93dab4ea009d47e9deea4e443d799c0bac6bfa36..e48aff67921209ec9a009fc5add451d8e43bf48b 100644
--- a/Applications/DataExplorer/DataView/ProcessView.cpp
+++ b/Applications/DataExplorer/DataView/ProcessView.cpp
@@ -17,7 +17,6 @@
 #include "CondItem.h"
 #include "ProcessModel.h"
 #include "ProcessVarItem.h"
-//#include "FEMConditionSetupDialog.h"
 #include "SelectMeshDialog.h"
 
 ProcessView::ProcessView(QWidget* parent) : QTreeView(parent) {}
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeNodeSelectionFilter.cpp b/Applications/DataExplorer/VtkVis/VtkCompositeNodeSelectionFilter.cpp
index cb279baec553d8e2aace97063227168a9a934ffe..7a3d6dfc5e7c86ef42ac7ad2d4e6b782b6e8edeb 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeNodeSelectionFilter.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeNodeSelectionFilter.cpp
@@ -12,16 +12,15 @@
  *
  */
 
-// ** INCLUDES **
 #include "VtkCompositeNodeSelectionFilter.h"
 
-#include <memory>
-//#include "VtkCompositePointToGlyphFilter.h"
 #include <vtkDataSetAlgorithm.h>
 #include <vtkGlyph3D.h>
 #include <vtkSmartPointer.h>
 #include <vtkSphereSource.h>
 
+#include <memory>
+
 #include "VtkPointsSource.h"
 
 VtkCompositeNodeSelectionFilter::VtkCompositeNodeSelectionFilter(
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeTextureOnSurfaceFilter.cpp b/Applications/DataExplorer/VtkVis/VtkCompositeTextureOnSurfaceFilter.cpp
index ac715ded592952d4bc76081fd692bb1b202b90d2..4f6c3b99c1fc56abb540141a6d1ad61fbcaa1dfc 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeTextureOnSurfaceFilter.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeTextureOnSurfaceFilter.cpp
@@ -12,7 +12,6 @@
  *
  */
 
-// ** INCLUDES **
 #include "VtkCompositeTextureOnSurfaceFilter.h"
 
 #include <vtkDataSetSurfaceFilter.h>
@@ -31,8 +30,6 @@
 #include <QFileInfo>
 #include <QSettings>
 
-//#include "VtkCompositeColormapToImageFilter.h"
-
 VtkCompositeTextureOnSurfaceFilter::VtkCompositeTextureOnSurfaceFilter(
     vtkAlgorithm* inputAlgorithm)
     : VtkCompositeFilter(inputAlgorithm)