diff --git a/GUI/Model/Model/ApplicationModels.h b/GUI/Model/Model/ApplicationModels.h
index 37ebbea0068ec86b962fc375a267c15cc40d8dd1..c013dfef7f1fd27f01ce0d08102ad5df9ba44bce 100644
--- a/GUI/Model/Model/ApplicationModels.h
+++ b/GUI/Model/Model/ApplicationModels.h
@@ -19,7 +19,6 @@
 #include "GUI/Model/Model/RealModel.h"
 #include <QObject>
 
-class SessionModel;
 class DataItem;
 class DocumentModel;
 class InstrumentModel;
diff --git a/GUI/View/Common/ItemStackWidget.cpp b/GUI/View/Common/ItemStackWidget.cpp
index b416f0f81d393fa69af1679e16916ee1b5ab5378..1e8c28c5ee435e3e162174bc1669cdd47d15edad 100644
--- a/GUI/View/Common/ItemStackWidget.cpp
+++ b/GUI/View/Common/ItemStackWidget.cpp
@@ -13,7 +13,6 @@
 //  ************************************************************************************************
 
 #include "GUI/View/Common/ItemStackWidget.h"
-#include "GUI/Model/Model/SessionModel.h"
 #include "GUI/Util/Error.h"
 #include <QStackedWidget>
 #include <QVBoxLayout>
diff --git a/GUI/View/Common/ItemStackWidget.h b/GUI/View/Common/ItemStackWidget.h
index 61054f807f607e4e1b48c7e2f99951f53a10daed..9e5621813563448606e2017c816a8a1b7dcc8f9b 100644
--- a/GUI/View/Common/ItemStackWidget.h
+++ b/GUI/View/Common/ItemStackWidget.h
@@ -18,7 +18,7 @@
 #include <QWidget>
 
 //! The ItemStackWidget class contains a stack of widgets presenting top level items
-//! of SessionModel. Every item corresponds to its own widget.
+//! like JobModel and RealModel. Every item corresponds to its own widget.
 
 //! This is the base for ItemStackPresenter, which actually contains item
 //! specific editor's logic. Used in InstrumentView, ImportDataView, JobView to show editors for
diff --git a/GUI/View/Fit/FitParameterDelegate.h b/GUI/View/Fit/FitParameterDelegate.h
index e1b5dd590e4963a3f10aa52012b8e4084ec13d01..49ba34890f57bc6bc04d05ac1528130c7ffc402b 100644
--- a/GUI/View/Fit/FitParameterDelegate.h
+++ b/GUI/View/Fit/FitParameterDelegate.h
@@ -17,7 +17,7 @@
 
 #include <QStyledItemDelegate>
 
-//! The FitParameterDelegate class presents the content of SessionModel items in
+//! The FitParameterDelegate class presents the content of items in
 //! standard QTreeView. Extents base QItemDelegate with possibility to show/edit
 //! our custom QVariant's.
 
diff --git a/GUI/View/Import/RealDataMaskWidget.cpp b/GUI/View/Import/RealDataMaskWidget.cpp
index c84e5ba0ce40b5b82074ceb2bd5d243a81dd6b62..1d656190f6fe918f2772808923115509f89ba87b 100644
--- a/GUI/View/Import/RealDataMaskWidget.cpp
+++ b/GUI/View/Import/RealDataMaskWidget.cpp
@@ -16,7 +16,6 @@
 #include "GUI/Model/Data/IntensityDataItem.h"
 #include "GUI/Model/Data/ProjectionItems.h"
 #include "GUI/Model/Device/MaskItems.h"
-#include "GUI/Model/Model/SessionModel.h"
 #include "GUI/View/Mask/MaskEditorActions.h"
 #include "GUI/View/Mask/MaskEditorCanvas.h"
 #include "GUI/View/Mask/MaskEditorPropertyPanel.h"
diff --git a/GUI/View/Mask/MaskEditorActions.cpp b/GUI/View/Mask/MaskEditorActions.cpp
index 2def2699798151a0894530c31eca240b8b29b809..8fc8d9984f7a606002f4cc63422181c16c557b1c 100644
--- a/GUI/View/Mask/MaskEditorActions.cpp
+++ b/GUI/View/Mask/MaskEditorActions.cpp
@@ -14,7 +14,6 @@
 
 #include "GUI/View/Mask/MaskEditorActions.h"
 #include "GUI/Model/Device/MaskItems.h"
-#include "GUI/Model/Model/SessionModel.h"
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/Util/ActionFactory.h"
 #include <QAction>
diff --git a/GUI/View/Mask/MaskEditorCanvas.h b/GUI/View/Mask/MaskEditorCanvas.h
index 9bf0ff0681637e0bac7d9fbb3c9bb732d0741eb5..d12500036d7fd734422b504828d8274a6e316c8e 100644
--- a/GUI/View/Mask/MaskEditorCanvas.h
+++ b/GUI/View/Mask/MaskEditorCanvas.h
@@ -20,7 +20,6 @@
 
 class MaskGraphicsScene;
 class MaskGraphicsView;
-class SessionModel;
 class QItemSelectionModel;
 class QModelIndex;
 class MaskResultsPresenter;
diff --git a/GUI/View/Mask/MaskEditorPropertyPanel.cpp b/GUI/View/Mask/MaskEditorPropertyPanel.cpp
index ed782a8d1350e7b736dfec0d5e250f4584b880f4..7aa5f7545be7a49a589063340e32af807a60951b 100644
--- a/GUI/View/Mask/MaskEditorPropertyPanel.cpp
+++ b/GUI/View/Mask/MaskEditorPropertyPanel.cpp
@@ -15,7 +15,6 @@
 #include "GUI/View/Mask/MaskEditorPropertyPanel.h"
 #include "GUI/Model/Data/IntensityDataItem.h"
 #include "GUI/Model/Device/MaskItems.h"
-#include "GUI/Model/Model/SessionModel.h"
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/View/Common/DoubleSpinBox.h"
 #include "GUI/View/Plot2D/IntensityDataPropertyWidget.h"
diff --git a/GUI/View/Mask/MaskResultsPresenter.cpp b/GUI/View/Mask/MaskResultsPresenter.cpp
index 304fecf4b0b3c09dd9d40ebe0d2983478b66eccc..35cd0e785f5b474845609ab86eca9a9c2e21cb31 100644
--- a/GUI/View/Mask/MaskResultsPresenter.cpp
+++ b/GUI/View/Mask/MaskResultsPresenter.cpp
@@ -17,7 +17,6 @@
 #include "Device/Mask/IShape2D.h"
 #include "GUI/Model/Data/IntensityDataItem.h"
 #include "GUI/Model/Device/MaskItems.h"
-#include "GUI/Model/Model/SessionModel.h"
 #include <QVBoxLayout>
 
 MaskResultsPresenter::MaskResultsPresenter(QWidget* parent)
@@ -47,7 +46,7 @@ void MaskResultsPresenter::updatePresenter(MaskEditorFlags::PresentationType pre
         setOriginalMode();
 }
 
-//! Update IntensityDataItem in SessionModel to represent masked areas. Corresponding
+//! Update IntensityDataItem to represent masked areas. Corresponding
 //! bins of Datafield will be put to zero.
 
 void MaskResultsPresenter::setShowMaskMode()
diff --git a/GUI/View/Projection/IntensityDataProjectionsWidget.cpp b/GUI/View/Projection/IntensityDataProjectionsWidget.cpp
index 405dcfb65e572285662042d2e36c0aac49c2019f..4314aaf0b7ee4b8e8223e69e488c5b72c7a33bcb 100644
--- a/GUI/View/Projection/IntensityDataProjectionsWidget.cpp
+++ b/GUI/View/Projection/IntensityDataProjectionsWidget.cpp
@@ -15,7 +15,6 @@
 #include "GUI/View/Projection/IntensityDataProjectionsWidget.h"
 #include "GUI/Model/Data/IntensityDataItem.h"
 #include "GUI/Model/Data/ProjectionItems.h"
-#include "GUI/Model/Model/SessionModel.h"
 #include "GUI/View/Plot2D/IntensityDataPropertyWidget.h"
 #include "GUI/View/Projection/ProjectionsEditorActions.h"
 #include "GUI/View/Projection/ProjectionsEditorCanvas.h"
diff --git a/GUI/View/Projection/ProjectionsEditorActions.cpp b/GUI/View/Projection/ProjectionsEditorActions.cpp
index e312eed1f04981798f1ab4a5cf8bef50ac7b6bac..07cec543aa88a811a2eb553386cb5ce9a17ed993 100644
--- a/GUI/View/Projection/ProjectionsEditorActions.cpp
+++ b/GUI/View/Projection/ProjectionsEditorActions.cpp
@@ -15,7 +15,6 @@
 #include "GUI/View/Projection/ProjectionsEditorActions.h"
 #include "GUI/Model/Data/IntensityDataItem.h"
 #include "GUI/Model/Data/ProjectionItems.h"
-#include "GUI/Model/Model/SessionModel.h"
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/View/Projection/SaveProjectionsAssistant.h"
 #include <QAction>
diff --git a/GUI/View/Projection/ProjectionsEditorCanvas.cpp b/GUI/View/Projection/ProjectionsEditorCanvas.cpp
index 106e82e2d359156ef7c61315cdab82f3715773fb..e18717e1c29eeff8b7bf1d497aedd132ec34b416 100644
--- a/GUI/View/Projection/ProjectionsEditorCanvas.cpp
+++ b/GUI/View/Projection/ProjectionsEditorCanvas.cpp
@@ -16,7 +16,6 @@
 #include "GUI/Model/Data/IntensityDataItem.h"
 #include "GUI/Model/Data/ProjectionItems.h"
 #include "GUI/Model/Device/MaskItems.h"
-#include "GUI/Model/Model/SessionModel.h"
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/View/Mask/MaskGraphicsScene.h"
 #include "GUI/View/Mask/MaskGraphicsView.h"
diff --git a/GUI/View/Projection/ProjectionsEditorCanvas.h b/GUI/View/Projection/ProjectionsEditorCanvas.h
index 323b4e6ac141ce33e18101f2475366e69c4f5df7..ea4630b4dc695e11bd1e4348f1b95c40830b2cd3 100644
--- a/GUI/View/Projection/ProjectionsEditorCanvas.h
+++ b/GUI/View/Projection/ProjectionsEditorCanvas.h
@@ -22,7 +22,6 @@
 
 class MaskGraphicsScene;
 class MaskGraphicsView;
-class SessionModel;
 class IntensityDataItem;
 class ColorMap;
 class PlotStatusLabel;
diff --git a/Tests/Unit/GUI/TestDataItems.cpp b/Tests/Unit/GUI/TestDataItems.cpp
index f5272b5f5f7ca95c7946d57f537826909557f7e5..d255d002886a62081682062c97c957cd583cd6fd 100644
--- a/Tests/Unit/GUI/TestDataItems.cpp
+++ b/Tests/Unit/GUI/TestDataItems.cpp
@@ -10,8 +10,7 @@ public:
     template <typename T>
     void testItemClock()
     {
-        SessionModel model("TempModel");
-        DataItem* item = model.insertItem<T>();
+        DataItem* item = new T();
 
         QDateTime time = QDateTime::currentDateTime();
         item->setLastModified(time);
@@ -43,12 +42,12 @@ public:
     }
 };
 
-//TEST_F(TestDataItems, testSpecularItemClock)
-//{
-//    testItemClock<SpecularDataItem>();
-//}
+TEST_F(TestDataItems, testSpecularItemClock)
+{
+    testItemClock<SpecularDataItem>();
+}
 
-//TEST_F(TestDataItems, testIntensityItemClock)
-//{
-//    testItemClock<IntensityDataItem>();
-//}
+TEST_F(TestDataItems, testIntensityItemClock)
+{
+    testItemClock<IntensityDataItem>();
+}