diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c2600b..e599c27 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,15 +22,21 @@ find_package(Qt5 COMPONENTS Core Widgets Network PrintSupport Svg Test REQUIRED)
 
 find_package(pybind11 CONFIG QUIET)
 if (NOT pybind11_FOUND)
-    execute_process(COMMAND git submodule init external/pybind11 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-    execute_process(COMMAND git submodule update external/pybind11 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+    if(NOT IS_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/external/pybind11)
+        message("Init submodule pybind11")
+        execute_process(COMMAND git submodule init external/pybind11 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+        execute_process(COMMAND git submodule update external/pybind11 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+    endif()
     add_subdirectory(external/pybind11)
 endif()
 
 find_package(libcatalogs CONFIG QUIET)
 if (NOT catalogs_FOUND)
-    execute_process(COMMAND git submodule init external/libcatalogs WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-    execute_process(COMMAND git submodule update external/libcatalogs WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+    if(NOT IS_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/external/libcatalogs)
+        message("Init submodule libcatalogs")
+        execute_process(COMMAND git submodule init external/libcatalogs WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+        execute_process(COMMAND git submodule update external/libcatalogs WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+    endif()
     add_subdirectory(external/libcatalogs)
 endif()
 
@@ -67,9 +73,9 @@ FILE (GLOB_RECURSE core_SRCS
     ./include/Data/ScalarSeries.h
     ./include/Data/DataSeriesMergeHelper.h
     ./include/Data/DataSeries.h
-    ./include/Data/AcquisitionDataPacket.h
+    #./include/Data/AcquisitionDataPacket.h
     ./include/Data/DataSeriesType.h
-    ./include/Data/AcquisitionRequest.h
+    #./include/Data/AcquisitionRequest.h
     ./include/Data/SqpIterator.h
     ./include/Data/ArrayData.h
     ./include/Data/DataSeriesIterator.h
diff --git a/include/Data/AcquisitionDataPacket.h b/include/Data/AcquisitionDataPacket.h
deleted file mode 100644
index ce61e2c..0000000
--- a/include/Data/AcquisitionDataPacket.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef SCIQLOP_ACQUISITIONDATAPACKET_H
-#define SCIQLOP_ACQUISITIONDATAPACKET_H
-
-#include <QObject>
-
-#include <Common/DateUtils.h>
-#include <Common/MetaTypes.h>
-#include <Data/IDataSeries.h>
-#include <Data/DateTimeRange.h>
-
-#include <memory>
-
-/**
- * @brief The AcquisitionDataPacket struct holds the information of an acquisition request result
- * part.
- */
-struct AcquisitionDataPacket {
-    std::shared_ptr<IDataSeries> m_DateSeries;
-    DateTimeRange m_Range;
-};
-
-SCIQLOP_REGISTER_META_TYPE(ACQUISITIONDATAPACKET_REGISTRY, AcquisitionDataPacket)
-SCIQLOP_REGISTER_META_TYPE(ACQUISITIONDATAPACKETVECTOR_REGISTRY, QVector<AcquisitionDataPacket>)
-
-#endif // SCIQLOP_ACQUISITIONREQUEST_H
diff --git a/include/Data/AcquisitionRequest.h b/include/Data/AcquisitionRequest.h
deleted file mode 100644
index 514868d..0000000
--- a/include/Data/AcquisitionRequest.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef SCIQLOP_ACQUISITIONREQUEST_H
-#define SCIQLOP_ACQUISITIONREQUEST_H
-
-#include <QObject>
-
-#include <QUuid>
-
-#include <Common/DateUtils.h>
-#include <Common/MetaTypes.h>
-#include <Data/DataProviderParameters.h>
-#include <Data/IDataProvider.h>
-#include <Data/DateTimeRange.h>
-
-#include <memory>
-
-/**
- * @brief The AcquisitionRequest struct holds the information of an variable request
- */
-struct AcquisitionRequest {
-    AcquisitionRequest()
-    {
-        m_AcqIdentifier = QUuid::createUuid();
-        m_Size = 0;
-        m_Progression = 0;
-    }
-
-    QUuid m_VarRequestId;
-    QUuid m_AcqIdentifier;
-    QUuid m_vIdentifier;
-    DataProviderParameters m_DataProviderParameters;
-    DateTimeRange m_RangeRequested;
-    DateTimeRange m_CacheRangeRequested;
-    int m_Size;
-    int m_Progression;
-    std::shared_ptr<IDataProvider> m_Provider;
-};
-
-SCIQLOP_REGISTER_META_TYPE(ACQUISITIONREQUEST_REGISTRY, AcquisitionRequest)
-
-#endif // SCIQLOP_ACQUISITIONREQUEST_H