diff --git a/include/Core/JPetCommonTools/JPetCommonTools.h b/include/Core/JPetCommonTools/JPetCommonTools.h
index 4e71975cf..7c3636d3f 100644
--- a/include/Core/JPetCommonTools/JPetCommonTools.h
+++ b/include/Core/JPetCommonTools/JPetCommonTools.h
@@ -16,12 +16,8 @@
 #ifndef COMMON_TOOLS_H
 #define COMMON_TOOLS_H
 
-#ifndef __CINT__
+
 #include <boost/noncopyable.hpp>
-#else
-namespace boost;
-class boost::noncopyable;
-#endif /* __CINT __ */
 #include <boost/filesystem.hpp>
 #include <ctime>
 #include <fstream>
diff --git a/include/Core/JPetLogger/JPetLogger.h b/include/Core/JPetLogger/JPetLogger.h
index 3c0cdec2c..36871b3b8 100644
--- a/include/Core/JPetLogger/JPetLogger.h
+++ b/include/Core/JPetLogger/JPetLogger.h
@@ -23,14 +23,12 @@
 #include <ostream>
 #include <string>
 
-#ifndef __CINT__
 #include <boost/log/attributes/attribute_cast.hpp>
 #include <boost/log/core.hpp>
 #include <boost/log/sinks/text_ostream_backend.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/log/utility/setup/common_attributes.hpp>
 #include <boost/log/utility/setup/file.hpp>
-#endif
 
 /**
  * @brief Simple logger class.
@@ -43,7 +41,6 @@
 
 class JPetLogger {
 public:
-#ifndef __CINT__
 
   static boost::log::sources::severity_logger<boost::log::trivial::severity_level>& getSeverity()
   {
@@ -73,11 +70,6 @@ class JPetLogger {
   static void setThreadsEnabled(bool value) { JPetLogger::getInstance().isThreadsEnabled = value; }
 
   static void setRotationSize(unsigned int value) { JPetLogger::getInstance().backend->set_rotation_size(value); }
-#else
-  void getSeverity();
-  void formatter();
-  void setLogLevel();
-#endif
 
 private:
   JPetLogger();
@@ -86,14 +78,12 @@ class JPetLogger {
 
   const int kRotationSize = 10 * 1024 * 1024; // 10 * MiB, log will rotate after 10MiB
 
-#ifndef __CINT__
   void init();
   boost::shared_ptr<JPetTextFileBackend> backend;
   typedef boost::log::sinks::synchronous_sink<JPetTextFileBackend> sink_t;
   boost::shared_ptr<sink_t> sink;
 
   bool isThreadsEnabled = false;
-#endif
 };
 
 #endif /* !JPETLOGGER_H */
diff --git a/include/Core/JPetLogger/JPetTMessageHandler.h b/include/Core/JPetLogger/JPetTMessageHandler.h
index 5a79447e6..1158fe044 100644
--- a/include/Core/JPetLogger/JPetTMessageHandler.h
+++ b/include/Core/JPetLogger/JPetTMessageHandler.h
@@ -22,11 +22,8 @@ class JPetTMessageHandler : public TMessageHandler
 public:
   JPetTMessageHandler();
   ~JPetTMessageHandler();
-#ifndef __CINT__
   Bool_t Notify() override;
-#else
-  Bool_t Notify();
-#endif
+
 };
 
 #endif /* !JPETTMESSAGEHANDLER_H */
diff --git a/include/Core/JPetLoggerInclude.h b/include/Core/JPetLoggerInclude.h
index 5e2015c95..49d5c6fe5 100644
--- a/include/Core/JPetLoggerInclude.h
+++ b/include/Core/JPetLoggerInclude.h
@@ -27,10 +27,9 @@
 
 #include "./JPetLogger/JPetLogger.h"
 
-#ifndef __CINT__
 #include <boost/log/attributes/scoped_attribute.hpp>
 #include <boost/log/utility/manipulators/add_value.hpp>
-#endif
+
 
 /* Macro with multi-line statement
  * DO not use directly, instead use INFO, WARNING, ERROR, DEBUG or LOG macros
diff --git a/include/Core/JPetReader/JPetReader.h b/include/Core/JPetReader/JPetReader.h
index 231e278ab..0675b5949 100644
--- a/include/Core/JPetReader/JPetReader.h
+++ b/include/Core/JPetReader/JPetReader.h
@@ -24,12 +24,7 @@
 #include <TTree.h>
 #include <vector>
 
-#ifndef __CINT__
 #include <boost/noncopyable.hpp>
-#else
-namespace boost;
-class boost::noncopyable;
-#endif /* __CINT __ */
 
 /**
  * @brief A class responsible for reading any data from ROOT trees.
diff --git a/include/Core/JPetWriter/JPetWriter.h b/include/Core/JPetWriter/JPetWriter.h
index 19a204754..99e393138 100644
--- a/include/Core/JPetWriter/JPetWriter.h
+++ b/include/Core/JPetWriter/JPetWriter.h
@@ -16,12 +16,7 @@
 #ifndef JPETWRITER_H
 #define JPETWRITER_H
 
-#ifndef __CINT__
 #include <boost/noncopyable.hpp>
-#else
-namespace boost;
-class boost::noncopyable;
-#endif /* __CINT __ */
 
 #include "JPetBarrelSlot/JPetBarrelSlot.h"
 #include "JPetBaseHit/JPetBaseHit.h"
diff --git a/include/DataObjects/JPetBaseSignal/JPetBaseSignal.h b/include/DataObjects/JPetBaseSignal/JPetBaseSignal.h
index 62c2086b0..d1424fbc1 100644
--- a/include/DataObjects/JPetBaseSignal/JPetBaseSignal.h
+++ b/include/DataObjects/JPetBaseSignal/JPetBaseSignal.h
@@ -78,12 +78,8 @@ class JPetBaseSignal: public TObject
   RecoFlag fFlag = JPetBaseSignal::Unknown;
 
 protected:
-  #ifndef __CINT__
   bool fIsNullObject = false;
-  #else
-  bool fIsNullObject;
-  #endif
-
+  
   ClassDef(JPetBaseSignal, 5);
 
 };
diff --git a/include/DataObjects/JPetEvent/JPetEvent.h b/include/DataObjects/JPetEvent/JPetEvent.h
index 085380ddb..3e6be66ea 100644
--- a/include/DataObjects/JPetEvent/JPetEvent.h
+++ b/include/DataObjects/JPetEvent/JPetEvent.h
@@ -63,11 +63,7 @@ class JPetEvent: public TObject
 
 protected:
   std::vector<JPetHit> fHits;
-#ifndef __CINT__
   JPetEventType fType = JPetEventType::kUnknown;
-#else
-  JPetEventType fType;
-#endif
 
 private:
   RecoFlag fFlag = JPetEvent::Unknown;
diff --git a/include/DataObjects/JPetPhysSignal/JPetPhysSignal.h b/include/DataObjects/JPetPhysSignal/JPetPhysSignal.h
index 9e30c05da..cf1855f4c 100644
--- a/include/DataObjects/JPetPhysSignal/JPetPhysSignal.h
+++ b/include/DataObjects/JPetPhysSignal/JPetPhysSignal.h
@@ -111,12 +111,8 @@ class JPetPhysSignal: public JPetBaseSignal
   JPetRecoSignal fRecoSignal;
 
 protected:
-  #ifndef __CINT__
   bool fIsNullObject = false;
-  #else
-  bool fIsNullObject;
-  #endif
-
+  
   ClassDef(JPetPhysSignal, 3);
 
 };
diff --git a/include/GeantParser/JPetGeantParser/JPetGeantParser.h b/include/GeantParser/JPetGeantParser/JPetGeantParser.h
index 166a2d1ae..5f05b5465 100644
--- a/include/GeantParser/JPetGeantParser/JPetGeantParser.h
+++ b/include/GeantParser/JPetGeantParser/JPetGeantParser.h
@@ -31,11 +31,6 @@
 
 class JPetWriter;
 
-#ifdef __CINT__
-// when cint is used instead of compiler, override word is not recognized
-// nevertheless it's needed for checking if the structure of project is correct
-#define override
-#endif
 
 /**
  * @brief      Module responsible for creating JPetMCHit from GEANT MC simulations
diff --git a/include/GeantParser/JPetGeantParser/JPetGeantParserTools.h b/include/GeantParser/JPetGeantParser/JPetGeantParserTools.h
index bd03c9d2d..55c253919 100644
--- a/include/GeantParser/JPetGeantParser/JPetGeantParserTools.h
+++ b/include/GeantParser/JPetGeantParser/JPetGeantParserTools.h
@@ -31,12 +31,6 @@
 #include <tuple>
 #include <vector>
 
-#ifdef __CINT__
-// when cint is used instead of compiler, override word is not recognized
-// nevertheless it's needed for checking if the structure of project is correct
-#define override
-#endif
-
 class JPetGeantParserTools
 {
 public:
diff --git a/src/Core/JPetLoggerInclude.h b/src/Core/JPetLoggerInclude.h
index 9549e3bca..53b7406ab 100644
--- a/src/Core/JPetLoggerInclude.h
+++ b/src/Core/JPetLoggerInclude.h
@@ -27,10 +27,8 @@
 
 #include "JPetLogger/JPetLogger.h"
 
-#ifndef __CINT__
 #include <boost/log/attributes/scoped_attribute.hpp>
 #include <boost/log/utility/manipulators/add_value.hpp>
-#endif
 
 /* Macro with multi-line statement
  * DO not use directly, instead use INFO, WARNING, ERROR, DEBUG or LOG macros
diff --git a/src/JPetFramework_LinkDef.h b/src/JPetFramework_LinkDef.h
index 459a674c2..8bfb5f6cd 100644
--- a/src/JPetFramework_LinkDef.h
+++ b/src/JPetFramework_LinkDef.h
@@ -1,5 +1,3 @@
-#ifdef __CINT__
-
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
@@ -82,4 +80,3 @@
 #pragma link C++ struct JPetScin::ScinDimensions + ;
 #pragma link C++ struct JPetTreeHeader::ProcessingStageInfo + ;
 
-#endif