diff --git a/fairmq/CMakeLists.txt b/fairmq/CMakeLists.txt
index 115c6059..014b93b0 100644
--- a/fairmq/CMakeLists.txt
+++ b/fairmq/CMakeLists.txt
@@ -106,15 +106,6 @@ EndIf(NANOMSG_FOUND)
 # manual install (globbing add not recommended)
 Set(FAIRMQHEADERS
   FairMQParts.h
-  devices/GenericSampler.h
-  devices/GenericSampler.tpl
-  devices/GenericProcessor.h
-  devices/GenericFileSink.h
-  devices/BaseDeserializationPolicy.h
-  devices/BaseSerializationPolicy.h
-  devices/BaseProcessorTaskPolicy.h
-  devices/BaseSinkPolicy.h
-  devices/BaseSourcePolicy.h
   options/FairProgOptionsHelper.h
   tools/FairMQTools.h
   tools/FairMQDDSTools.h
diff --git a/fairmq/options/FairMQProgOptions.cxx b/fairmq/options/FairMQProgOptions.cxx
index d7654a8b..13d6ae9f 100644
--- a/fairmq/options/FairMQProgOptions.cxx
+++ b/fairmq/options/FairMQProgOptions.cxx
@@ -35,7 +35,7 @@ FairMQProgOptions::~FairMQProgOptions()
 
 void FairMQProgOptions::ParseAll(const int argc, char** argv, bool allowUnregistered)
 {
-    LOG(NOLOG) << "";
+    
     // init description
     InitOptionDescription();
     // parse command line options
diff --git a/fairmq/options/FairProgOptions.cxx b/fairmq/options/FairProgOptions.cxx
index 74c35b54..8129f9d6 100644
--- a/fairmq/options/FairProgOptions.cxx
+++ b/fairmq/options/FairProgOptions.cxx
@@ -32,6 +32,8 @@ FairProgOptions::FairProgOptions() :
                         fUseConfigFile(false),
                         fConfigFile()
 {
+
+    LOG(NOLOG) << "";// temporary hack to prevent throwing exception when accessing empty sinklist --> fixed me
     fGenericDesc.add_options()
         ("help,h", "produce help")
         ("version,v", "print version")