diff --git a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer
index dae2823a5..7d84fd9bf 100755
Binary files a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer and b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer differ
diff --git a/slsDetectorServers/slsDetectorServer/include/slsDetectorServer_funcs.h b/slsDetectorServers/slsDetectorServer/include/slsDetectorServer_funcs.h
index d0dd2d864..cca5f5432 100644
--- a/slsDetectorServers/slsDetectorServer/include/slsDetectorServer_funcs.h
+++ b/slsDetectorServers/slsDetectorServer/include/slsDetectorServer_funcs.h
@@ -120,7 +120,6 @@ int program_fpga(int);
 int reset_fpga(int);
 int power_chip(int);
 int set_activate(int);
-int prepare_acquisition(int);
 int threshold_temp(int);
 int temp_control(int);
 int temp_event(int);
diff --git a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
index 4f743b047..6878b2d3b 100644
--- a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
+++ b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
@@ -240,7 +240,6 @@ void function_table() {
     flist[F_RESET_FPGA] = &reset_fpga;
     flist[F_POWER_CHIP] = &power_chip;
     flist[F_ACTIVATE] = &set_activate;
-    flist[F_PREPARE_ACQUISITION] = &prepare_acquisition;
     flist[F_THRESHOLD_TEMP] = &threshold_temp;
     flist[F_TEMP_CONTROL] = &temp_control;
     flist[F_TEMP_EVENT] = &temp_event;
@@ -3819,26 +3818,6 @@ int set_activate(int file_des) {
     return Server_SendResult(file_des, INT32, &retval, sizeof(retval));
 }
 
-int prepare_acquisition(int file_des) {
-    ret = OK;
-    memset(mess, 0, sizeof(mess));
-
-    LOG(logDEBUG1, ("Preparing Acquisition\n"));
-#ifndef EIGERD
-    functionNotImplemented();
-#else
-    // only set
-    if (Server_VerifyLock() == OK) {
-        ret = prepareAcquisition();
-        if (ret == FAIL) {
-            strcpy(mess, "Could not prepare acquisition\n");
-            LOG(logERROR, (mess));
-        }
-    }
-#endif
-    return Server_SendResult(file_des, INT32, NULL, 0);
-}
-
 // stop server
 int threshold_temp(int file_des) {
     ret = OK;
diff --git a/slsDetectorSoftware/src/Detector.cpp b/slsDetectorSoftware/src/Detector.cpp
index 64c187b80..23479d7a1 100644
--- a/slsDetectorSoftware/src/Detector.cpp
+++ b/slsDetectorSoftware/src/Detector.cpp
@@ -525,9 +525,6 @@ void Detector::startReceiver() { pimpl->Parallel(&Module::startReceiver, {}); }
 void Detector::stopReceiver() { pimpl->Parallel(&Module::stopReceiver, {}); }
 
 void Detector::startDetector() {
-    /*if (getDetectorType().squash() == defs::EIGER) {
-        pimpl->Parallel(&Module::prepareAcquisition, {});
-    }*/
     pimpl->Parallel(&Module::startAcquisition, {});
 }
 
diff --git a/slsDetectorSoftware/src/DetectorImpl.cpp b/slsDetectorSoftware/src/DetectorImpl.cpp
index d35c6ca8c..1a9f244ad 100644
--- a/slsDetectorSoftware/src/DetectorImpl.cpp
+++ b/slsDetectorSoftware/src/DetectorImpl.cpp
@@ -1046,9 +1046,6 @@ int DetectorImpl::acquire() {
 
         // start and read all
         try {
-            if (multi_shm()->multiDetectorType == EIGER) {
-                Parallel(&Module::prepareAcquisition, {});
-            }
             Parallel(&Module::startAndReadAll, {});
         } catch (...) {
             if (receiver)
diff --git a/slsDetectorSoftware/src/Module.cpp b/slsDetectorSoftware/src/Module.cpp
index d4062e7d6..7e492b2fa 100644
--- a/slsDetectorSoftware/src/Module.cpp
+++ b/slsDetectorSoftware/src/Module.cpp
@@ -367,8 +367,6 @@ void Module::stopReceiver() {
     sendToReceiver(F_STOP_RECEIVER, arg, nullptr);
 }
 
-void Module::prepareAcquisition() { sendToDetector(F_PREPARE_ACQUISITION); }
-
 void Module::startAcquisition() {
     shm()->stoppedFlag = false;
     sendToDetector(F_START_ACQUISITION);
diff --git a/slsDetectorSoftware/src/Module.h b/slsDetectorSoftware/src/Module.h
index 0e271cbc1..8e418cef8 100644
--- a/slsDetectorSoftware/src/Module.h
+++ b/slsDetectorSoftware/src/Module.h
@@ -155,7 +155,6 @@ class Module : public virtual slsDetectorDefs {
      * ************************************************/
     void startReceiver();
     void stopReceiver();
-    void prepareAcquisition();
     void startAcquisition();
     void stopAcquisition();
     void startAndReadAll();
diff --git a/slsSupportLib/include/sls_detector_funcs.h b/slsSupportLib/include/sls_detector_funcs.h
index b2a52b9cd..69fd4aef8 100755
--- a/slsSupportLib/include/sls_detector_funcs.h
+++ b/slsSupportLib/include/sls_detector_funcs.h
@@ -101,7 +101,6 @@ enum detFuncs {
     F_RESET_FPGA,
     F_POWER_CHIP,
     F_ACTIVATE,
-    F_PREPARE_ACQUISITION,
     F_THRESHOLD_TEMP,
     F_TEMP_CONTROL,
     F_TEMP_EVENT,
@@ -404,7 +403,6 @@ const char* getFunctionNameFromEnum(enum detFuncs func) {
 	case F_RESET_FPGA:						return "F_RESET_FPGA";
 	case F_POWER_CHIP:						return "F_POWER_CHIP";
 	case F_ACTIVATE:						return "F_ACTIVATE";
-	case F_PREPARE_ACQUISITION:				return "F_PREPARE_ACQUISITION";
 	case F_THRESHOLD_TEMP:                  return "F_THRESHOLD_TEMP";
 	case F_TEMP_CONTROL:                    return "F_TEMP_CONTROL";
 	case F_TEMP_EVENT:                      return "F_TEMP_EVENT";