diff --git a/Makefile b/Makefile
index 46a952d8..2d5ffac0 100755
--- a/Makefile
+++ b/Makefile
@@ -142,4 +142,16 @@ e2e-1786-prepare:
 # Run e2e tests in headless way.
 e2eh1786: test-e2e-headless-1786
 test-e2e-headless-1786:
-	make e2e1786p
\ No newline at end of file
+	make e2e1786p
+
+prepare-zip:
+	rm -rf vendor && \
+	composer install --no-dev --optimize-autoloader && \
+	cp .github/.htaccess vendor/.htaccess && \
+	rm -rf .git .github tests cypress .docker && \
+	mkdir saferpayofficial && \
+	rsync -Rr ./ ./saferpayofficial && \
+	find . -maxdepth 1 ! -name saferpayofficial -exec mv {} saferpayofficial/ \; && \
+	find . -maxdepth 1 -type f -exec rm "{}" \; && \
+	cd saferpayofficial && rm -rf saferpayofficial && \
+	cd ../ && zip -r saferpayofficial.zip saferpayofficial/
diff --git a/saferpayofficial.php b/saferpayofficial.php
index cfd291d6..a4a4e230 100755
--- a/saferpayofficial.php
+++ b/saferpayofficial.php
@@ -591,13 +591,6 @@ public function hookActionEmailSendBefore($params)
             return true;
         }
 
-        /** @var \Invertus\SaferPay\Core\Order\Verification\CanSendOrderConfirmationEmail $canSendOrderConfirmationEmail */
-        $canSendOrderConfirmationEmail = $this->getService(\Invertus\SaferPay\Core\Order\Verification\CanSendOrderConfirmationEmail::class);
-
-        if ($params['template'] === 'order_conf') {
-            return $canSendOrderConfirmationEmail->verify((int) $order->current_state);
-        }
-
         if ($params['template'] === 'new_order') {
             if ((int) Configuration::get(\Invertus\SaferPay\Config\SaferPayConfig::SAFERPAY_SEND_NEW_ORDER_MAIL)) {
                 return true;
@@ -607,50 +600,6 @@ public function hookActionEmailSendBefore($params)
         }
     }
 
-    public function hookActionOrderHistoryAddAfter($params = [])
-    {
-        /** @var OrderHistory $orderHistory */
-        $orderHistory = $params['order_history'];
-
-        if (!$orderHistory instanceof OrderHistory) {
-            return;
-        }
-
-        $idOrder = (int) $orderHistory->id_order;
-
-        $internalOrder = new Order($idOrder);
-
-        if (!Validate::isLoadedObject($internalOrder)) {
-            return;
-        }
-
-        $order = new Order($idOrder);
-
-        $orderStatus = new OrderState((int) $order->current_state);
-
-        if (!Validate::isLoadedObject($orderStatus)) {
-            return;
-        }
-
-        /** @var \Invertus\SaferPay\Service\SaferPayMailService $mailService */
-        $mailService = $this->getService(\Invertus\SaferPay\Service\SaferPayMailService::class);
-
-        /** @var \Invertus\SaferPay\Core\Order\Verification\CanSendOrderConfirmationEmail $canSendOrderConfirmationEmail */
-        $canSendOrderConfirmationEmail = $this->getService(\Invertus\SaferPay\Core\Order\Verification\CanSendOrderConfirmationEmail::class);
-
-        if ($canSendOrderConfirmationEmail->verify((int) $orderStatus->id)) {
-            try {
-                $mailService->sendNewOrderMail($order, (int) $orderStatus->id);
-            } catch (Exception $e) {
-                // emailalert module sometimes throws error which leads into failed payment issue
-            }
-
-            if ((int) \Configuration::get(\Invertus\SaferPay\Config\SaferPayConfig::SAFERPAY_PAYMENT_AUTHORIZED) === (int) $orderStatus->id) {
-                $mailService->sendOrderConfMail($order, (int) $orderStatus->id);
-            }
-        }
-    }
-
     public function hookActionAdminControllerSetMedia()
     {
         if ('AdminOrders' === Tools::getValue('controller') &&
diff --git a/src/Api/ApiRequest.php b/src/Api/ApiRequest.php
index a3526737..a005d7e9 100755
--- a/src/Api/ApiRequest.php
+++ b/src/Api/ApiRequest.php
@@ -54,6 +54,7 @@ public function post($url, $params = [])
                 json_encode($params)
             );
 
+
             $this->isValidResponse($response);
 
             return json_decode($response->raw_body);
diff --git a/src/Core/Order/Verification/CanSendOrderConfirmationEmail.php b/src/Core/Order/Verification/CanSendOrderConfirmationEmail.php
index 62e735db..3ecb1cab 100644
--- a/src/Core/Order/Verification/CanSendOrderConfirmationEmail.php
+++ b/src/Core/Order/Verification/CanSendOrderConfirmationEmail.php
@@ -46,10 +46,6 @@ private function isOrderStatusValid($orderStatusId)
             return true;
         }
 
-        if ((int) \Configuration::get(SaferPayConfig::SAFERPAY_PAYMENT_COMPLETED) === (int) $orderStatusId) {
-            return true;
-        }
-
         if ((int) \Configuration::get(SaferPayConfig::STATUS_PS_OS_OUTOFSTOCK_PAID) === (int) $orderStatusId) {
             return true;
         }
diff --git a/upgrade/install-1.2.3.php b/upgrade/install-1.2.3.php
index b5ce3a0b..07ac45fe 100644
--- a/upgrade/install-1.2.3.php
+++ b/upgrade/install-1.2.3.php
@@ -36,6 +36,7 @@ function upgrade_module_1_2_3(SaferPayOfficial $module)
         $installer->createPendingOrderStatus() &&
         Db::getInstance()->execute('ALTER TABLE ' . _DB_PREFIX_ . 'saferpay_order ADD COLUMN `pending` TINYINT(1) DEFAULT 0') &&
         $module->registerHook('displayOrderConfirmation') &&
+        $module->unregisterHook('actionOrderHistoryAddAfter') &&
         Configuration::updateValue(RequestHeader::SPEC_VERSION, SaferPayConfig::API_VERSION) &&
         Configuration::updateValue(RequestHeader::SPEC_REFUND_VERSION, SaferPayConfig::API_VERSION);
 }