diff --git a/Controller/Payment/Callback.php b/Controller/Payment/Callback.php
index b38c81e6..03d60372 100755
--- a/Controller/Payment/Callback.php
+++ b/Controller/Payment/Callback.php
@@ -32,7 +32,7 @@
 use Vipps\Payment\Gateway\Command\PaymentDetailsProvider;
 use Vipps\Payment\Model\Gdpr\Compliance;
 use Vipps\Payment\Model\TransactionProcessor;
-use Zend\Http\Response as ZendResponse;
+use Laminas\Http\Response as Response;
 
 /**
  * Class Callback
@@ -122,15 +122,15 @@ public function execute()
             $this->transactionProcessor->process($this->getVippsQuote($requestData), $transaction);
 
             /** @var Json $result */
-            $result->setHttpResponseCode(ZendResponse::STATUS_CODE_200);
-            $result->setData(['status' => ZendResponse::STATUS_CODE_200, 'message' => 'success']);
+            $result->setHttpResponseCode(Response::STATUS_CODE_200);
+            $result->setData(['status' => Response::STATUS_CODE_200, 'message' => 'success']);
         } catch (\Exception $e) {
             $orderId = $requestData['orderId'] ?? 'Missing';
             $message = 'OrderID: ' . $orderId . ' . Exception message: ' . $e->getMessage();
             $this->logger->critical($message);
-            $result->setHttpResponseCode(ZendResponse::STATUS_CODE_500);
+            $result->setHttpResponseCode(Response::STATUS_CODE_500);
             $result->setData([
-                'status' => ZendResponse::STATUS_CODE_500,
+                'status' => Response::STATUS_CODE_500,
                 'message' => $message
             ]);
         } finally {
diff --git a/Controller/Payment/ConsentRemoval.php b/Controller/Payment/ConsentRemoval.php
index 520f9582..1f931db7 100644
--- a/Controller/Payment/ConsentRemoval.php
+++ b/Controller/Payment/ConsentRemoval.php
@@ -21,7 +21,7 @@
 use Magento\Framework\Controller\Result\Json;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Controller\ResultInterface;
-use Zend\Http\Response as ZendResponse;
+use Laminas\Http\Response;
 
 /**
  * Class ConsentRemoval
@@ -38,7 +38,7 @@ public function execute()
     {
         $result = $this->resultFactory->create(ResultFactory::TYPE_JSON);
         /** @var Json $result */
-        $result->setHttpResponseCode(ZendResponse::STATUS_CODE_200);
+        $result->setHttpResponseCode(Response::STATUS_CODE_200);
 
         return $result;
     }
diff --git a/Controller/Payment/ShippingDetails.php b/Controller/Payment/ShippingDetails.php
index 7343306b..6fd7e2c4 100644
--- a/Controller/Payment/ShippingDetails.php
+++ b/Controller/Payment/ShippingDetails.php
@@ -37,7 +37,7 @@
 use Vipps\Payment\Model\Quote\AddressUpdater;
 use Vipps\Payment\Model\QuoteLocator;
 use Vipps\Payment\Model\Quote\ShippingMethodValidator;
-use Zend\Http\Response as ZendResponse;
+use Laminas\Http\Response;
 
 /**
  * Class ShippingDetails
@@ -177,20 +177,20 @@ public function execute()
                     'shippingMethodId' => $methodFullCode,
                 ];
             }
-            $result->setHttpResponseCode(ZendResponse::STATUS_CODE_200);
+            $result->setHttpResponseCode(Response::STATUS_CODE_200);
             $result->setData($responseData);
         } catch (LocalizedException $e) {
             $this->logger->critical($this->enlargeMessage($e));
-            $result->setHttpResponseCode(ZendResponse::STATUS_CODE_500);
+            $result->setHttpResponseCode(Response::STATUS_CODE_500);
             $result->setData([
-                'status' => ZendResponse::STATUS_CODE_500,
+                'status' => Response::STATUS_CODE_500,
                 'message' => $e->getMessage()
             ]);
         } catch (\Exception $e) {
             $this->logger->critical($this->enlargeMessage($e));
-            $result->setHttpResponseCode(ZendResponse::STATUS_CODE_500);
+            $result->setHttpResponseCode(Response::STATUS_CODE_500);
             $result->setData([
-                'status' => ZendResponse::STATUS_CODE_500,
+                'status' => Response::STATUS_CODE_500,
                 'message' => __('An error occurred during Shipping Details processing.')
             ]);
         } finally {
@@ -265,4 +265,4 @@ public function validateForCsrf(RequestInterface $request): ?bool //@codingStand
     {
         return true;
     }
-}
\ No newline at end of file
+}
diff --git a/DOCUMENTATION.md b/DOCUMENTATION.md
index 9a222801..2646865a 100644
--- a/DOCUMENTATION.md
+++ b/DOCUMENTATION.md
@@ -89,7 +89,7 @@ Vipps Payments configuration is divided by sections. It helps to quickly find an
 
 ![Screenshot of Vipps Settings](docs/images/vipps_method.png)
 
-Please ensure you check all configuration settings prior to using Vipps Payment. Pay attention to the Vipps Basic Settings section, namely `Saleunit Serial Number`, `Client ID`, `Client Secret`, `Subscription Key 1`, `Subscription Key 2`.
+Please ensure you check all configuration settings prior to using Vipps Payment. Pay attention to the Vipps Basic Settings section, namely `Saleunit Serial Number`, `Client ID`, `Client Secret`, `Subscription Key`.
 
 For information about how to find the above values, see the [Vipps Developer Portal documentation](https://github.com/vippsas/vipps-developers/blob/master/vipps-developer-portal-getting-started.md).
 
diff --git a/Gateway/Command/GatewayCommand.php b/Gateway/Command/GatewayCommand.php
index 2e280ee1..a3ead9f5 100755
--- a/Gateway/Command/GatewayCommand.php
+++ b/Gateway/Command/GatewayCommand.php
@@ -32,7 +32,7 @@
 use Vipps\Payment\Gateway\Exception\ExceptionFactory;
 use Vipps\Payment\Gateway\Exception\VippsException;
 use Vipps\Payment\Model\Profiling\ProfilerInterface;
-use Zend\Http\Response as ZendResponse;
+use Laminas\Http\Response;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -143,7 +143,7 @@ public function execute(array $commandSubject)
 
         $result = $this->client->placeRequest($transfer);
 
-        /** @var ZendResponse $response */
+        /** @var Response $response */
         $response = $result['response'];
         $responseBody = $this->jsonDecoder->decode($response->getContent());
 
diff --git a/Gateway/Config/CanVoidHandler.php b/Gateway/Config/CanVoidHandler.php
deleted file mode 100644
index e69180f3..00000000
--- a/Gateway/Config/CanVoidHandler.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * Copyright 2018 Vipps
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
- * documentation files (the "Software"), to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
- * TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-declare(strict_types=1);
-
-namespace Vipps\Payment\Gateway\Config;
-
-use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Payment\Gateway\Config\ValueHandlerInterface;
-use Magento\Payment\Gateway\Helper\SubjectReader;
-use Vipps\Payment\Gateway\Command\PaymentDetailsProvider;
-use Vipps\Payment\Gateway\Exception\VippsException;
-use Vipps\Payment\Gateway\Transaction\TransactionBuilder;
-
-/**
- * Class CanVoidHandler
- * @package Vipps\Payment\Gateway\Config
- */
-class CanVoidHandler implements ValueHandlerInterface
-{
-    /**
-     * @var Config
-     */
-    private $gatewayConfig;
-
-    /**
-     * @var PaymentDetailsProvider
-     */
-    private $paymentDetailsProvider;
-
-    /**
-     * @var TransactionBuilder
-     */
-    private $transactionBuilder;
-
-    /**
-     * CanVoidHandler constructor.
-     *
-     * @param Config $gatewayConfig
-     * @param PaymentDetailsProvider $paymentDetailsProvider
-     * @param TransactionBuilder $transactionBuilder
-     */
-    public function __construct(
-        Config $gatewayConfig,
-        PaymentDetailsProvider $paymentDetailsProvider,
-        TransactionBuilder $transactionBuilder
-    ) {
-        $this->gatewayConfig = $gatewayConfig;
-        $this->paymentDetailsProvider = $paymentDetailsProvider;
-        $this->transactionBuilder = $transactionBuilder;
-    }
-
-    /**
-     * Disable partial online void
-     *
-     * @param array $subject
-     * @param null $storeId
-     *
-     * @return bool
-     * @throws NoSuchEntityException
-     * @throws VippsException
-     */
-    public function handle(array $subject, $storeId = null): bool
-    {
-        $response = $this->paymentDetailsProvider->get($subject);
-        $transaction = $this->transactionBuilder->setData($response)->build();
-        if ($transaction->getTransactionSummary()->getCapturedAmount() > 0) {
-            return false;
-        }
-
-        return (bool)$this->gatewayConfig->getValue(SubjectReader::readField($subject), $storeId);
-    }
-}
diff --git a/Gateway/Http/Client/Curl.php b/Gateway/Http/Client/Curl.php
index 81ef61d5..3b09b92a 100644
--- a/Gateway/Http/Client/Curl.php
+++ b/Gateway/Http/Client/Curl.php
@@ -22,8 +22,8 @@
 use Magento\Payment\Gateway\Http\TransferInterface;
 use Vipps\Payment\Gateway\Exception\AuthenticationException;
 use Vipps\Payment\Model\TokenProviderInterface;
-use Zend\Http\Request;
-use Zend\Http\Response as ZendResponse;
+use Laminas\Http\Request;
+use Laminas\Http\Response;
 use Psr\Log\LoggerInterface;
 use Vipps\Payment\Model\ModuleMetadataInterface;
 
@@ -101,7 +101,7 @@ public function placeRequest(TransferInterface $transfer)
     {
         try {
             $response = $this->place($transfer);
-            if ($response->getStatusCode() == ZendResponse::STATUS_CODE_401) {
+            if ($response->getStatusCode() == Response::STATUS_CODE_401) {
                 $this->tokenProvider->regenerate();
                 $response = $this->place($transfer);
             }
@@ -116,7 +116,7 @@ public function placeRequest(TransferInterface $transfer)
     /**
      * @param TransferInterface $transfer
      *
-     * @return ZendResponse
+     * @return Response
      * @throws AuthenticationException
      */
     private function place(TransferInterface $transfer)
@@ -146,10 +146,8 @@ private function place(TransferInterface $transfer)
                 $requestHeaders,
                 $this->jsonEncoder->encode($transfer->getBody())
             );
-            $responseSting = $adapter->read();
-            $response = ZendResponse::fromString($responseSting);
 
-            return $response;
+            return Response::fromString($adapter->read());
         } finally {
             $adapter ? $adapter->close() : null;
         }
@@ -170,7 +168,7 @@ private function getHeaders($headers)
                 self::HEADER_PARAM_X_REQUEST_ID => '',
                 self::HEADER_PARAM_X_SOURCE_ADDRESS => '',
                 self::HEADER_PARAM_X_TIMESTAMP => '',
-                self::HEADER_PARAM_SUBSCRIPTION_KEY => $this->config->getValue('subscription_key2'),
+                self::HEADER_PARAM_SUBSCRIPTION_KEY => $this->config->getValue('subscription_key1'),
             ],
             $headers
         );
diff --git a/INSTALL.md b/INSTALL.md
index e5564ce4..ed40d167 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -59,7 +59,7 @@ Vipps Payments configuration is divided by sections. It helps to quickly find an
 
 ![Screenshot of Vipps Settings](docs/images/vipps_method.png)
 
-Please ensure you check all configuration settings prior to using Vipps Payment. Pay attention to the Vipps Basic Settings section, namely `Saleunit Serial Number`, `Client ID`, `Client Secret`, `Subscription Key 1`, `Subscription Key 2`.
+Please ensure you check all configuration settings prior to using Vipps Payment. Pay attention to the Vipps Basic Settings section, namely `Saleunit Serial Number`, `Client ID`, `Client Secret`, `Subscription Key`.
 
 For information about how to find the above values, see the [Vipps Developer Portal documentation](https://github.com/vippsas/vipps-developers/blob/master/vipps-developer-portal-getting-started.md).
 
diff --git a/Model/Profiling/Profiler.php b/Model/Profiling/Profiler.php
index 549fa3a9..1072d5d5 100644
--- a/Model/Profiling/Profiler.php
+++ b/Model/Profiling/Profiler.php
@@ -22,7 +22,7 @@
 use Vipps\Payment\Api\Profiling\Data\ItemInterfaceFactory;
 use Vipps\Payment\Api\Profiling\ItemRepositoryInterface;
 
-use Zend\Http\Response;
+use Laminas\Http\Response;
 use Magento\Framework\Json\DecoderInterface;
 use Vipps\Payment\Model\Gdpr\Compliance;
 
diff --git a/Model/Profiling/ProfilerInterface.php b/Model/Profiling/ProfilerInterface.php
index 355c18f0..80a2f38b 100644
--- a/Model/Profiling/ProfilerInterface.php
+++ b/Model/Profiling/ProfilerInterface.php
@@ -17,7 +17,7 @@
 
 use Magento\Payment\Gateway\Http\TransferInterface;
 use Vipps\Payment\Api\Profiling\Data\ItemInterface;
-use Zend\Http\Response;
+use Laminas\Http\Response;
 
 interface ProfilerInterface
 {
diff --git a/Model/TokenProvider.php b/Model/TokenProvider.php
index b3b27580..edb2fd9e 100644
--- a/Model/TokenProvider.php
+++ b/Model/TokenProvider.php
@@ -194,6 +194,7 @@ private function readJwt()
             $this->logger->critical($e->getMessage());
             throw new AuthenticationException(__('Can\'t retrieve access token from Vipps.'));
         }
+
         return $jwt;
     }
 
diff --git a/Observer/AvailabilityByShippingMethod.php b/Observer/AvailabilityByShippingMethod.php
index 218580ef..34814b30 100644
--- a/Observer/AvailabilityByShippingMethod.php
+++ b/Observer/AvailabilityByShippingMethod.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright Vipps
+ * Copyright 2020 Vipps
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
  * documentation files (the "Software"), to deal in the Software without restriction, including without limitation
@@ -15,7 +15,8 @@
  */
 namespace Vipps\Payment\Observer;
 
-use Magento\Framework\Event\{Observer, ObserverInterface};
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Quote\Model\Quote;
 use Vipps\Payment\Model\Quote\ShippingMethodValidator;
diff --git a/Plugin/Config/Model/Config.php b/Plugin/Config/Model/Config.php
index bc5f7d70..c78aa603 100644
--- a/Plugin/Config/Model/Config.php
+++ b/Plugin/Config/Model/Config.php
@@ -32,7 +32,7 @@ class Config
      * @var array
      */
     private static $encryptedFields = [
-        'client_id', 'merchant_serial_number', 'client_secret', 'subscription_key1', 'subscription_key2'
+        'client_id', 'merchant_serial_number', 'client_secret', 'subscription_key1'
     ];
 
     /**
diff --git a/Plugin/Klarna/Kco/Model/Api/Builder/KasperPlugin.php b/Plugin/Klarna/Kco/Model/Api/Builder/KasperPlugin.php
deleted file mode 100644
index 1c2ad3e6..00000000
--- a/Plugin/Klarna/Kco/Model/Api/Builder/KasperPlugin.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * Copyright 2018 Vipps
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
- * documentation files (the "Software"), to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
- * TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-namespace Vipps\Payment\Plugin\Klarna\Kco\Model\Api\Builder;
-
-use Klarna\Kco\Model\Api\Builder\Kasper as Subject;
-use Magento\Framework\View\Asset\Repository as AssetRepository;
-
-/**
- * Class KasperPlugin
- * @package Vipps\Payment\Plugin\Klarna\Kco\Model\Api\Builder
- */
-class KasperPlugin
-{
-    /**
-     * @var AssetRepository
-     */
-    private $assetRepository;
-
-    /**
-     * KasperPlugin constructor.
-     *
-     * @param AssetRepository $assetRepository
-     */
-    public function __construct(
-        AssetRepository $assetRepository
-    ) {
-        $this->assetRepository = $assetRepository;
-    }
-
-    /**
-     * @param Subject $subject
-     * @param array $methods
-     *
-     * @return mixed
-     */
-    public function afterGetExternalMethods(Subject $subject, $methods)
-    {
-        if ($methods) {
-            foreach ($methods as &$method) {
-                if (strtolower($method['name']) == 'vipps') {
-                    if (isset($method['image_url'])) {
-                        $method['image_url'] = $this->assetRepository->getUrl($method['image_url']);
-                    }
-                    if (isset($method['image_uri'])) {
-                        $method['image_uri'] = $this->assetRepository->getUrl($method['image_uri']);
-                    }
-                    break;
-                }
-            }
-        }
-        return $methods;
-    }
-}
diff --git a/Plugin/Sales/Model/Order/Payment.php b/Plugin/Sales/Model/Order/Payment.php
deleted file mode 100644
index 5204185e..00000000
--- a/Plugin/Sales/Model/Order/Payment.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * Copyright 2018 Vipps
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
- * documentation files (the "Software"), to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
- * TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-declare(strict_types=1);
-
-namespace Vipps\Payment\Plugin\Sales\Model\Order;
-
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Payment\Gateway\Data\PaymentDataObjectFactoryInterface;
-use Magento\Sales\Model\Order\Payment as MagentoPayment;
-use Vipps\Payment\Gateway\Command\PaymentDetailsProvider;
-use Vipps\Payment\Gateway\Exception\VippsException;
-use Vipps\Payment\Gateway\Transaction\TransactionBuilder;
-use Vipps\Payment\Model\Order\PartialVoid\Config as PartialVoidConfig;
-
-/**
- * Class Payment
- * @package Vipps\Payment\Plugin\Sales\Model\Order
- */
-class Payment
-{
-    /**
-     * @var PaymentDataObjectFactoryInterface
-     */
-    private $dataObjectFactory;
-
-    /**
-     * @var PaymentDetailsProvider
-     */
-    private $paymentDetailsProvider;
-
-    /**
-     * @var TransactionBuilder
-     */
-    private $transactionBuilder;
-
-    /**
-     * @var PartialVoidConfig
-     */
-    private $config;
-
-    /**
-     * Payment constructor.
-     *
-     * @param PaymentDataObjectFactoryInterface $dataObjectFactory
-     * @param PaymentDetailsProvider $paymentDetailsProvider
-     * @param TransactionBuilder $transactionBuilder
-     * @param PartialVoidConfig $config
-     */
-    public function __construct(
-        PaymentDataObjectFactoryInterface $dataObjectFactory,
-        PaymentDetailsProvider $paymentDetailsProvider,
-        TransactionBuilder $transactionBuilder,
-        PartialVoidConfig $config
-    ) {
-        $this->dataObjectFactory = $dataObjectFactory;
-        $this->paymentDetailsProvider = $paymentDetailsProvider;
-        $this->transactionBuilder = $transactionBuilder;
-        $this->config = $config;
-    }
-
-    /**
-     * Throw exception if offline partial void disabled
-     *
-     * @param MagentoPayment $payment
-     *
-     * @throws LocalizedException
-     * @throws VippsException
-     */
-    public function beforeCancel(MagentoPayment $payment)
-    {
-        if ($payment->getMethod() === 'vipps') {
-            $paymentDataObject = $this->dataObjectFactory->create($payment);
-            $response = $this->paymentDetailsProvider->get(['payment' => $paymentDataObject]);
-            $transaction = $this->transactionBuilder->setData($response)->build();
-            $offlineVoidEnabled = $this->config->isOfflinePartialVoidEnabled();
-            if (!$offlineVoidEnabled && $transaction->getTransactionSummary()->getCapturedAmount() > 0) {
-                throw new LocalizedException(__('Can\'t cancel captured transaction.'));
-            }
-        }
-    }
-}
diff --git a/Plugin/Sales/OrderManagement/AfterPlaceOrder.php~HEAD b/Plugin/Sales/OrderManagement/AfterPlaceOrder.php
similarity index 100%
rename from Plugin/Sales/OrderManagement/AfterPlaceOrder.php~HEAD
rename to Plugin/Sales/OrderManagement/AfterPlaceOrder.php
diff --git a/Plugin/Sales/OrderManagement/AfterPlaceOrder.php~origin_master b/Plugin/Sales/OrderManagement/AfterPlaceOrder.php~origin_master
deleted file mode 100644
index 3a496584..00000000
--- a/Plugin/Sales/OrderManagement/AfterPlaceOrder.php~origin_master
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * Copyright 2020 Vipps
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
- * documentation files (the "Software"), to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
- * TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-declare(strict_types=1);
-
-namespace Vipps\Payment\Plugin\Sales\OrderManagement;
-
-use Magento\Sales\Api\Data\OrderInterface;
-use Magento\Sales\Api\OrderManagementInterface;
-
-/**
- * Class AfterPlaceOrder
- * @package Vipps\Payment\Plugin\Sales\OrderManagement
- */
-class AfterPlaceOrder
-{
-    /**
-     * @param OrderManagementInterface $subject
-     * @param OrderInterface $order
-     * @return OrderInterface
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     */
-    public function afterPlace(OrderManagementInterface $subject, OrderInterface $order): OrderInterface
-    {
-        if ('vipps' == $order->getPayment()->getMethod()) {
-            $order->setCanSendNewEmailFlag(false);
-        }
-
-        return $order;
-    }
-}
diff --git a/README.md b/README.md
index 71b46a83..f9378a00 100644
--- a/README.md
+++ b/README.md
@@ -76,4 +76,4 @@ Please see our [Documentation](DOCUMENTATION.md)
 
 # FAQ
 
-Please see our [FAQ section](FAQ.md)
\ No newline at end of file
+Please see our [FAQ section](FAQ.md)
diff --git a/Test/Unit/Controller/Payment/ShippingDetailsTest.php b/Test/Unit/Controller/Payment/ShippingDetailsTest.php
index c9d5f325..daa59ba2 100644
--- a/Test/Unit/Controller/Payment/ShippingDetailsTest.php
+++ b/Test/Unit/Controller/Payment/ShippingDetailsTest.php
@@ -39,7 +39,7 @@
 use Vipps\Payment\Model\Quote\ShippingMethodValidator;
 use Vipps\Payment\Model\QuoteLocator;
 use Vipps\Payment\Model\TransactionProcessor;
-use Zend\Http\Response as ZendResponse;
+use Laminas\Http\Response;
 
 /**
  * Class ShippingDetailsTest
@@ -266,7 +266,7 @@ public function testExecuteException()
             ->with('Reserved Order id: ' . $reservedOrderId . ' . Exception message: ' . $errorMessage1)
             ->willReturnSelf();
 
-        $errorStatus = ZendResponse::STATUS_CODE_500;
+        $errorStatus = Response::STATUS_CODE_500;
         $errorMessage2 = __('An error occurred during Shipping Details processing.');
         $responseData = [
             'status' => $errorStatus,
@@ -318,7 +318,7 @@ public function testExecuteLocalizedException()
             ->with('Reserved Order id: ' . $reservedOrderId . ' . Exception message: ' . $errorMessage1)
             ->willReturnSelf();
 
-        $errorStatus = ZendResponse::STATUS_CODE_500;
+        $errorStatus = Response::STATUS_CODE_500;
         $responseData = [
             'status' => $errorStatus,
             'message' => $errorMessage1
@@ -458,7 +458,7 @@ public function testExecute()
         ];
         $this->response->expects(self::once())
             ->method('setHttpResponseCode')
-            ->with(ZendResponse::STATUS_CODE_200)
+            ->with(Response::STATUS_CODE_200)
             ->willReturnSelf();
 
         $this->response->expects(self::once())
diff --git a/Test/Unit/Gateway/Command/GatewayCommandTest.php b/Test/Unit/Gateway/Command/GatewayCommandTest.php
index 70dbc39e..4434d218 100755
--- a/Test/Unit/Gateway/Command/GatewayCommandTest.php
+++ b/Test/Unit/Gateway/Command/GatewayCommandTest.php
@@ -37,7 +37,7 @@
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 use Psr\Log\LoggerInterface;
-use Zend\Http\Response as ZendResponse;
+use Laminas\Http\Response;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -223,10 +223,10 @@ public function dataProvider()
             'failsDescription' => ['error1', 'error2']
         ]);
         $resultFailed = [
-            'response' => ZendResponse::fromString($responseStrFail)
+            'response' => Response::fromString($responseStrFail)
         ];
         $resultSuccess = [
-            'response' => ZendResponse::fromString($responseStrOk)
+            'response' => Response::fromString($responseStrOk)
         ];
         $validationResultOk = $this->objectManagerHelper->getObject(
             Result::class,
diff --git a/composer.json b/composer.json
index 4e7d23ce..6b5efbbd 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
     "type": "magento2-module",
     "description": "Vipps Payment Method",
     "license": "proprietary",
-    "version": "2.4.1",
+    "version": "2.4.2",
     "require": {
         "magento/framework": "103.0.*",
         "magento/module-sales": "103.0.*",
diff --git a/docs/images/vipps_basic.png b/docs/images/vipps_basic.png
index 2324cb16..6e488710 100644
Binary files a/docs/images/vipps_basic.png and b/docs/images/vipps_basic.png differ
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index c0e2e88c..5d2b9d69 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -68,7 +68,7 @@
                             <attribute type="shared">1</attribute>
                         </field>
                         <field id="merchant_serial_number" translate="label" type="obscure" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
-                            <label>Saleunit Serial Number</label>
+                            <label>Merchant Serial number</label>
                             <config_path>payment/vipps/merchant_serial_number</config_path>
                             <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                         </field>
@@ -83,23 +83,14 @@
                             <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                         </field>
                         <field id="subscription_key1" translate="label" type="obscure" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="1">
-                            <label>Subscription Key 1</label>
+                            <label>Subscription Key</label>
                             <comment>
-                                <![CDATA[Ocp-Apim-Subscription-Key for DEFAULT product.]]>
+                                <![CDATA[Vipps-Subscription-Key (primary)]]>
                             </comment>
                             <tooltip>This can be found in User Profile page on Merchant developer portal after merchant account is created.</tooltip>
                             <config_path>payment/vipps/subscription_key1</config_path>
                             <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                         </field>
-                        <field id="subscription_key2" translate="label" type="obscure" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
-                            <label>Subscription Key 2</label>
-                            <comment>
-                                <![CDATA[Ocp-Apim-Subscription-Key for eCommerce product.]]>
-                            </comment>
-                            <tooltip>This can be found in User Profile page on Merchant developer portal after merchant account is created.</tooltip>
-                            <config_path>payment/vipps/subscription_key2</config_path>
-                            <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
-                        </field>
                     </group>
                     <include path="Vipps_Payment::system/checkout.xml"/>
                     <include path="Vipps_Payment::system/express_checkout.xml"/>
diff --git a/etc/config.xml b/etc/config.xml
index 7c679cfd..b430605a 100644
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -37,7 +37,6 @@
                 <environment>develop</environment>
                 <client_secret backend_model="Magento\Config\Model\Config\Backend\Encrypted"/>
                 <subscription_key1 backend_model="Magento\Config\Model\Config\Backend\Encrypted"/>
-                <subscription_key2 backend_model="Magento\Config\Model\Config\Backend\Encrypted"/>
                 <client_id backend_model="Magento\Config\Model\Config\Backend\Encrypted"/>
                 <merchant_serial_number backend_model="Magento\Config\Model\Config\Backend\Encrypted"/>
                 <cancellation_type>auto</cancellation_type>
diff --git a/etc/di.xml b/etc/di.xml
index 2ecd3046..e381276b 100644
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -101,7 +101,6 @@
         <arguments>
             <argument name="handlers" xsi:type="array">
                 <item name="default" xsi:type="string">VippsConfigValueHandler</item>
-                <item name="can_void" xsi:type="string">Vipps\Payment\Gateway\Config\CanVoidHandler</item>
             </argument>
         </arguments>
     </virtualType>
diff --git a/i18n/nb_NO.csv b/i18n/nb_NO.csv
index 413133ee..6673015e 100644
--- a/i18n/nb_NO.csv
+++ b/i18n/nb_NO.csv
@@ -105,7 +105,6 @@ Debug,Debug
 "Client ID","Client ID"
 "Client Secret","Client Secret"
 "Subscription Key 1","Subscription Key 1"
-"Subscription Key 2","Subscription Key 2"
 "Order Cancellation","Order Cancellation"
 "Number of Attempts","Number of Attempts"
 "Processing Type","Processing Type"