diff --git a/python/src/detector.cpp b/python/src/detector.cpp
index 64548f808..d3e61c998 100644
--- a/python/src/detector.cpp
+++ b/python/src/detector.cpp
@@ -346,6 +346,14 @@ void init_det(py::module &m) {
                                  sls::Positions)) &
                  Detector::setExternalSignalFlags,
              py::arg(), py::arg(), py::arg() = Positions{})
+        .def("getParallelMode",
+             (Result<bool>(Detector::*)(sls::Positions) const) &
+                 Detector::getParallelMode,
+             py::arg() = Positions{})
+        .def("setParallelMode",
+             (void (Detector::*)(bool, sls::Positions)) &
+                 Detector::setParallelMode,
+             py::arg(), py::arg() = Positions{})
         .def("acquire", (void (Detector::*)()) & Detector::acquire)
         .def("clearAcquiringFlag",
              (void (Detector::*)()) & Detector::clearAcquiringFlag)
@@ -779,14 +787,6 @@ void init_det(py::module &m) {
              (void (Detector::*)(const std::string &, sls::Positions)) &
                  Detector::setSettingsPath,
              py::arg(), py::arg() = Positions{})
-        .def("getParallelMode",
-             (Result<bool>(Detector::*)(sls::Positions) const) &
-                 Detector::getParallelMode,
-             py::arg() = Positions{})
-        .def("setParallelMode",
-             (void (Detector::*)(bool, sls::Positions)) &
-                 Detector::setParallelMode,
-             py::arg(), py::arg() = Positions{})
         .def("getOverFlowMode",
              (Result<bool>(Detector::*)(sls::Positions) const) &
                  Detector::getOverFlowMode,
@@ -1344,31 +1344,6 @@ void init_det(py::module &m) {
                                  sls::Positions)) &
                  Detector::setAdditionalJsonParameter,
              py::arg(), py::arg(), py::arg() = Positions{})
-        .def("getDetectorMinMaxEnergyThreshold",
-             (Result<int>(Detector::*)(const bool, sls::Positions) const) &
-                 Detector::getDetectorMinMaxEnergyThreshold,
-             py::arg(), py::arg() = Positions{})
-        .def("setDetectorMinMaxEnergyThreshold",
-             (void (Detector::*)(const bool, const int, sls::Positions)) &
-                 Detector::setDetectorMinMaxEnergyThreshold,
-             py::arg(), py::arg(), py::arg() = Positions{})
-        .def("getFrameMode",
-             (Result<defs::frameModeType>(Detector::*)(sls::Positions) const) &
-                 Detector::getFrameMode,
-             py::arg() = Positions{})
-        .def("setFrameMode",
-             (void (Detector::*)(defs::frameModeType, sls::Positions)) &
-                 Detector::setFrameMode,
-             py::arg(), py::arg() = Positions{})
-        .def("getDetectorMode",
-             (Result<defs::detectorModeType>(Detector::*)(sls::Positions)
-                  const) &
-                 Detector::getDetectorMode,
-             py::arg() = Positions{})
-        .def("setDetectorMode",
-             (void (Detector::*)(defs::detectorModeType, sls::Positions)) &
-                 Detector::setDetectorMode,
-             py::arg(), py::arg() = Positions{})
         .def("programFPGA",
              (void (Detector::*)(const std::string &, sls::Positions)) &
                  Detector::programFPGA,
diff --git a/python/src/enums.cpp b/python/src/enums.cpp
index aa32559b8..2c854eca0 100644
--- a/python/src/enums.cpp
+++ b/python/src/enums.cpp
@@ -259,20 +259,6 @@ void init_enums(py::module &m) {
         .value("IS_SLAVE", slsDetectorDefs::masterFlags::IS_SLAVE)
         .export_values();
 
-    py::enum_<slsDetectorDefs::frameModeType>(Defs, "frameModeType")
-        .value("PEDESTAL", slsDetectorDefs::frameModeType::PEDESTAL)
-        .value("NEW_PEDESTAL", slsDetectorDefs::frameModeType::NEW_PEDESTAL)
-        .value("FLATFIELD", slsDetectorDefs::frameModeType::FLATFIELD)
-        .value("NEW_FLATFIELD", slsDetectorDefs::frameModeType::NEW_FLATFIELD)
-        .export_values();
-
-    py::enum_<slsDetectorDefs::detectorModeType>(Defs, "detectorModeType")
-        .value("COUNTING", slsDetectorDefs::detectorModeType::COUNTING)
-        .value("INTERPOLATING",
-               slsDetectorDefs::detectorModeType::INTERPOLATING)
-        .value("ANALOG", slsDetectorDefs::detectorModeType::ANALOG)
-        .export_values();
-
     py::enum_<slsDetectorDefs::burstMode>(Defs, "burstMode")
         .value("BURST_INTERNAL", slsDetectorDefs::burstMode::BURST_INTERNAL)
         .value("BURST_EXTERNAL", slsDetectorDefs::burstMode::BURST_EXTERNAL)
diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer
index 2e207a90c..ffc050d05 100755
Binary files a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer and b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer differ
diff --git a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer
index 468295e43..1b6e80fad 100755
Binary files a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer and b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer differ
diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer
index 436fff64d..d5cb5cf0c 100755
Binary files a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer and b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer differ
diff --git a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer
index 7cfe3bbdc..28d70f510 100755
Binary files a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer and b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer differ
diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
index 770beecd3..3c11c1690 100755
Binary files a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer and b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer differ
diff --git a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer
index b3ef70ee2..1d4c76e72 100755
Binary files a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer and b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer differ
diff --git a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer
index ed6a7da11..d4b9865f1 100755
Binary files a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer and b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer differ
diff --git a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer.c b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer.c
index c47e7a18e..bfe2286bf 100644
--- a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer.c
+++ b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer.c
@@ -51,7 +51,6 @@ int main(int argc, char *argv[]) {
     memset(helpMessage, 0, MAX_STR_LENGTH);
     sprintf(
         helpMessage,
-        "\n\n"
         "Usage: %s [arguments]\n"
         "Possible arguments are:\n"
         "\t-v, --version            : Software version\n"
@@ -158,8 +157,10 @@ int main(int argc, char *argv[]) {
             break;
 
         case 'h':
+            printf("%s", helpMessage);
+            exit(EXIT_SUCCESS);
         default:
-            LOG(logERROR, (helpMessage));
+            printf("\n%s", helpMessage);
             exit(EXIT_FAILURE);
         }
     }
diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h
index 500721175..3b5afe6fa 100644
--- a/slsSupportLib/include/versionAPI.h
+++ b/slsSupportLib/include/versionAPI.h
@@ -3,10 +3,11 @@
 #define APILIB       0x200810
 #define APIRECEIVER  0x200810
 #define APIGUI       0x200804
-#define APIEIGER 0x200908
-#define APICTB 0x200908
-#define APIGOTTHARD 0x200908
-#define APIGOTTHARD2 0x200908
-#define APIJUNGFRAU 0x200908
-#define APIMYTHEN3 0x200908
-#define APIMOENCH 0x200908
+
+#define APICTB 0x200909
+#define APIGOTTHARD 0x200909
+#define APIGOTTHARD2 0x200909
+#define APIJUNGFRAU 0x200909
+#define APIMYTHEN3 0x200909
+#define APIMOENCH 0x200909
+#define APIEIGER 0x200909