diff --git a/Api/Data/DiscountDataInterface.php b/Api/Data/DiscountDataInterface.php
index be44dba2..922a651c 100644
--- a/Api/Data/DiscountDataInterface.php
+++ b/Api/Data/DiscountDataInterface.php
@@ -15,26 +15,26 @@ interface DiscountDataInterface
      *
      * @return float
      */
-    public function getAmount();
+    public function getAmount(): float;
 
     /**
      * Get Base Amount
      *
      * @return float
      */
-    public function getBaseAmount();
+    public function getBaseAmount(): float;
 
     /**
      * Get Original Amount
      *
      * @return float
      */
-    public function getOriginalAmount();
+    public function getOriginalAmount(): float;
 
     /**
      * Get Base Original Amount
      *
      * @return float
      */
-    public function getBaseOriginalAmount();
+    public function getBaseOriginalAmount(): float;
 }
diff --git a/Api/Data/Order/Payment/RequestInterface.php b/Api/Data/Order/Payment/RequestInterface.php
index f49f4d35..d2c96389 100644
--- a/Api/Data/Order/Payment/RequestInterface.php
+++ b/Api/Data/Order/Payment/RequestInterface.php
@@ -13,7 +13,7 @@ interface RequestInterface
     /**
      * Add payment object to the request.
      *
-     * @param \Magento\Sales\Api\Data\OrderPaymentInterface$payment
+     * @param \Magento\Sales\Api\Data\OrderPaymentInterface $payment
      * @return void
      */
     public function setPayment(OrderPaymentInterface $payment): void;
diff --git a/Api/Data/RuleDiscountInterface.php b/Api/Data/RuleDiscountInterface.php
index 4c47c776..2f93c4a4 100644
--- a/Api/Data/RuleDiscountInterface.php
+++ b/Api/Data/RuleDiscountInterface.php
@@ -15,19 +15,19 @@ interface RuleDiscountInterface
      *
      * @return \Bold\Checkout\Api\Data\DiscountDataInterface
      */
-    public function getDiscountData();
+    public function getDiscountData(): DiscountDataInterface;
 
     /**
      * Get Rule Label
      *
      * @return string
      */
-    public function getRuleLabel();
+    public function getRuleLabel(): string;
 
     /**
      * Get Rule ID
      *
      * @return int
      */
-    public function getRuleID();
+    public function getRuleID(): int;
 }
diff --git a/Api/Http/ClientInterface.php b/Api/Http/ClientInterface.php
index de2a2e31..7a4d0c90 100644
--- a/Api/Http/ClientInterface.php
+++ b/Api/Http/ClientInterface.php
@@ -15,7 +15,7 @@ interface ClientInterface
      *
      * @param int $websiteId
      * @param string $url
-     * @return Bold\Checkout\Api\Data\Http\Client\ResultInterface
+     * @return \Bold\Checkout\Api\Data\Http\Client\ResultInterface
      * @throws \Exception
      */
     public function get(int $websiteId, string $url): ResultInterface;
@@ -26,7 +26,7 @@ public function get(int $websiteId, string $url): ResultInterface;
      * @param int $websiteId
      * @param string $url
      * @param array|null $data
-     * @return Bold\Checkout\Api\Data\Http\Client\ResultInterface
+     * @return \Bold\Checkout\Api\Data\Http\Client\ResultInterface
      * @throws \Exception
      */
     public function post(int $websiteId, string $url, array $data): ResultInterface;
@@ -37,7 +37,7 @@ public function post(int $websiteId, string $url, array $data): ResultInterface;
      * @param int $websiteId
      * @param string $url
      * @param array|null $data
-     * @return Bold\Checkout\Api\Data\Http\Client\ResultInterface
+     * @return \Bold\Checkout\Api\Data\Http\Client\ResultInterface
      * @throws \Exception
      */
     public function put(int $websiteId, string $url, array $data): ResultInterface;
@@ -48,7 +48,7 @@ public function put(int $websiteId, string $url, array $data): ResultInterface;
      * @param int $websiteId
      * @param string $url
      * @param array|null $data
-     * @return Bold\Checkout\Api\Data\Http\Client\ResultInterface
+     * @return \Bold\Checkout\Api\Data\Http\Client\ResultInterface
      * @throws \Exception
      */
     public function patch(int $websiteId, string $url, array $data): ResultInterface;
@@ -59,7 +59,7 @@ public function patch(int $websiteId, string $url, array $data): ResultInterface
      * @param int $websiteId
      * @param string $url
      * @param array $data
-     * @return Bold\Checkout\Api\Data\Http\Client\ResultInterface
+     * @return \Bold\Checkout\Api\Data\Http\Client\ResultInterface
      * @throws \Exception
      */
     public function delete(int $websiteId, string $url, array $data): ResultInterface;
diff --git a/Api/Order/HydrateOrderFromQuoteInterface.php b/Api/Order/HydrateOrderFromQuoteInterface.php
index a5dc5405..096c2240 100644
--- a/Api/Order/HydrateOrderFromQuoteInterface.php
+++ b/Api/Order/HydrateOrderFromQuoteInterface.php
@@ -15,7 +15,7 @@ interface HydrateOrderFromQuoteInterface
      *
      * @param CartInterface $quote
      * @param string $publicOrderId
-     * @return ResultInterface
+     * @return \Bold\Checkout\Api\Data\Http\Client\ResultInterface
      */
     public function hydrate(CartInterface $quote, string $publicOrderId): ResultInterface;
 }
diff --git a/Api/PlaceOrderInterface.php b/Api/PlaceOrderInterface.php
index 55440dd5..da46088b 100644
--- a/Api/PlaceOrderInterface.php
+++ b/Api/PlaceOrderInterface.php
@@ -24,9 +24,9 @@ interface PlaceOrderInterface
     public function place(string $shopId, OrderDataInterface $order): ResultInterface;
 
     /**
-     * @param string $shopId
+     * @param string $publicOrderId
      * @param string $quoteMaskId
-     * @return ResultInterface
+     * @return \Bold\Checkout\Api\Data\PlaceOrder\ResultInterface
      */
     public function authorizeAndPlace(string $publicOrderId, string $quoteMaskId): ResultInterface;
 }
diff --git a/Block/System/Config/Form/Field/Location.php b/Block/System/Config/Form/Field/Location.php
index 89c6a49f..db030065 100644
--- a/Block/System/Config/Form/Field/Location.php
+++ b/Block/System/Config/Form/Field/Location.php
@@ -3,33 +3,13 @@
 
 namespace Bold\Checkout\Block\System\Config\Form\Field;
 
-use Bold\Checkout\Model\ModuleInfo\InstalledModulesProvider;
 use Magento\Framework\View\Element\Html\Select;
-use Magento\Backend\Block\Template\Context;
 
 /**
  * HTML select element block with location options.
  */
 class Location extends Select
 {
-    /**
-     * @var InstalledModulesProvider
-     */
-    protected $installedModulesProvider;
-    
-    /**
-     * @param Context $context
-     * @param InstalledModulesProvider $installedModuleProvider
-     */
-    public function __construct(
-        Context                  $context,
-        InstalledModulesProvider $installedModulesProvider
-    )
-    {
-        parent::__construct($context);
-        $this->installedModulesProvider = $installedModulesProvider;
-    }
-
     /**
      * Set "name" for <select> element
      *
@@ -58,9 +38,9 @@ protected function _toHtml()
      *
      * @return array
      */
-    private function getSourceOptions(): array
+    public function getSourceOptions(): array
     {
-        $options = [
+        return [
             ['label' => 'At the top of the page', 'value' => 'main_content_beginning'],
             ['label' => 'Above the customer info section', 'value' => 'customer_info'],
             ['label' => 'Below the shipping address section', 'value' => 'shipping'],
@@ -75,10 +55,5 @@ private function getSourceOptions(): array
             ['label' => 'On the thank you page, below the order details', 'value' => 'order_details'],
             ['label' => 'At the bottom of the page', 'value' => 'main_content_end'],
         ];
-        if ($this->installedModulesProvider->isPayPalFlowInstalled()) {
-            $options[] = ['label' => '(PayPal Checkout Flow only) On the additional information page', 'value' => 'paypal_additional_information'];
-        }
-        
-        return $options;
     }
 }
diff --git a/Controller/Adminhtml/Clear/Index.php b/Controller/Adminhtml/Clear/Index.php
index d56f8105..d6643f1f 100644
--- a/Controller/Adminhtml/Clear/Index.php
+++ b/Controller/Adminhtml/Clear/Index.php
@@ -6,7 +6,6 @@
 
 use Bold\Checkout\Model\ClearModuleConfiguration;
 use Bold\Checkout\Model\ClearModuleIntegration;
-use Bold\CheckoutFlowPaypal\Model\PaypalFlow;
 use Magento\Backend\App\Action;
 use Magento\Backend\App\Action\Context;
 use Magento\Framework\App\Action\HttpPostActionInterface;
diff --git a/Model/Config.php b/Model/Config.php
index 86f1f374..8cf08b13 100644
--- a/Model/Config.php
+++ b/Model/Config.php
@@ -20,7 +20,7 @@ class Config implements ConfigInterface
     private const PATH_SECRET = 'checkout/bold_checkout_base/shared_secret';
     private const PATH_ENABLED = 'checkout/bold_checkout_base/enabled';
     private const PATH_TYPE = 'checkout/bold_checkout_base/type';
-    private const PATH_PAYMENT_TITLE = 'checkout/bold_checkout_base/payment_title';
+    public const PATH_PAYMENT_TITLE = 'checkout/bold_checkout_base/payment_title';
     private const PATH_PARALLEL_CHECKOUT_BUTTON_TITLE = 'checkout/bold_checkout_base/parallel_checkout_button_title';
     private const PATH_ENABLED_FOR = 'checkout/bold_checkout_advanced/enabled_for';
     private const PATH_IP_WHITELIST = 'checkout/bold_checkout_advanced/ip_whitelist';
@@ -33,7 +33,7 @@ class Config implements ConfigInterface
     private const PATH_INTEGRATION_API_URL = 'checkout/bold_checkout_advanced/api_url';
     private const PATH_INTEGRATION_CHECKOUT_URL = 'checkout/bold_checkout_advanced/checkout_url';
     private const PATH_INTEGRATION_IDENTITY_URL = 'checkout/bold_checkout_base/integration_identity_url';
-    private const PATH_LIFE_ELEMENTS = 'checkout/bold_checkout_life_elements/life_elements';
+    private const PATH_LIFE_ELEMENTS = 'checkout/bold_checkout_custom_elements/life_elements';
     private const PATH_VALIDATE_COUPON_CODES = 'checkout/bold_checkout_advanced/validate_coupon_codes';
     private const PATH_UPDATE_CHECK = 'checkout/bold_checkout_advanced/updates_check';
 
@@ -325,28 +325,6 @@ public function isCheckoutTypeParallel(int $websiteId): bool
             ) === ConfigInterface::VALUE_TYPE_PARALLEL;
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function isCheckoutTypeSelfHosted(int $websiteId): bool
-    {
-        return (int)$this->configManagement->getValue(
-                self::PATH_TYPE,
-                $websiteId
-            ) === ConfigInterface::VALUE_TYPE_SELF;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function isCheckoutTypeSelfHostedReact(int $websiteId): bool
-    {
-        return (int)$this->configManagement->getValue(
-                self::PATH_TYPE,
-                $websiteId
-            ) === ConfigInterface::VALUE_TYPE_SELF_REACT;
-    }
-
     /**
      * @inheritDoc
      */
diff --git a/Model/Config/Source/CheckoutTypeSource.php b/Model/Config/Source/CheckoutTypeSource.php
index de08f63c..473190c5 100644
--- a/Model/Config/Source/CheckoutTypeSource.php
+++ b/Model/Config/Source/CheckoutTypeSource.php
@@ -19,8 +19,6 @@ public function toOptionArray(): array
         return [
             ['value' => ConfigInterface::VALUE_TYPE_STANDARD, 'label' => __('Bold-Hosted (Standard)')],
             ['value' => ConfigInterface::VALUE_TYPE_PARALLEL, 'label' => __('Dual')],
-            ['value' => ConfigInterface::VALUE_TYPE_SELF, 'label' => __('Payment Booster')],
-            ['value' => ConfigInterface::VALUE_TYPE_SELF_REACT, 'label' => __('Self-Hosted')],
         ];
     }
 }
diff --git a/Model/ConfigInterface.php b/Model/ConfigInterface.php
index 100a53cf..0e2f205d 100644
--- a/Model/ConfigInterface.php
+++ b/Model/ConfigInterface.php
@@ -14,8 +14,6 @@ interface ConfigInterface
     public const VALUE_ENABLED_FOR_PERCENTAGE = 3;
     public const VALUE_TYPE_STANDARD = 0;
     public const VALUE_TYPE_PARALLEL = 1;
-    public const VALUE_TYPE_SELF = 2;
-    public const VALUE_TYPE_SELF_REACT = 3;
     public const PATH_SHOP_ID = 'checkout/bold_checkout_base/shop_id';
 
     /**
@@ -170,22 +168,6 @@ public function isCheckoutTypeStandard(int $websiteId): bool;
      */
     public function isCheckoutTypeParallel(int $websiteId): bool;
 
-    /**
-     * Check if Bold Checkout type is self-hosted (Magento storefront).
-     *
-     * @param int $websiteId
-     * @return bool
-     */
-    public function isCheckoutTypeSelfHosted(int $websiteId): bool;
-
-    /**
-     * Check if Bold Checkout type is self-hosted (React application).
-     *
-     * @param int $websiteId
-     * @return bool
-     */
-    public function isCheckoutTypeSelfHostedReact(int $websiteId): bool;
-
     /**
      * Get Bold Payment storefront title.
      *
diff --git a/Model/Customer/EmailValidator.php b/Model/Customer/EmailValidator.php
index 1ea57aed..7bbb2e5c 100644
--- a/Model/Customer/EmailValidator.php
+++ b/Model/Customer/EmailValidator.php
@@ -100,7 +100,7 @@ public function validate(string $shopId, string $email): ResultInterface
      * Build error result data model.
      *
      * @param Phrase $message
-     * @return Bold\Checkout\Api\Data\CustomerEmailValidator\ResultInterface
+     * @return ResultInterface
      */
     public function getErrorResult(Phrase $message): ResultInterface
     {
diff --git a/Model/Data/DiscountData.php b/Model/Data/DiscountData.php
index 4716d3e0..ba8f2c0a 100644
--- a/Model/Data/DiscountData.php
+++ b/Model/Data/DiscountData.php
@@ -21,7 +21,7 @@ class DiscountData extends AbstractExtensibleModel implements DiscountDataInterf
     /**
      * @inheritDoc
      */
-    public function getAmount()
+    public function getAmount(): float
     {
         return $this->getData(self::AMOUNT);
     }
@@ -29,7 +29,7 @@ public function getAmount()
     /**
      * @inheritDoc
      */
-    public function getBaseAmount()
+    public function getBaseAmount(): float
     {
         return $this->getData(self::BASE_AMOUNT);
     }
@@ -37,7 +37,7 @@ public function getBaseAmount()
     /**
      * @inheritDoc
      */
-    public function getOriginalAmount()
+    public function getOriginalAmount(): float
     {
         return $this->getData(self::ORIGINAL_AMOUNT);
     }
@@ -45,7 +45,7 @@ public function getOriginalAmount()
     /**
      * @inheritDoc
      */
-    public function getBaseOriginalAmount()
+    public function getBaseOriginalAmount(): float
     {
         return $this->getData(self::BASE_ORIGINAL_AMOUNT);
     }
@@ -55,7 +55,7 @@ public function getBaseOriginalAmount()
      *
      * @return ExtensionAttributesInterface|null
      */
-    public function getExtensionAttributes()
+    public function getExtensionAttributes(): ?ExtensionAttributesInterface
     {
         return $this->_getExtensionAttributes();
     }
@@ -68,7 +68,7 @@ public function getExtensionAttributes()
      */
     public function setExtensionAttributes(
         ExtensionAttributesInterface $extensionAttributes
-    ) {
+    ): DiscountData {
         return $this->_setExtensionAttributes($extensionAttributes);
     }
 }
diff --git a/Model/Data/RuleDiscount.php b/Model/Data/RuleDiscount.php
index 9e55f526..3501be9b 100644
--- a/Model/Data/RuleDiscount.php
+++ b/Model/Data/RuleDiscount.php
@@ -4,6 +4,7 @@
 
 namespace Bold\Checkout\Model\Data;
 
+use Bold\Checkout\Api\Data\DiscountDataInterface;
 use Magento\Framework\Api\ExtensionAttributesInterface;
 use Magento\Framework\Model\AbstractExtensibleModel;
 use Bold\Checkout\Api\Data\RuleDiscountInterface;
@@ -20,7 +21,7 @@ class RuleDiscount extends AbstractExtensibleModel implements RuleDiscountInterf
     /**
      * @inheritDoc
      */
-    public function getDiscountData()
+    public function getDiscountData(): DiscountDataInterface
     {
         return $this->getData(self::KEY_DISCOUNT_DATA);
     }
@@ -28,17 +29,17 @@ public function getDiscountData()
     /**
      * @inheritDoc
      */
-    public function getRuleLabel()
+    public function getRuleLabel(): string
     {
-        return $this->getData(self::KEY_RULE_LABEL);
+        return (string)$this->getData(self::KEY_RULE_LABEL);
     }
 
     /**
      * @inheritDoc
      */
-    public function getRuleID()
+    public function getRuleID(): int
     {
-        return $this->getData(self::KEY_RULE_ID);
+        return (int)$this->getData(self::KEY_RULE_ID);
     }
 
     /**
@@ -46,7 +47,7 @@ public function getRuleID()
      *
      * @return ExtensionAttributesInterface|null
      */
-    public function getExtensionAttributes()
+    public function getExtensionAttributes(): ?ExtensionAttributesInterface
     {
         return $this->_getExtensionAttributes();
     }
@@ -59,7 +60,7 @@ public function getExtensionAttributes()
      */
     public function setExtensionAttributes(
         ExtensionAttributesInterface $extensionAttributes
-    ) {
+    ): RuleDiscount {
         return $this->_setExtensionAttributes($extensionAttributes);
     }
 }
diff --git a/Model/Http/Client/Command/DeleteCommand.php b/Model/Http/Client/Command/DeleteCommand.php
index e06f3a21..e91698fa 100644
--- a/Model/Http/Client/Command/DeleteCommand.php
+++ b/Model/Http/Client/Command/DeleteCommand.php
@@ -59,7 +59,7 @@ public function __construct(
      * @param string $url
      * @param array $headers
      * @param array $data
-     * @return Bold\Checkout\Api\Data\Http\Client\ResultInterface
+     * @return ResultInterface
      */
     public function execute(int $websiteId, string $url, array $headers, array $data): ResultInterface
     {
diff --git a/Model/Http/Client/Command/GetCommand.php b/Model/Http/Client/Command/GetCommand.php
index e547e65d..77f4d733 100644
--- a/Model/Http/Client/Command/GetCommand.php
+++ b/Model/Http/Client/Command/GetCommand.php
@@ -49,7 +49,7 @@ public function __construct(
      * @param int $websiteId
      * @param string $url
      * @param array $headers
-     * @return Bold\Checkout\Api\Data\Http\Client\ResultInterface
+     * @return ResultInterface
      */
     public function execute(int $websiteId, string $url, array $headers): ResultInterface
     {
diff --git a/Model/Http/Client/Command/PatchCommand.php b/Model/Http/Client/Command/PatchCommand.php
index 322c42d7..355de9f6 100644
--- a/Model/Http/Client/Command/PatchCommand.php
+++ b/Model/Http/Client/Command/PatchCommand.php
@@ -59,7 +59,7 @@ public function __construct(
      * @param string $url
      * @param array $headers
      * @param array $data
-     * @return Bold\Checkout\Api\Data\Http\Client\ResultInterface
+     * @return ResultInterface
      */
     public function execute(int $websiteId, string $url, array $headers, array $data): ResultInterface
     {
diff --git a/Model/Http/Client/Command/PostCommand.php b/Model/Http/Client/Command/PostCommand.php
index 750dd608..ec24def8 100644
--- a/Model/Http/Client/Command/PostCommand.php
+++ b/Model/Http/Client/Command/PostCommand.php
@@ -59,7 +59,7 @@ public function __construct(
      * @param string $url
      * @param array $headers
      * @param array $data
-     * @return Bold\Checkout\Api\Data\Http\Client\ResultInterface
+     * @return ResultInterface
      */
     public function execute(int $websiteId, string $url, array $headers, array $data): ResultInterface
     {
diff --git a/Model/Http/Client/Command/PutCommand.php b/Model/Http/Client/Command/PutCommand.php
index eb21393c..65f06b52 100644
--- a/Model/Http/Client/Command/PutCommand.php
+++ b/Model/Http/Client/Command/PutCommand.php
@@ -59,7 +59,7 @@ public function __construct(
      * @param string $url
      * @param array $headers
      * @param array $data
-     * @return Bold\Checkout\Api\Data\Http\Client\ResultInterface
+     * @return ResultInterface
      */
     public function execute(int $websiteId, string $url, array $headers, array $data): ResultInterface
     {
diff --git a/Model/ModuleInfo/InstalledModulesProvider.php b/Model/ModuleInfo/InstalledModulesProvider.php
index e604df2e..bb4dd177 100644
--- a/Model/ModuleInfo/InstalledModulesProvider.php
+++ b/Model/ModuleInfo/InstalledModulesProvider.php
@@ -9,8 +9,6 @@
  */
 class InstalledModulesProvider
 {
-    private const PAYPAL_FLOW_MODULE = 'Bold_CheckoutFlowPaypal';
-    
     /**
      * @var array
      */
@@ -34,14 +32,4 @@ public function getModuleList(): array
     {
         return $this->moduleList;
     }
-
-    /**
-     * Get if Paypal Flow module is installed
-     * 
-     * @return bool
-     */
-    public function isPayPalFlowInstalled(): bool
-    {
-        return in_array(self::PAYPAL_FLOW_MODULE, $this->moduleList);
-    }
 }
diff --git a/Model/ModuleInfo/LatestModuleVersionUpdater.php b/Model/ModuleInfo/LatestModuleVersionUpdater.php
index 93bf6924..52a0f50a 100644
--- a/Model/ModuleInfo/LatestModuleVersionUpdater.php
+++ b/Model/ModuleInfo/LatestModuleVersionUpdater.php
@@ -5,7 +5,6 @@
 namespace Bold\Checkout\Model\ModuleInfo;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Shell;
 
 /**
@@ -43,12 +42,11 @@ class LatestModuleVersionUpdater
      * @param ModuleComposerNameProvider $composerNameProvider
      */
     public function __construct(
-        Config                     $config,
-        Shell                      $shell,
-        DirectoryList              $directoryList,
+        Config $config,
+        Shell $shell,
+        DirectoryList $directoryList,
         ModuleComposerNameProvider $composerNameProvider
-    )
-    {
+    ) {
         $this->config = $config;
         $this->shell = $shell;
         $this->directoryList = $directoryList;
@@ -60,7 +58,6 @@ public function __construct(
      *
      * @param string $moduleName
      * @return void
-     * @throws LocalizedException
      */
     public function update(string $moduleName): void
     {
@@ -75,7 +72,6 @@ public function update(string $moduleName): void
      *
      * @param string $moduleName
      * @return string|null
-     * @throws LocalizedException
      */
     private function getLatestModuleVersion(string $moduleName): ?string
     {
diff --git a/Model/ModuleInfo/ModuleComposerNameProvider.php b/Model/ModuleInfo/ModuleComposerNameProvider.php
index 0b8ccdad..dcd80b1f 100644
--- a/Model/ModuleInfo/ModuleComposerNameProvider.php
+++ b/Model/ModuleInfo/ModuleComposerNameProvider.php
@@ -39,8 +39,8 @@ class ModuleComposerNameProvider
      * @param SerializerInterface $serializer
      */
     public function __construct(
-        Reader              $reader,
-        File                $filesystem,
+        Reader $reader,
+        File $filesystem,
         SerializerInterface $serializer
     ) {
         $this->reader = $reader;
diff --git a/Model/ModuleInfo/ModuleComposerVersionProvider.php b/Model/ModuleInfo/ModuleComposerVersionProvider.php
index b063db78..356c2808 100644
--- a/Model/ModuleInfo/ModuleComposerVersionProvider.php
+++ b/Model/ModuleInfo/ModuleComposerVersionProvider.php
@@ -37,8 +37,8 @@ class ModuleComposerVersionProvider
      * @param SerializerInterface $serializer
      */
     public function __construct(
-        Reader              $reader,
-        File                $filesystem,
+        Reader $reader,
+        File $filesystem,
         SerializerInterface $serializer
     ) {
         $this->reader = $reader;
diff --git a/Model/Order/HydrateOrderFromQuote.php b/Model/Order/HydrateOrderFromQuote.php
index 8e34286e..de016581 100644
--- a/Model/Order/HydrateOrderFromQuote.php
+++ b/Model/Order/HydrateOrderFromQuote.php
@@ -73,9 +73,7 @@ public function __construct(
     }
 
     /**
-     * @param CartInterface $quote
-     * @param string $publicOrderId
-     * @return ResultInterface
+     * @inheritDoc
      */
     public function hydrate(CartInterface $quote, string $publicOrderId): ResultInterface
     {
diff --git a/Model/Order/InitOrderFromQuote.php b/Model/Order/InitOrderFromQuote.php
index 84afb260..a60a2c05 100644
--- a/Model/Order/InitOrderFromQuote.php
+++ b/Model/Order/InitOrderFromQuote.php
@@ -4,8 +4,11 @@
 namespace Bold\Checkout\Model\Order;
 
 use Bold\Checkout\Api\Http\ClientInterface;
+use Bold\Checkout\Model\Order\InitOrderFromQuote\OrderDataProcessorInterface;
 use Bold\Checkout\Model\Quote\GetCartLineItems;
 use Bold\Checkout\Model\Quote\QuoteAction;
+use Bold\Checkout\Model\Quote\SetQuoteExtensionData;
+use Bold\Checkout\Model\ResourceModel\Quote\QuoteExtensionData;
 use Magento\Customer\Api\Data\AddressInterface;
 use Magento\Directory\Model\Country;
 use Magento\Directory\Model\ResourceModel\Country\CollectionFactory;
@@ -42,26 +45,42 @@ class InitOrderFromQuote
      */
     private $quoteAction;
 
+    /**
+     * @var SetQuoteExtensionData
+     */
+    private $setQuoteExtensionData;
+
+    /**
+     * @var OrderDataProcessorInterface[]
+     */
+    private $orderDataProcessors;
+
     /**
      * @param ClientInterface $client
      * @param CollectionFactory $countryCollectionFactory
      * @param GetCartLineItems $getCartLineItems
      * @param QuoteAction $quoteAction
+     * @param SetQuoteExtensionData $setQuoteExtensionData
+     * @param OrderDataProcessorInterface[] $orderDataProcessors
      */
     public function __construct(
         ClientInterface $client,
         CollectionFactory $countryCollectionFactory,
         GetCartLineItems $getCartLineItems,
-        QuoteAction $quoteAction
+        QuoteAction $quoteAction,
+        SetQuoteExtensionData $setQuoteExtensionData,
+        array $orderDataProcessors = []
     ) {
         $this->client = $client;
         $this->countryCollectionFactory = $countryCollectionFactory;
         $this->getCartLineItems = $getCartLineItems;
         $this->quoteAction = $quoteAction;
+        $this->setQuoteExtensionData = $setQuoteExtensionData;
+        $this->orderDataProcessors = $orderDataProcessors;
     }
 
     /**
-     * Initialize order on bold side.
+     * Initialize order on Bold side.
      *
      * @param CartInterface $quote
      * @param string $flowId
@@ -113,6 +132,12 @@ public function init(CartInterface $quote, string $flowId = self::FLOW_ID): arra
             throw new LocalizedException(__('Cannot authenticate customer with id="%1"', $quote->getCustomerId()));
         }
 
+        $this->setQuoteExtensionData->execute((int)$quote->getId(), [QuoteExtensionData::ORDER_CREATED => false]);
+
+        foreach ($this->orderDataProcessors as $processor) {
+            $orderData = $processor->process($orderData, $quote);
+        }
+
         return $orderData;
     }
 
diff --git a/Model/Order/InitOrderFromQuote/OrderDataProcessorInterface.php b/Model/Order/InitOrderFromQuote/OrderDataProcessorInterface.php
new file mode 100644
index 00000000..d3e6bb45
--- /dev/null
+++ b/Model/Order/InitOrderFromQuote/OrderDataProcessorInterface.php
@@ -0,0 +1,21 @@
+<?php
+declare(strict_types=1);
+
+namespace Bold\Checkout\Model\Order\InitOrderFromQuote;
+
+use Magento\Quote\Api\Data\CartInterface;
+
+/**
+ * Process bold order data service interface.
+ */
+interface OrderDataProcessorInterface
+{
+    /**
+     * Process bold order data.
+     *
+     * @param array $data
+     * @param CartInterface $quote
+     * @return array
+     */
+    public function process(array $data, CartInterface $quote): array;
+}
diff --git a/Model/Order/PlaceOrder.php b/Model/Order/PlaceOrder.php
index 240b37b5..35b3ccc7 100644
--- a/Model/Order/PlaceOrder.php
+++ b/Model/Order/PlaceOrder.php
@@ -1,5 +1,4 @@
 <?php
-
 declare(strict_types=1);
 
 namespace Bold\Checkout\Model\Order;
@@ -18,6 +17,8 @@
 use Bold\Checkout\Model\Order\PlaceOrder\ProcessOrder;
 use Bold\Checkout\Model\Order\PlaceOrder\Progress;
 use Bold\Checkout\Model\Quote\LoadAndValidate;
+use Bold\Checkout\Model\Quote\QuoteExtensionDataFactory;
+use Bold\Checkout\Model\ResourceModel\Quote\QuoteExtensionData;
 use Exception;
 use Magento\Checkout\Model\Session as CheckoutSession;
 use Magento\Framework\Exception\LocalizedException;
@@ -62,11 +63,6 @@ class PlaceOrder implements PlaceOrderInterface
      */
     private $orderPayloadValidator;
 
-    /**
-     * @var ConfigInterface
-     */
-    private $config;
-
     /**
      * @var CreateOrderFromPayload
      */
@@ -88,32 +84,32 @@ class PlaceOrder implements PlaceOrderInterface
     private $loadAndValidate;
 
     /**
-     * @var \Magento\Quote\Model\MaskedQuoteIdToQuoteIdInterface
+     * @var MaskedQuoteIdToQuoteIdInterface
      */
     private $maskedQuoteIdToQuoteId;
 
     /**
-     * @var \Magento\Store\Model\StoreManagerInterface
+     * @var StoreManagerInterface
      */
     private $storeManager;
 
     /**
-     * @var \Bold\Checkout\Api\Http\ClientInterface
+     * @var ClientInterface
      */
     private $client;
 
     /**
-     * @var \Bold\Checkout\Api\Data\PlaceOrder\Request\OrderDataInterfaceFactory
+     * @var OrderDataInterfaceFactory
      */
     private $orderDataFactory;
 
     /**
-     * @var \Magento\Sales\Api\Data\OrderPaymentInterfaceFactory
+     * @var OrderPaymentInterfaceFactory
      */
     private $paymentFactory;
 
     /**
-     * @var \Magento\Sales\Api\Data\TransactionInterfaceFactory
+     * @var TransactionInterfaceFactory
      */
     private $transactionFactory;
 
@@ -122,21 +118,44 @@ class PlaceOrder implements PlaceOrderInterface
      */
     private $checkoutSession;
 
+    /**
+     * @var ConfigInterface
+     */
+    private $config;
+
+    /**
+     * @var QuoteExtensionDataFactory
+     */
+    private $quoteExtensionDataFactory;
+
+    /**
+     * @var QuoteExtensionData
+     */
+    private $quoteExtensionDataResource;
+
     /**
      * @param OrderPayloadValidator $orderPayloadValidator
      * @param ResultInterfaceFactory $responseFactory
      * @param ErrorInterfaceFactory $errorFactory
-     * @param ConfigInterface $config
      * @param CreateOrderFromPayload $createOrderFromPayload
      * @param ProcessOrder $processOrder
      * @param Progress $progress
+     * @param MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId
      * @param LoadAndValidate $loadAndValidate
+     * @param StoreManagerInterface $storeManager
+     * @param ClientInterface $client
+     * @param OrderDataInterfaceFactory $orderDataFactory
+     * @param OrderPaymentInterfaceFactory $paymentFactory
+     * @param TransactionInterfaceFactory $transactionFactory
+     * @param CheckoutSession $checkoutSession
+     * @param QuoteExtensionDataFactory $quoteExtensionDataFactory
+     * @param QuoteExtensionData $quoteExtensionDataResource
+     * @param ConfigInterface $config
      */
     public function __construct(
         OrderPayloadValidator $orderPayloadValidator,
         ResultInterfaceFactory $responseFactory,
         ErrorInterfaceFactory $errorFactory,
-        ConfigInterface $config,
         CreateOrderFromPayload $createOrderFromPayload,
         ProcessOrder $processOrder,
         Progress $progress,
@@ -147,12 +166,14 @@ public function __construct(
         OrderDataInterfaceFactory $orderDataFactory,
         OrderPaymentInterfaceFactory $paymentFactory,
         TransactionInterfaceFactory $transactionFactory,
-        CheckoutSession $checkoutSession
+        CheckoutSession $checkoutSession,
+        QuoteExtensionDataFactory $quoteExtensionDataFactory,
+        QuoteExtensionData $quoteExtensionDataResource,
+        ConfigInterface $config
     ) {
         $this->responseFactory = $responseFactory;
         $this->errorFactory = $errorFactory;
         $this->orderPayloadValidator = $orderPayloadValidator;
-        $this->config = $config;
         $this->createOrderFromPayload = $createOrderFromPayload;
         $this->processOrder = $processOrder;
         $this->progress = $progress;
@@ -164,6 +185,9 @@ public function __construct(
         $this->paymentFactory = $paymentFactory;
         $this->transactionFactory = $transactionFactory;
         $this->checkoutSession = $checkoutSession;
+        $this->quoteExtensionDataFactory = $quoteExtensionDataFactory;
+        $this->quoteExtensionDataResource = $quoteExtensionDataResource;
+        $this->config = $config;
     }
 
     /**
@@ -185,8 +209,12 @@ public function place(string $shopId, OrderDataInterface $order): ResultInterfac
             return $this->getValidationErrorResponse($e->getMessage());
         }
         try {
-            $websiteId = (int)$quote->getStore()->getWebsiteId();
-            $magentoOrder = $this->config->isCheckoutTypeSelfHosted($websiteId)
+            $quoteExtensionData = $this->quoteExtensionDataFactory->create();
+            $this->quoteExtensionDataResource->load(
+                $quoteExtensionData,
+                $quote->getId(), QuoteExtensionData::QUOTE_ID
+            );
+            $magentoOrder = $quoteExtensionData->getOrderCreated()
                 ? $this->processOrder->process($order)
                 : $this->createOrderFromPayload->createOrder($order, $quote);
         } catch (Exception $e) {
@@ -257,33 +285,33 @@ public function authorizeAndPlace(string $publicOrderId, string $quoteMaskId): R
             return $this->responseFactory->create(
                 [
                     'errors' => array_map(
-                        /**
-                         * @param array{
-                         *     message: string,
-                         *     type: string,
-                         *     field: string,
-                         *     severity: string,
-                         *     sub_type: string,
-                         *     code?: string,
-                         *     transactions?: array{
-                         *         gateway: string,
-                         *         payment_id: string,
-                         *         amount: int,
-                         *         transaction_id: string,
-                         *         currency: string,
-                         *         step: string,
-                         *         status: 'success'|'failed'|'',
-                         *         tender_type: string,
-                         *         tender_details: array{
-                         *             brand: string,
-                         *             last_four: string,
-                         *             bin: string,
-                         *             expiration: string
-                         *         },
-                         *         gateway_response_data: string[]
-                         *     }[]
-                         * } $error
-                         */
+                    /**
+                     * @param array{
+                     *     message: string,
+                     *     type: string,
+                     *     field: string,
+                     *     severity: string,
+                     *     sub_type: string,
+                     *     code?: string,
+                     *     transactions?: array{
+                     *         gateway: string,
+                     *         payment_id: string,
+                     *         amount: int,
+                     *         transaction_id: string,
+                     *         currency: string,
+                     *         step: string,
+                     *         status: 'success'|'failed'|'',
+                     *         tender_type: string,
+                     *         tender_details: array{
+                     *             brand: string,
+                     *             last_four: string,
+                     *             bin: string,
+                     *             expiration: string
+                     *         },
+                     *         gateway_response_data: string[]
+                     *     }[]
+                     * } $error
+                     */
                         function (array $error): ErrorInterface {
                             return $this->errorFactory->create(
                                 [
diff --git a/Model/Order/PlaceOrder/CreateOrderFromPayload.php b/Model/Order/PlaceOrder/CreateOrderFromPayload.php
index dfcca672..bab50c8f 100644
--- a/Model/Order/PlaceOrder/CreateOrderFromPayload.php
+++ b/Model/Order/PlaceOrder/CreateOrderFromPayload.php
@@ -6,6 +6,7 @@
 use Bold\Checkout\Api\Data\PlaceOrder\Request\OrderDataInterface;
 use Bold\Checkout\Model\Order\OrderExtensionData;
 use Bold\Checkout\Model\Order\OrderExtensionDataFactory;
+use Bold\Checkout\Model\Order\PlaceOrder\CreateOrderFromPayload\CreateOrderFromQuote;
 use Bold\Checkout\Model\ResourceModel\Order\OrderExtensionData as OrderExtensionDataResource;
 use Exception;
 use Magento\Framework\Event\ManagerInterface as EventManagerInterface;
diff --git a/Model/Order/PlaceOrder/CreateOrderFromQuote.php b/Model/Order/PlaceOrder/CreateOrderFromPayload/CreateOrderFromQuote.php
similarity index 99%
rename from Model/Order/PlaceOrder/CreateOrderFromQuote.php
rename to Model/Order/PlaceOrder/CreateOrderFromPayload/CreateOrderFromQuote.php
index 1c905156..5743c335 100644
--- a/Model/Order/PlaceOrder/CreateOrderFromQuote.php
+++ b/Model/Order/PlaceOrder/CreateOrderFromPayload/CreateOrderFromQuote.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Bold\Checkout\Model\Order\PlaceOrder;
+namespace Bold\Checkout\Model\Order\PlaceOrder\CreateOrderFromPayload;
 
 use Bold\Checkout\Api\Data\PlaceOrder\Request\OrderDataInterface;
 use Bold\Checkout\Model\Payment\Gateway\Service;
diff --git a/Model/Order/PlaceOrder/ProcessOrder.php b/Model/Order/PlaceOrder/ProcessOrder.php
index cc87398b..c272c721 100644
--- a/Model/Order/PlaceOrder/ProcessOrder.php
+++ b/Model/Order/PlaceOrder/ProcessOrder.php
@@ -12,9 +12,7 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Sales\Api\Data\OrderInterface;
-use Magento\Sales\Api\Data\OrderInterfaceFactory;
 use Magento\Sales\Model\OrderRepository;
-use Magento\Sales\Model\ResourceModel\Order;
 
 /**
  * Process order in case of self-hosted checkout.
diff --git a/Model/Payment/Gateway/Config/CanUseCheckoutValueHandler.php b/Model/Payment/Gateway/Config/CanUseCheckoutValueHandler.php
index 39e127c3..dac9851a 100644
--- a/Model/Payment/Gateway/Config/CanUseCheckoutValueHandler.php
+++ b/Model/Payment/Gateway/Config/CanUseCheckoutValueHandler.php
@@ -29,6 +29,7 @@ public function __construct(Session $checkoutSession)
      */
     public function handle(array $subject, $storeId = null): bool
     {
-        return $this->checkoutSession->getBoldCheckoutData() !== null;
+        return $this->checkoutSession->getBoldCheckoutData() !== null
+            && !$this->checkoutSession->getQuote()->getIsMultiShipping();
     }
 }
diff --git a/Model/Payment/Gateway/Config/IsActiveValueHandler.php b/Model/Payment/Gateway/Config/IsActiveValueHandler.php
index 18b74c63..c0adaff3 100644
--- a/Model/Payment/Gateway/Config/IsActiveValueHandler.php
+++ b/Model/Payment/Gateway/Config/IsActiveValueHandler.php
@@ -41,7 +41,8 @@ public function handle(array $subject, $storeId = null)
     {
         try {
             if ($this->state->getAreaCode() === Area::AREA_FRONTEND) {
-                return $this->checkoutSession->getBoldCheckoutData() !== null;
+                return $this->checkoutSession->getBoldCheckoutData() !== null
+                    && !$this->checkoutSession->getQuote()->getIsMultiShipping();
             }
         } catch (LocalizedException $e) {
             return false;
diff --git a/Model/Payment/Gateway/Config/TitleValueHandler.php b/Model/Payment/Gateway/Config/TitleValueHandler.php
index e4f49885..502ea732 100644
--- a/Model/Payment/Gateway/Config/TitleValueHandler.php
+++ b/Model/Payment/Gateway/Config/TitleValueHandler.php
@@ -3,9 +3,10 @@
 
 namespace Bold\Checkout\Model\Payment\Gateway\Config;
 
-use Bold\Checkout\Model\ConfigInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Payment\Gateway\Config\ValueHandlerInterface;
 use Magento\Payment\Gateway\Data\PaymentDataObject;
+use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
@@ -14,7 +15,7 @@
 class TitleValueHandler implements ValueHandlerInterface
 {
     /**
-     * @var ConfigInterface
+     * @var ScopeConfigInterface
      */
     private $config;
 
@@ -24,13 +25,23 @@ class TitleValueHandler implements ValueHandlerInterface
     private $storeManager;
 
     /**
-     * @param ConfigInterface $config
+     * @var string
+     */
+    private $path;
+
+    /**
+     * @param ScopeConfigInterface $config
      * @param StoreManagerInterface $storeManager
+     * @param string $path
      */
-    public function __construct(ConfigInterface $config, StoreManagerInterface $storeManager)
-    {
+    public function __construct(
+        ScopeConfigInterface $config,
+        StoreManagerInterface $storeManager,
+        string $path
+    ) {
         $this->config = $config;
         $this->storeManager = $storeManager;
+        $this->path = $path;
     }
 
     /**
@@ -46,8 +57,7 @@ public function handle(array $subject, $storeId = null)
                 $store = $this->storeManager->getDefaultStoreView();
                 $websiteId = (int)$store->getWebsiteId();
             }
-
-            return $this->config->getPaymentTitle($websiteId);
+            return $this->config->getValue($this->path, ScopeInterface::SCOPE_WEBSITE, $websiteId);
         }
         $ccLast4 = $paymentObject->getPayment()->getCcLast4();
         $ccType = $paymentObject->getPayment()->getCcType();
@@ -58,8 +68,7 @@ public function handle(array $subject, $storeId = null)
                 $store = $this->storeManager->getStore($storeId);
                 $websiteId = (int)$store->getWebsiteId();
             }
-
-            return $this->config->getPaymentTitle($websiteId);
+            return $this->config->getValue($this->path, ScopeInterface::SCOPE_WEBSITE, $websiteId);
         }
 
         return strlen($ccLast4) === 4
diff --git a/Model/Quote/QuoteExtensionData.php b/Model/Quote/QuoteExtensionData.php
new file mode 100644
index 00000000..1123af32
--- /dev/null
+++ b/Model/Quote/QuoteExtensionData.php
@@ -0,0 +1,65 @@
+<?php
+declare(strict_types=1);
+
+namespace Bold\Checkout\Model\Quote;
+
+use Bold\Checkout\Model\ResourceModel\Quote\QuoteExtensionData as QuoteExtensionDataResource;
+use Magento\Framework\Model\AbstractModel;
+
+/**
+ * Bold quote data entity.
+ */
+class QuoteExtensionData extends AbstractModel
+{
+    /**
+     * @inheritDoc
+     */
+    public function _construct()
+    {
+        $this->_init(QuoteExtensionDataResource::class);
+    }
+
+    /**
+     * Set quote entity id.
+     *
+     * @param int $quoteId
+     * @return void
+     */
+    public function setQuoteId(int $quoteId): void
+    {
+        $this->setData(QuoteExtensionDataResource::QUOTE_ID, $quoteId);
+    }
+
+    /**
+     * Retrieve quote id.
+     *
+     * @return int|null
+     */
+    public function getQuoteId(): ?int
+    {
+        return $this->getData(QuoteExtensionDataResource::QUOTE_ID)
+            ? (int)$this->getData(QuoteExtensionDataResource::QUOTE_ID)
+            : null;
+    }
+
+    /**
+     * Set order should be created on Magento side.
+     *
+     * @param bool $orderCreated
+     * @return void
+     */
+    public function setOrderCreated(bool $orderCreated): void
+    {
+        $this->setData(QuoteExtensionDataResource::ORDER_CREATED, $orderCreated);
+    }
+
+    /**
+     * Get order should be created on Magento side.
+     *
+     * @return bool|null
+     */
+    public function getOrderCreated(): ?bool
+    {
+        return (bool)$this->getData(QuoteExtensionDataResource::ORDER_CREATED);
+    }
+}
diff --git a/Model/Quote/SetQuoteAddresses.php b/Model/Quote/SetQuoteAddresses.php
index 990eb6ba..199125b0 100644
--- a/Model/Quote/SetQuoteAddresses.php
+++ b/Model/Quote/SetQuoteAddresses.php
@@ -5,7 +5,6 @@
 
 use Bold\Checkout\Api\Data\Quote\ResultInterface;
 use Bold\Checkout\Api\Quote\SetQuoteAddressesInterface;
-use Bold\Checkout\Model\ConfigInterface;
 use Bold\Checkout\Model\Quote\Result\Builder;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Quote\Api\Data\AddressInterface;
@@ -37,30 +36,22 @@ class SetQuoteAddresses implements SetQuoteAddressesInterface
      */
     private $loadAndValidate;
 
-    /**
-     * @var ConfigInterface
-     */
-    private $config;
-
     /**
      * @param ShippingAssignmentProcessor $shippingAssignmentProcessor
      * @param Builder $quoteResultBuilder
      * @param QuoteResource $quoteResource
      * @param LoadAndValidate $loadAndValidate
-     * @param ConfigInterface $config
      */
     public function __construct(
         ShippingAssignmentProcessor $shippingAssignmentProcessor,
         Builder $quoteResultBuilder,
         QuoteResource $quoteResource,
-        LoadAndValidate $loadAndValidate,
-        ConfigInterface $config
+        LoadAndValidate $loadAndValidate
     ) {
         $this->shippingAssignmentProcessor = $shippingAssignmentProcessor;
         $this->quoteResultBuilder = $quoteResultBuilder;
         $this->quoteResource = $quoteResource;
         $this->loadAndValidate = $loadAndValidate;
-        $this->config = $config;
     }
 
     /**
@@ -89,9 +80,15 @@ public function setAddresses(
         $shippingAddress = $shippingAddress === null || $shippingAddress->getSameAsBilling()
             ? $billingAddress
             : $shippingAddress;
-        $quote->getBillingAddress()->addData($billingAddress->getData());
+        if ($this->addressDataChanged($quote->getBillingAddress(), $billingAddress)) {
+            $quote->removeAddress($quote->getBillingAddress()->getId());
+            $quote->setBillingAddress($billingAddress);
+        }
         if (!$quote->isVirtual()) {
-            $quote->getShippingAddress()->addData($shippingAddress->getData());
+            if ($this->addressDataChanged($quote->getShippingAddress(), $shippingAddress)) {
+                $quote->removeAddress($quote->getShippingAddress()->getId());
+                $quote->setShippingAddress($shippingAddress);
+            }
             $shippingAssignment = $this->shippingAssignmentProcessor->create($quote);
             $quote->getExtensionAttributes()->setShippingAssignments([$shippingAssignment]);
             $quote->setExtensionAttributes($quote->getExtensionAttributes());
@@ -102,4 +99,26 @@ public function setAddresses(
         $this->quoteResource->save($quote);
         return $this->quoteResultBuilder->createSuccessResult($quote);
     }
+
+    /**
+     * Check if address data has changed.
+     *
+     * @param AddressInterface $originalAddress
+     * @param AddressInterface $newAddress
+     * @return bool
+     */
+    private function addressDataChanged(AddressInterface $originalAddress, AddressInterface $newAddress): bool
+    {
+        return $originalAddress->getFirstname() !== $newAddress->getFirstname()
+            || $originalAddress->getLastname() !== $newAddress->getLastname()
+            || $originalAddress->getStreet() !== $newAddress->getStreet()
+            || $originalAddress->getCity() !== $newAddress->getCity()
+            || $originalAddress->getCompany() !== $newAddress->getCompany()
+            || $originalAddress->getRegion() !== $newAddress->getRegion()
+            || $originalAddress->getRegionCode() !== $newAddress->getRegionCode()
+            || (int)$originalAddress->getRegionId() !== (int)$newAddress->getRegionId()
+            || $originalAddress->getPostcode() !== $newAddress->getPostcode()
+            || $originalAddress->getCountryId() !== $newAddress->getCountryId()
+            || $originalAddress->getTelephone() !== $newAddress->getTelephone();
+    }
 }
diff --git a/Model/Quote/SetQuoteExtensionData.php b/Model/Quote/SetQuoteExtensionData.php
new file mode 100644
index 00000000..7c240f7b
--- /dev/null
+++ b/Model/Quote/SetQuoteExtensionData.php
@@ -0,0 +1,72 @@
+<?php
+declare(strict_types=1);
+
+namespace Bold\Checkout\Model\Quote;
+
+use Bold\Checkout\Model\ResourceModel\Quote\QuoteExtensionData as QuoteExtensionDataResource;
+use Exception;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Set quote extension data.
+ */
+class SetQuoteExtensionData
+{
+    /**
+     * @var QuoteExtensionDataFactory
+     */
+    private $quoteExtensionDataFactory;
+
+    /**
+     * @var QuoteExtensionDataResource
+     */
+    private $quoteExtensionDataResource;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @param QuoteExtensionDataFactory $quoteExtensionDataFactory
+     * @param QuoteExtensionDataResource $quoteExtensionDataResource
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        QuoteExtensionDataFactory $quoteExtensionDataFactory,
+        QuoteExtensionDataResource $quoteExtensionDataResource,
+        LoggerInterface $logger
+    ) {
+        $this->quoteExtensionDataFactory = $quoteExtensionDataFactory;
+        $this->quoteExtensionDataResource = $quoteExtensionDataResource;
+        $this->logger = $logger;
+    }
+
+    /**
+     * Set quote extension data.
+     *
+     * @param int $quoteId
+     * @param array $data
+     * @return void
+     */
+    public function execute(int $quoteId, array $data): void
+    {
+        try {
+            $quoteExtensionData = $this->quoteExtensionDataFactory->create();
+            $this->quoteExtensionDataResource->load(
+                $quoteExtensionData,
+                $quoteId,
+                QuoteExtensionDataResource::QUOTE_ID
+            );
+            if (!$quoteExtensionData->getId()) {
+                $quoteExtensionData->setQuoteId($quoteId);
+            }
+            foreach ($data as $key => $value) {
+                $quoteExtensionData->setData($key, $value);
+            }
+            $this->quoteExtensionDataResource->save($quoteExtensionData);
+        } catch (Exception $e) {
+            $this->logger->error($e->getMessage());
+        }
+    }
+}
diff --git a/Model/RedirectToBoldCheckout/IsOrderInitializationAllowedForCart.php b/Model/RedirectToBoldCheckout/IsOrderInitializationAllowedForCart.php
new file mode 100644
index 00000000..bb5df4ec
--- /dev/null
+++ b/Model/RedirectToBoldCheckout/IsOrderInitializationAllowedForCart.php
@@ -0,0 +1,39 @@
+<?php
+declare(strict_types=1);
+
+namespace Bold\Checkout\Model\RedirectToBoldCheckout;
+
+use Bold\Checkout\Model\Quote\IsBoldCheckoutAllowedForCart;
+use Magento\Framework\App\RequestInterface;
+use Magento\Quote\Api\Data\CartInterface;
+
+/**
+ * Check if Bold order initialization is available for quote.
+ */
+class IsOrderInitializationAllowedForCart implements IsOrderInitializationAllowedInterface
+{
+    /**
+     * @var IsBoldCheckoutAllowedForCart
+     */
+    private $allowedForCart;
+
+    /**
+     * @param IsBoldCheckoutAllowedForCart $allowedForCart
+     */
+    public function __construct(IsBoldCheckoutAllowedForCart $allowedForCart)
+    {
+        $this->allowedForCart = $allowedForCart;
+    }
+
+    /**
+     * Check if Bold order initialization is available for quote.
+     *
+     * @param CartInterface $quote
+     * @param RequestInterface $request
+     * @return bool
+     */
+    public function isAllowed(CartInterface $quote, RequestInterface $request): bool
+    {
+        return $this->allowedForCart->isAllowed($quote);
+    }
+}
diff --git a/Model/RedirectToBoldCheckout/IsOrderInitializationAllowedForRequest.php b/Model/RedirectToBoldCheckout/IsOrderInitializationAllowedForRequest.php
new file mode 100644
index 00000000..b012bed3
--- /dev/null
+++ b/Model/RedirectToBoldCheckout/IsOrderInitializationAllowedForRequest.php
@@ -0,0 +1,39 @@
+<?php
+declare(strict_types=1);
+
+namespace Bold\Checkout\Model\RedirectToBoldCheckout;
+
+use Bold\Checkout\Model\IsBoldCheckoutAllowedForRequest;
+use Magento\Framework\App\RequestInterface;
+use Magento\Quote\Api\Data\CartInterface;
+
+/**
+ * Check if Bold order initialization is available for request.
+ */
+class IsOrderInitializationAllowedForRequest implements IsOrderInitializationAllowedInterface
+{
+    /**
+     * @var IsBoldCheckoutAllowedForRequest
+     */
+    private $allowedForRequest;
+
+    /**
+     * @param IsBoldCheckoutAllowedForRequest $allowedForRequest
+     */
+    public function __construct(IsBoldCheckoutAllowedForRequest $allowedForRequest)
+    {
+        $this->allowedForRequest = $allowedForRequest;
+    }
+
+    /**
+     * Check if Bold order initialization is available for request.
+     *
+     * @param CartInterface $quote
+     * @param RequestInterface $request
+     * @return bool
+     */
+    public function isAllowed(CartInterface $quote, RequestInterface $request): bool
+    {
+        return $this->allowedForRequest->isAllowed($quote, $request);
+    }
+}
diff --git a/Model/RedirectToBoldCheckout/IsOrderInitializationAllowedInterface.php b/Model/RedirectToBoldCheckout/IsOrderInitializationAllowedInterface.php
new file mode 100644
index 00000000..80a1d28a
--- /dev/null
+++ b/Model/RedirectToBoldCheckout/IsOrderInitializationAllowedInterface.php
@@ -0,0 +1,22 @@
+<?php
+declare(strict_types=1);
+
+namespace Bold\Checkout\Model\RedirectToBoldCheckout;
+
+use Magento\Framework\App\RequestInterface;
+use Magento\Quote\Api\Data\CartInterface;
+
+/**
+ * Check if Bold order initialization is available.
+ */
+interface IsOrderInitializationAllowedInterface
+{
+    /**
+     * Check if Bold order initialization is available.
+     *
+     * @param CartInterface $quote
+     * @param RequestInterface $request
+     * @return bool
+     */
+    public function isAllowed(CartInterface $quote, RequestInterface $request): bool;
+}
diff --git a/Model/RedirectToBoldCheckout/IsOrderInitializationAllowedPool.php b/Model/RedirectToBoldCheckout/IsOrderInitializationAllowedPool.php
new file mode 100644
index 00000000..1ba1c4ca
--- /dev/null
+++ b/Model/RedirectToBoldCheckout/IsOrderInitializationAllowedPool.php
@@ -0,0 +1,45 @@
+<?php
+declare(strict_types=1);
+
+namespace Bold\Checkout\Model\RedirectToBoldCheckout;
+
+use Magento\Framework\App\RequestInterface;
+use Magento\Quote\Api\Data\CartInterface;
+
+/**
+ * Pool for Bold order initialization is availability checkers.
+ */
+class IsOrderInitializationAllowedPool implements IsOrderInitializationAllowedInterface
+{
+    /**
+     * @var IsOrderInitializationAllowedInterface[]
+     */
+    private $elementList;
+
+    /**
+     * @param IsOrderInitializationAllowedInterface[] $elementList
+     */
+    public function __construct(
+        array $elementList = []
+    ) {
+        $this->elementList = $elementList;
+    }
+
+    /**
+     * Check if Bold order initialization is available.
+     *
+     * @param CartInterface $quote
+     * @param RequestInterface $request
+     * @return bool
+     */
+    public function isAllowed(CartInterface $quote, RequestInterface $request): bool
+    {
+        return array_reduce(
+            $this->elementList,
+            function (bool $allowed, IsOrderInitializationAllowedInterface $item) use ($quote, $request) {
+                return $allowed && $item->isAllowed($quote, $request);
+            },
+            true
+        );
+    }
+}
diff --git a/Model/RedirectToBoldCheckout/IsRedirectToBoldCheckoutAllowedByParallel.php b/Model/RedirectToBoldCheckout/IsRedirectToBoldCheckoutAllowedByParallel.php
new file mode 100644
index 00000000..e18ef6ee
--- /dev/null
+++ b/Model/RedirectToBoldCheckout/IsRedirectToBoldCheckoutAllowedByParallel.php
@@ -0,0 +1,46 @@
+<?php
+declare(strict_types=1);
+
+namespace Bold\Checkout\Model\RedirectToBoldCheckout;
+
+use Bold\Checkout\Block\Onepage\Button;
+use Bold\Checkout\Model\ConfigInterface;
+use Magento\Framework\App\RequestInterface;
+use Magento\Quote\Api\Data\CartInterface;
+
+/**
+ * Check if the redirect to Bold checkout is allowed by parallel checkout.
+ */
+class IsRedirectToBoldCheckoutAllowedByParallel implements IsRedirectToBoldCheckoutAllowedInterface
+{
+    /**
+     * @var ConfigInterface
+     */
+    private $config;
+
+    /**
+     * @param ConfigInterface $config
+     */
+    public function __construct(
+        ConfigInterface $config
+    ) {
+        $this->config = $config;
+    }
+
+    /**
+     * Check if the redirect to Bold checkout is allowed by parallel checkout.
+     *
+     * @param CartInterface $quote
+     * @param RequestInterface $request
+     * @return bool
+     */
+    public function isAllowed(CartInterface $quote, RequestInterface $request): bool
+    {
+        $websiteId = (int)$quote->getStore()->getWebsiteId();
+        if ($this->config->isCheckoutTypeParallel($websiteId)) {
+            return (bool)$request->getParam(Button::KEY_PARALLEL);
+        }
+
+        return true;
+    }
+}
diff --git a/Model/RedirectToBoldCheckout/IsRedirectToBoldCheckoutAllowedInterface.php b/Model/RedirectToBoldCheckout/IsRedirectToBoldCheckoutAllowedInterface.php
new file mode 100644
index 00000000..aa73c4c4
--- /dev/null
+++ b/Model/RedirectToBoldCheckout/IsRedirectToBoldCheckoutAllowedInterface.php
@@ -0,0 +1,22 @@
+<?php
+declare(strict_types=1);
+
+namespace Bold\Checkout\Model\RedirectToBoldCheckout;
+
+use Magento\Framework\App\RequestInterface;
+use Magento\Quote\Api\Data\CartInterface;
+
+/**
+ * Check if the redirect to Bold checkout allowed.
+ */
+interface IsRedirectToBoldCheckoutAllowedInterface
+{
+    /**
+     * Check if the redirect to Bold checkout allowed.
+     *
+     * @param CartInterface $quote
+     * @param RequestInterface $request
+     * @return bool
+     */
+    public function isAllowed(CartInterface $quote, RequestInterface $request): bool;
+}
diff --git a/Model/RedirectToBoldCheckout/IsRedirectToBoldCheckoutAllowedPool.php b/Model/RedirectToBoldCheckout/IsRedirectToBoldCheckoutAllowedPool.php
new file mode 100644
index 00000000..c2ea189a
--- /dev/null
+++ b/Model/RedirectToBoldCheckout/IsRedirectToBoldCheckoutAllowedPool.php
@@ -0,0 +1,45 @@
+<?php
+declare(strict_types=1);
+
+namespace Bold\Checkout\Model\RedirectToBoldCheckout;
+
+use Magento\Framework\App\RequestInterface;
+use Magento\Quote\Api\Data\CartInterface;
+
+/**
+ * Check if the redirect to Bold checkout allowed pool.
+ */
+class IsRedirectToBoldCheckoutAllowedPool implements IsRedirectToBoldCheckoutAllowedInterface
+{
+    /**
+     * @var IsRedirectToBoldCheckoutAllowedInterface[]
+     */
+    private $elementList;
+
+    /**
+     * @param IsRedirectToBoldCheckoutAllowedInterface[] $elementList
+     */
+    public function __construct(
+        array $elementList = []
+    ) {
+        $this->elementList = $elementList;
+    }
+
+    /**
+     * Check if the redirect to Bold checkout allowed.
+     *
+     * @param CartInterface $quote
+     * @param RequestInterface $request
+     * @return bool
+     */
+    public function isAllowed(CartInterface $quote, RequestInterface $request): bool
+    {
+        return array_reduce(
+            $this->elementList,
+            function (bool $allowed, IsRedirectToBoldCheckoutAllowedInterface $item) use ($quote, $request) {
+                return $allowed && $item->isAllowed($quote, $request);
+            },
+            true
+        );
+    }
+}
diff --git a/Model/ResourceModel/Quote/QuoteExtensionData.php b/Model/ResourceModel/Quote/QuoteExtensionData.php
new file mode 100644
index 00000000..59ef3661
--- /dev/null
+++ b/Model/ResourceModel/Quote/QuoteExtensionData.php
@@ -0,0 +1,25 @@
+<?php
+declare(strict_types=1);
+
+namespace Bold\Checkout\Model\ResourceModel\Quote;
+
+use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
+
+/**
+ * Bold quote data resource model.
+ */
+class QuoteExtensionData extends AbstractDb
+{
+    public const TABLE = 'bold_checkout_quote';
+    public const ID = 'id';
+    public const QUOTE_ID = 'quote_id';
+    public const ORDER_CREATED = 'order_created';
+
+    /**
+     * @inheritDoc
+     */
+    protected function _construct(): void
+    {
+        $this->_init(self::TABLE, self::ID);
+    }
+}
diff --git a/Observer/Checkout/RedirectToBoldCheckoutObserver.php b/Observer/Checkout/RedirectToBoldCheckoutObserver.php
index b031dec9..c645cd11 100644
--- a/Observer/Checkout/RedirectToBoldCheckoutObserver.php
+++ b/Observer/Checkout/RedirectToBoldCheckoutObserver.php
@@ -5,9 +5,9 @@
 
 use Bold\Checkout\Api\Http\ClientInterface;
 use Bold\Checkout\Model\ConfigInterface;
-use Bold\Checkout\Model\IsBoldCheckoutAllowedForRequest;
 use Bold\Checkout\Model\Order\InitOrderFromQuote;
-use Bold\Checkout\Model\Quote\IsBoldCheckoutAllowedForCart;
+use Bold\Checkout\Model\RedirectToBoldCheckout\IsOrderInitializationAllowedInterface;
+use Bold\Checkout\Model\RedirectToBoldCheckout\IsRedirectToBoldCheckoutAllowedInterface;
 use Exception;
 use Magento\Checkout\Model\Session;
 use Magento\Framework\Event\Observer;
@@ -15,20 +15,10 @@
 use Psr\Log\LoggerInterface;
 
 /**
- * Redirect to bold checkout if allowed.
+ * Redirect to Bold checkout if allowed.
  */
 class RedirectToBoldCheckoutObserver implements ObserverInterface
 {
-    /**
-     * @var IsBoldCheckoutAllowedForCart
-     */
-    private $allowedForCart;
-
-    /**
-     * @var IsBoldCheckoutAllowedForRequest
-     */
-    private $allowedForRequest;
-
     /**
      * @var Session
      */
@@ -55,30 +45,40 @@ class RedirectToBoldCheckoutObserver implements ObserverInterface
     private $client;
 
     /**
-     * @param IsBoldCheckoutAllowedForCart $allowedForCart
-     * @param IsBoldCheckoutAllowedForRequest $allowedForRequest
+     * @var IsOrderInitializationAllowedInterface
+     */
+    private $isOrderInitializationAllowed;
+
+    /**
+     * @var IsRedirectToBoldCheckoutAllowedInterface
+     */
+    private $isRedirectToBoldCheckoutAllowed;
+
+    /**
      * @param Session $session
      * @param InitOrderFromQuote $initOrderFromQuote
      * @param ConfigInterface $config
      * @param LoggerInterface $logger
      * @param ClientInterface $client
+     * @param IsOrderInitializationAllowedInterface $isOrderInitializationAllowed
+     * @param IsRedirectToBoldCheckoutAllowedInterface $isRedirectToBoldCheckoutAllowed
      */
     public function __construct(
-        IsBoldCheckoutAllowedForCart $allowedForCart,
-        IsBoldCheckoutAllowedForRequest $allowedForRequest,
         Session $session,
         InitOrderFromQuote $initOrderFromQuote,
         ConfigInterface $config,
         LoggerInterface $logger,
-        ClientInterface $client
+        ClientInterface $client,
+        IsOrderInitializationAllowedInterface $isOrderInitializationAllowed,
+        IsRedirectToBoldCheckoutAllowedInterface $isRedirectToBoldCheckoutAllowed
     ) {
-        $this->allowedForCart = $allowedForCart;
-        $this->allowedForRequest = $allowedForRequest;
         $this->session = $session;
         $this->initOrderFromQuote = $initOrderFromQuote;
         $this->config = $config;
         $this->logger = $logger;
         $this->client = $client;
+        $this->isOrderInitializationAllowed = $isOrderInitializationAllowed;
+        $this->isRedirectToBoldCheckoutAllowed = $isRedirectToBoldCheckoutAllowed;
     }
 
     /**
@@ -89,17 +89,14 @@ public function execute(Observer $observer): void
         $quote = $this->session->getQuote();
         $request = $observer->getRequest();
         $this->session->setBoldCheckoutData(null);
-        if (!$this->allowedForCart->isAllowed($quote)) {
-            return;
-        }
-        if (!$this->allowedForRequest->isAllowed($quote, $request)) {
-            return;
-        }
         $websiteId = (int)$quote->getStore()->getWebsiteId();
         try {
+            if (!$this->isOrderInitializationAllowed->isAllowed($quote, $request)) {
+                return;
+            }
             $checkoutData = $this->initOrderFromQuote->init($quote);
             $this->session->setBoldCheckoutData($checkoutData);
-            if ($this->config->isCheckoutTypeSelfHosted($websiteId)) {
+            if (!$this->isRedirectToBoldCheckoutAllowed->isAllowed($quote, $request)) {
                 return;
             }
             $this->client->get($websiteId, 'refresh');
diff --git a/Observer/Order/SaveOrderExtensionDataObserver.php b/Observer/Order/SaveOrderExtensionDataObserver.php
index 6fb58f94..c84bf4cf 100644
--- a/Observer/Order/SaveOrderExtensionDataObserver.php
+++ b/Observer/Order/SaveOrderExtensionDataObserver.php
@@ -4,7 +4,6 @@
 namespace Bold\Checkout\Observer\Order;
 
 use Bold\Checkout\Model\Order\OrderExtensionDataFactory;
-use Bold\Checkout\Model\Payment\Gateway\Service;
 use Bold\Checkout\Model\ResourceModel\Order\OrderExtensionData as OrderExtensionDataResource;
 use Exception;
 use Magento\Checkout\Model\Session;
@@ -37,22 +36,30 @@ class SaveOrderExtensionDataObserver implements ObserverInterface
      */
     private $eventManager;
 
+    /**
+     * @var array
+     */
+    private $boldPaymentMethods;
+
     /**
      * @param OrderExtensionDataFactory $orderExtensionDataFactory
      * @param OrderExtensionDataResource $orderExtensionDataResource
      * @param Session $checkoutSession
      * @param EventManagerInterface $eventManager
+     * @param array $boldPaymentMethods
      */
     public function __construct(
         OrderExtensionDataFactory $orderExtensionDataFactory,
         OrderExtensionDataResource $orderExtensionDataResource,
         Session $checkoutSession,
-        EventManagerInterface $eventManager
+        EventManagerInterface $eventManager,
+        array $boldPaymentMethods = []
     ) {
         $this->orderExtensionDataFactory = $orderExtensionDataFactory;
         $this->orderExtensionDataResource = $orderExtensionDataResource;
         $this->checkoutSession = $checkoutSession;
         $this->eventManager = $eventManager;
+        $this->boldPaymentMethods = $boldPaymentMethods;
     }
 
     /**
@@ -64,7 +71,10 @@ public function __construct(
     public function execute(Observer $observer)
     {
         $order = $observer->getEvent()->getOrder();
-        if ($order->getPayment()->getMethod() !== Service::CODE) {
+        if (!$order) {
+            return;
+        }
+        if (!\in_array($order->getPayment()->getMethod(), \array_values($this->boldPaymentMethods), true)) {
             return;
         }
         $orderId = (int)$order->getEntityId();
diff --git a/PATCHES.md b/PATCHES.md
index b1dfbd94..4dcedbeb 100644
--- a/PATCHES.md
+++ b/PATCHES.md
@@ -18,5 +18,3 @@ cp vendor/bold-commerce/module-checkout/patches/[file].patch m2-hotfixes
 | File                          | Magento version | Description                                     |
 |-------------------------------|-----------------|-------------------------------------------------|
 | MAGETWO-70885_2.3.3-p1        | <= 2.3.3-p1     | Fix order increment ID changing on order update |
-| MAGETWO-PAYMENT-BOOSTER_2.3.1 | <= 2.3.1        | Compatability fix for Payment Booster           |
-| MAGETWO-PAYMENT-BOOSTER_2.3.4 | <= 2.3.4        | Compatability fix for Payment Booster           |
diff --git a/Setup/Patch/Data/MoveLifeElementsConfigurationPatch.php b/Setup/Patch/Data/MoveLifeElementsConfigurationPatch.php
new file mode 100644
index 00000000..810a0525
--- /dev/null
+++ b/Setup/Patch/Data/MoveLifeElementsConfigurationPatch.php
@@ -0,0 +1,67 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Bold\Checkout\Setup\Patch\Data;
+
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+
+/**
+ * Update Life element configuration path.
+ */
+class MoveLifeElementsConfigurationPatch implements DataPatchInterface
+{
+    private const SOURCE = 'checkout/bold_checkout_life_elements/life_elements';
+    private const TARGET = 'checkout/bold_checkout_custom_elements/life_elements';
+    private const PATH = 'path';
+
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function apply()
+    {
+        $this->moduleDataSetup->startSetup();
+
+        $table = $this->moduleDataSetup->getTable('core_config_data');
+        $this->moduleDataSetup->updateTableRow(
+            $table,
+            self::PATH,
+            self::SOURCE,
+            self::PATH,
+            self::TARGET
+        );
+
+        $this->moduleDataSetup->endSetup();
+    }
+}
diff --git a/UI/Payment/ConfigProvider.php b/UI/Payment/ConfigProvider.php
deleted file mode 100644
index 3485266e..00000000
--- a/UI/Payment/ConfigProvider.php
+++ /dev/null
@@ -1,201 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Bold\Checkout\UI\Payment;
-
-use Bold\Checkout\Api\Http\ClientInterface;
-use Bold\Checkout\Model\ConfigInterface;
-use Bold\Checkout\Model\Payment\Gateway\Service;
-use Magento\Checkout\Model\ConfigProviderInterface;
-use Magento\Checkout\Model\Session;
-use Magento\Directory\Model\AllowedCountries;
-use Magento\Directory\Model\Country;
-use Magento\Directory\Model\ResourceModel\Country\CollectionFactory;
-use Magento\Framework\Exception\FileSystemException;
-use Magento\Framework\Exception\ValidatorException;
-use Magento\Framework\Filesystem\Directory\ReadFactory;
-use Magento\Framework\Module\Dir;
-use Magento\Framework\Module\Dir\Reader;
-use Magento\Framework\Serialize\Serializer\Json;
-use Magento\Store\Model\StoreManagerInterface;
-
-/**
- * Config provider for Bold Checkout.
- */
-class ConfigProvider implements ConfigProviderInterface
-{
-    /**
-     * @var Session
-     */
-    private $checkoutSession;
-
-    /**
-     * @var ClientInterface
-     */
-    private $client;
-
-    /**
-     * @var StoreManagerInterface
-     */
-    private $storeManager;
-
-    /**
-     * @var ConfigInterface
-     */
-    private $config;
-
-    /**
-     * @var Json
-     */
-    private $json;
-
-    /**
-     * @var Reader
-     */
-    private $moduleReader;
-
-    /**
-     * @var ReadFactory
-     */
-    private $readFactory;
-
-    /**
-     * @var AllowedCountries
-     */
-    private $allowedCountries;
-
-    /**
-     * @var CollectionFactory
-     */
-    private $collectionFactory;
-
-    /**
-     * @var array
-     */
-    private $countries;
-
-    /**
-     * @param Session $checkoutSession
-     * @param ConfigInterface $config
-     * @param ClientInterface $client
-     * @param StoreManagerInterface $storeManager
-     * @param AllowedCountries $allowedCountries
-     * @param CollectionFactory $collectionFactory
-     * @param Json $json
-     * @param Reader $moduleReader
-     * @param ReadFactory $readFactory
-     */
-    public function __construct(
-        Session $checkoutSession,
-        ConfigInterface $config,
-        ClientInterface $client,
-        StoreManagerInterface $storeManager,
-        AllowedCountries $allowedCountries,
-        CollectionFactory $collectionFactory,
-        Json $json,
-        Reader $moduleReader,
-        ReadFactory $readFactory
-    ) {
-        $this->checkoutSession = $checkoutSession;
-        $this->client = $client;
-        $this->storeManager = $storeManager;
-        $this->config = $config;
-        $this->json = $json;
-        $this->moduleReader = $moduleReader;
-        $this->readFactory = $readFactory;
-        $this->allowedCountries = $allowedCountries;
-        $this->collectionFactory = $collectionFactory;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getConfig(): array
-    {
-        $boldCheckoutData = $this->checkoutSession->getBoldCheckoutData();
-        if (!$boldCheckoutData) {
-            return [];
-        }
-        $websiteId = (int)$this->storeManager->getWebsite()->getId();
-        $shopId = $this->config->getShopId($websiteId);
-        $orderId = $boldCheckoutData['data']['public_order_id'] ?? null;
-        $jwtToken = $boldCheckoutData['data']['jwt_token'] ?? null;
-        return [
-            'bold' => [
-                'payment' => [
-                    'iframeSrc' => $this->getIframeSrc(),
-                    'method' => Service::CODE,
-                ],
-                'shopId' => $shopId,
-                'publicOrderId' => $orderId,
-                'jwtToken' => $jwtToken,
-                'countries' => $this->getAllowedCountries(),
-                'url' => $this->client->getUrl($websiteId, ''),
-            ],
-        ];
-    }
-
-    /**
-     * Get iframe src.
-     *
-     * @return string|null
-     */
-    private function getIframeSrc(): ?string
-    {
-        $boldCheckoutData = $this->checkoutSession->getBoldCheckoutData();
-        if (!$boldCheckoutData) {
-            return null;
-        }
-        $websiteId = (int)$this->storeManager->getWebsite()->getId();
-        try {
-            $styles = $this->getStyles();
-            if ($styles) {
-                $this->client->post($websiteId, 'payments/styles', $styles);
-            }
-        } catch (\Exception $e) {
-            return null;
-        }
-        $orderId = $boldCheckoutData['data']['public_order_id'] ?? null;
-        $jwtToken = $boldCheckoutData['data']['jwt_token'] ?? null;
-        if (!$orderId || !$jwtToken) {
-            return null;
-        }
-        return $this->client->getUrl($websiteId, 'payments/iframe?token=' . $jwtToken);
-    }
-
-    /**
-     * Get iframe styles.
-     *
-     * @return array
-     * @throws FileSystemException
-     * @throws ValidatorException
-     */
-    private function getStyles(): array
-    {
-        $dir = $this->moduleReader->getModuleDir(Dir::MODULE_VIEW_DIR, 'Bold_Checkout');
-        $read = $this->readFactory->create($dir . DIRECTORY_SEPARATOR . 'frontend' . DIRECTORY_SEPARATOR . 'web');
-        if (!$read->isFile('iframe-styles.json')) {
-            return [];
-        }
-        return $this->json->unserialize($read->readFile('iframe-styles.json'));
-    }
-
-    /**
-     * Get allowed countries.
-     *
-     * @return Country[]
-     */
-    public function getAllowedCountries(): array
-    {
-        if ($this->countries) {
-            return $this->countries;
-        }
-        $allowedCountries = $this->allowedCountries->getAllowedCountries();
-        $countriesCollection = $this->collectionFactory->create()->addFieldToFilter(
-            'country_id',
-            ['in' => $allowedCountries]
-        );
-        $this->countries = $countriesCollection->toOptionArray(false);
-        return $this->countries;
-    }
-}
diff --git a/composer.json b/composer.json
index 5b78bf6c..150e149e 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
   "license": [
     "MIT"
   ],
-  "version": "1.2.1",
+  "version": "2.0.0",
   "require": {
     "ext-curl": "*",
     "magento/framework": ">=102.0.1 <103.0.8",
diff --git a/etc/adminhtml/di.xml b/etc/adminhtml/di.xml
index 52aeed95..eb13b122 100644
--- a/etc/adminhtml/di.xml
+++ b/etc/adminhtml/di.xml
@@ -12,7 +12,7 @@
             <argument name="paths" xsi:type="array">
                 <item name="bold_checkout_base" xsi:type="string">checkout/bold_checkout_base/%</item>
                 <item name="bold_checkout_advanced" xsi:type="string">checkout/bold_checkout_advanced/%</item>
-                <item name="bold_checkout_life_elements" xsi:type="string">checkout/bold_checkout_life_elements/%</item>
+                <item name="bold_checkout_custom_elements" xsi:type="string">checkout/bold_checkout_custom_elements/%</item>
                 <item name="latest_version" xsi:type="string">checkout/bold_checkout/latest_version_%</item>
             </argument>
         </arguments>
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index f832ddf5..07829816 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -20,17 +20,12 @@
                     <source_model>Bold\Checkout\Model\Config\Source\CheckoutTypeSource</source_model>
                     <comment><![CDATA[
                         Bold-Hosted (Standard) — replace the native checkout with Bold Checkout's three-page checkout.<br>
-                        Dual —  allow customers to choose between the native checkout or Bold Checkout.<br>
-                        Payment Booster — use the native checkout with Bold Checkout's payment options.<br>
-                        Self-Hosted — replace the native checkout with Bold Checkout's <a target='_blank' href="https://github.com/bold-commerce/checkout-experience-templates">Open Source Checkout Templates</a>.
+                        Dual —  allow customers to choose between the native checkout or Bold Checkout.
                     ]]></comment>
                 </field>
                 <field id="payment_title" translate="label" type="text" sortOrder="16" showInDefault="1" showInWebsite="1">
                     <label>Payment Title</label>
                     <comment>Payment title that will be displayed on the checkout page.</comment>
-                    <depends>
-                        <field id="type">2</field>
-                    </depends>
                 </field>
                 <field id="parallel_checkout_button_title" translate="label" type="text" sortOrder="17" showInDefault="1" showInWebsite="1">
                     <label>Bold Checkout Button Title</label>
@@ -70,17 +65,14 @@
                      Otherwise, if the status is not 'Active', open the 'System' -> 'Integrations' grid, find the Integration named <strong>'{{integrationName}}'</strong> and Activate or Reauthorize it.]]></comment>
                 </field>
             </group>
-            <group id="bold_checkout_life_elements" translate="label" sortOrder="105" showInDefault="1" showInWebsite="1">
-                <label>Bold Checkout Extension (LiFE) Elements</label>
+            <group id="bold_checkout_custom_elements" translate="label" sortOrder="105" showInDefault="1" showInWebsite="1">
+                <label>Bold Checkout Customization Settings</label>
                 <field id="life_elements" translate="label" sortOrder="10" showInDefault="1" showInWebsite="1">
-                    <label>Custom elements</label>
+                    <label>Custom Elements</label>
                     <frontend_model>Bold\Checkout\Block\System\Config\Form\Field\LifeElements</frontend_model>
                     <backend_model>Magento\Config\Model\Config\Backend\Serialized\ArraySerialized</backend_model>
                     <comment><![CDATA[For more information about the locations and where they are, refer to the <a href="https://developer.boldcommerce.com/guides/checkout/life">Checkout LiFE guide</a>.]]></comment>
                 </field>
-                <depends>
-                    <field id="checkout/bold_checkout_base/type" separator=",">0,1</field>
-                </depends>
             </group>
             <group id="bold_checkout_advanced" translate="label" sortOrder="110" showInDefault="1" showInWebsite="1">
                 <label>Bold Checkout Extension Advanced Settings</label>
diff --git a/etc/config.xml b/etc/config.xml
index 402cea1c..f1ab6bcb 100644
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -15,6 +15,7 @@
                 <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
                 <can_void>1</can_void>
                 <can_cancel>1</can_cancel>
+                <sort_order>2</sort_order>
                 <group>bold_payments</group>
             </bold>
         </payment>
@@ -32,7 +33,7 @@
                 <validate_coupon_codes>1</validate_coupon_codes>
                 <platform_connector_url>https://adobe-commerce-connector.boldapps.net/platform/shops/</platform_connector_url>
                 <api_url>https://api.boldcommerce.com/</api_url>
-                <checkout_url>https://checkout.boldcommerce.com/</checkout_url>
+                <checkout_url>https://flows.boldcommerce.com/</checkout_url>
                 <updates_check>1</updates_check>
             </bold_checkout_advanced>
             <bold_checkout_latest>
diff --git a/etc/csp_whitelist.xml b/etc/csp_whitelist.xml
deleted file mode 100644
index 8eafb3de..00000000
--- a/etc/csp_whitelist.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<csp_whitelist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Csp:etc/csp_whitelist.xsd">
-    <policies>
-        <policy id="connect-src">
-            <values>
-                <value id="bold_commerce" type="host">https://api.boldcommerce.com</value>
-                <value id="bold_commerce_staging" type="host">https://api.staging.boldcommerce.com</value>
-                <value id="cashier" type="host">https://cashier.boldcommerce.com</value>
-            </values>
-        </policy>
-        <policy id="script-src">
-            <values>
-                <value id="bold_commerce" type="host">https://api.boldcommerce.com</value>
-            </values>
-        </policy>
-        <policy id="frame-src">
-            <values>
-                <value id="bold_commerce" type="host">https://api.boldcommerce.com</value>
-            </values>
-        </policy>
-        <policy id="img-src">
-            <values>
-                <value id="bold_commerce_static" type="host">https://static.boldcommerce.com</value>
-            </values>
-        </policy>
-    </policies>
-</csp_whitelist>
diff --git a/etc/db_schema.xml b/etc/db_schema.xml
index 997bc9a3..2d66b7f8 100644
--- a/etc/db_schema.xml
+++ b/etc/db_schema.xml
@@ -22,4 +22,15 @@
             <column name="quote_id"/>
         </index>
     </table>
+    <table name="bold_checkout_quote" resource="default" engine="innodb" comment="Bold Checkout Quote Additional Data">
+        <column xsi:type="int" name="id" unsigned="true" nullable="false" identity="true" comment="ID"/>
+        <column xsi:type="int" name="quote_id" unsigned="true" nullable="false" identity="false" comment="Magento Quote ID"/>
+        <column xsi:type="smallint" name="order_created" default="0" comment="Magento Order Should Be Created On Magento Side"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="id"/>
+        </constraint>
+        <constraint xsi:type="unique" referenceId="BOLD_CHECKOUT_QUOTE_QUOTE_ID">
+            <column name="quote_id"/>
+        </constraint>
+    </table>
 </schema>
diff --git a/etc/db_schema_whitelist.json b/etc/db_schema_whitelist.json
index 386be22f..b0e301c0 100644
--- a/etc/db_schema_whitelist.json
+++ b/etc/db_schema_whitelist.json
@@ -26,5 +26,16 @@
     "constraint": {
       "PRIMARY": true
     }
+  },
+  "bold_checkout_quote": {
+    "column": {
+      "id": true,
+      "quote_id": true,
+      "order_created": true
+    },
+    "constraint": {
+      "PRIMARY": true, 
+      "BOLD_CHECKOUT_QUOTE_QUOTE_ID": true
+    }
   }
 }
diff --git a/etc/di.xml b/etc/di.xml
index 76903690..38868cd0 100644
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -103,6 +103,11 @@
         </arguments>
     </virtualType>
     <!--Value Handler Pool-->
+    <type name="Bold\Checkout\Model\Payment\Gateway\Config\TitleValueHandler">
+        <arguments>
+            <argument name="path" xsi:type="const">Bold\Checkout\Model\Config::PATH_PAYMENT_TITLE</argument>
+        </arguments>
+    </type>
     <virtualType name="Bold\Checkout\Gateway\Config\ValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
         <arguments>
             <argument name="handlers" xsi:type="array">
@@ -141,4 +146,11 @@
             </argument>
         </arguments>
     </type>
+    <type name="Bold\Checkout\Observer\Order\SaveOrderExtensionDataObserver">
+        <arguments>
+            <argument name="boldPaymentMethods" xsi:type="array">
+                <item name="bold_checkout" xsi:type="string">bold</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/etc/frontend/di.xml b/etc/frontend/di.xml
index 95340036..d5312988 100644
--- a/etc/frontend/di.xml
+++ b/etc/frontend/di.xml
@@ -1,15 +1,23 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <type name="Bold\Checkout\UI\Payment\ConfigProvider">
+
+    <preference for="Bold\Checkout\Model\RedirectToBoldCheckout\IsOrderInitializationAllowedInterface"
+                type="Bold\Checkout\Model\RedirectToBoldCheckout\IsOrderInitializationAllowedPool"/>
+    <preference for="Bold\Checkout\Model\RedirectToBoldCheckout\IsRedirectToBoldCheckoutAllowedInterface"
+                type="Bold\Checkout\Model\RedirectToBoldCheckout\IsRedirectToBoldCheckoutAllowedPool"/>
+    <type name="Bold\Checkout\Model\RedirectToBoldCheckout\IsOrderInitializationAllowedPool">
         <arguments>
-            <argument name="client" xsi:type="object">Bold\Checkout\Model\Http\BoldStorefrontClient</argument>
+            <argument name="elementList" xsi:type="array">
+                <item name="isAllowedForRequest" xsi:type="object">Bold\Checkout\Model\RedirectToBoldCheckout\IsOrderInitializationAllowedForRequest</item>
+                <item name="isAllowedForCart" xsi:type="object">Bold\Checkout\Model\RedirectToBoldCheckout\IsOrderInitializationAllowedForCart</item>
+            </argument>
         </arguments>
     </type>
-    <type name="Magento\Checkout\Model\CompositeConfigProvider">
+    <type name="Bold\Checkout\Model\RedirectToBoldCheckout\IsRedirectToBoldCheckoutAllowedPool">
         <arguments>
-            <argument name="configProviders" xsi:type="array">
-                <item name="bold_config_provider" xsi:type="object">Bold\Checkout\UI\Payment\ConfigProvider</item>
+            <argument name="elementList" xsi:type="array">
+                <item name="isAllowedByParallelCheckout" xsi:type="object">Bold\Checkout\Model\RedirectToBoldCheckout\IsRedirectToBoldCheckoutAllowedByParallel</item>
             </argument>
         </arguments>
     </type>
diff --git a/patches/MAGETWO-PAYMENT-BOOSTER_2.3.1.patch b/patches/MAGETWO-PAYMENT-BOOSTER_2.3.1.patch
deleted file mode 100644
index b2009dee..00000000
--- a/patches/MAGETWO-PAYMENT-BOOSTER_2.3.1.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-diff --git a/vendor/magento/module-sales/Model/ResourceModel/EntityAbstract.php b/vendor/magento/module-sales/Model/ResourceModel/EntityAbstract.php
-index 8061227..acb4548 100644
---- a/vendor/magento/module-sales/Model/ResourceModel/EntityAbstract.php
-+++ b/vendor/magento/module-sales/Model/ResourceModel/EntityAbstract.php
-@@ -122,7 +122,7 @@ abstract class EntityAbstract extends AbstractDb
-     protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
-     {
-         /** @var \Magento\Sales\Model\AbstractModel $object */
--        if ($object instanceof EntityInterface && $object->getIncrementId() == null) {
-+        if ($object instanceof EntityInterface && $object->getEntityId() == null && $object->getIncrementId() == null) {
-             $store = $object->getStore();
-             $storeId = $store->getId();
-             if ($storeId === null) {
-
-diff --git a/vendor/magento/module-sales-rule/view/frontend/web/js/action/select-payment-method-mixin.js b/vendor/magento/module-sales-rule/view/frontend/web/js/action/select-payment-method-mixin.js
-new file mode 100644
---- /dev/null
-+++ b/vendor/magento/module-sales-rule/view/frontend/web/js/action/select-payment-method-mixin.js
-@@ -0,0 +1,32 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+define([
-+    'jquery',
-+    'mage/utils/wrapper',
-+    'Magento_Checkout/js/model/quote',
-+    'Magento_SalesRule/js/model/payment/discount-messages',
-+    'Magento_Checkout/js/action/set-payment-information',
-+    'Magento_Checkout/js/action/get-totals'
-+], function ($, wrapper, quote, messageContainer, setPaymentInformationAction, getTotalsAction) {
-+    'use strict';
-+
-+    return function (selectPaymentMethodAction) {
-+
-+        return wrapper.wrap(selectPaymentMethodAction, function (originalSelectPaymentMethodAction, paymentMethod) {
-+
-+            originalSelectPaymentMethodAction(paymentMethod);
-+
-+            $.when(
-+                setPaymentInformationAction(
-+                    messageContainer,
-+                    {
-+                        method: paymentMethod.method
-+                    }
-+                )
-+            );
-+        });
-+    };
-+
-+});
-
-===================================================================
-
-diff --git a/vendor/magento/module-sales-rule/view/frontend/requirejs-config.js b/vendor/magento/module-sales-rule/view/frontend/requirejs-config.js
-new file mode 100644
---- /dev/null
-+++ b/vendor/magento/module-sales-rule/view/frontend/requirejs-config.js
-@@ -0,0 +1,14 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+var config = {
-+  config: {
-+    mixins: {
-+      'Magento_Checkout/js/action/select-payment-method': {
-+        'Magento_SalesRule/js/action/select-payment-method-mixin': true
-+      }
-+    }
-+  }
-+};
-
-
-diff --git a/vendor/magento/module-quote/Model/QuoteManagement.php b/vendor/magento/module-quote/Model/QuoteManagement.php
-index 6ed8393..4ec442c 100644
---- a/vendor/magento/module-quote/Model/QuoteManagement.php
-+++ b/vendor/magento/module-quote/Model/QuoteManagement.php
-@@ -248,6 +248,8 @@ class QuoteManagement implements \Magento\Quote\Api\CartManagementInterface
-         $storeId = $this->storeManager->getStore()->getStoreId();
-         $quote = $this->createCustomerCart($customerId, $storeId);
-
-+        $this->_prepareCustomerQuote($quote);
-+
-         try {
-             $this->quoteRepository->save($quote);
-         } catch (\Exception $e) {
-@@ -563,7 +565,14 @@ class QuoteManagement implements \Magento\Quote\Api\CartManagementInterface
-         if ($shipping && !$shipping->getSameAsBilling()
-             && (!$shipping->getCustomerId() || $shipping->getSaveInAddressBook())
-         ) {
--            $shippingAddress = $shipping->exportCustomerAddress();
-+            if ($shipping->getQuoteId()) {
-+                $shippingAddress = $shipping->exportCustomerAddress();
-+            } else {
-+                $defaultShipping = $this->customerRepository->getById($customer->getId())->getDefaultShipping();
-+                if ($defaultShipping) {
-+                    $shippingAddress = $this->addressRepository->getById($defaultShipping);
-+                }
-+            }
-             if (!$hasDefaultShipping) {
-                 //Make provided address as default shipping address
-                 $shippingAddress->setIsDefaultShipping(true);
-@@ -583,7 +592,14 @@ class QuoteManagement implements \Magento\Quote\Api\CartManagementInterface
-         }
-
-         if (!$billing->getCustomerId() || $billing->getSaveInAddressBook()) {
--            $billingAddress = $billing->exportCustomerAddress();
-+            if ($billing->getQuoteId()) {
-+                $billingAddress = $billing->exportCustomerAddress();
-+            } else {
-+                $defaultBilling = $this->customerRepository->getById($customer->getId())->getDefaultBilling();
-+                if ($defaultBilling) {
-+                    $billingAddress = $this->addressRepository->getById($defaultBilling);
-+                }
-+            }
-             if (!$hasDefaultBilling) {
-                 //Make provided address as default shipping address
-                 if (!$hasDefaultShipping) {
-
-diff --git a/vendor/magento/module-checkout/Model/Session.php b/vendor/magento/module-checkout/Model/Session.php
-index 618f745e771..0addbf069cb 100644
---- a/vendor/magento/module-checkout/Model/Session.php
-+++ b/vendor/magento/module-checkout/Model/Session.php
-@@ -291,6 +291,7 @@ class Session extends \Magento\Framework\Session\SessionManager
-                     }
-                 } else {
-                     $quote->setIsCheckoutCart(true);
-+                    $quote->setCustomerIsGuest(1);
-                     $this->_eventManager->dispatch('checkout_quote_init', ['quote' => $quote]);
-                 }
-             }
-@@ -382,8 +383,10 @@ class Session extends \Magento\Framework\Session\SessionManager
-
-         if ($customerQuote->getId() && $this->getQuoteId() != $customerQuote->getId()) {
-             if ($this->getQuoteId()) {
-+                $quote = $this->getQuote();
-+                $quote->setCustomerIsGuest(0);
-                 $this->quoteRepository->save(
--                    $customerQuote->merge($this->getQuote())->collectTotals()
-+                    $customerQuote->merge($quote)->collectTotals()
-                 );
-                 $newQuote = $this->quoteRepository->get($customerQuote->getId());
-                 $this->quoteRepository->save(
-@@ -402,6 +405,7 @@ class Session extends \Magento\Framework\Session\SessionManager
-             $this->getQuote()->getBillingAddress();
-             $this->getQuote()->getShippingAddress();
-             $this->getQuote()->setCustomer($this->_customerSession->getCustomerDataObject())
-+                ->setCustomerIsGuest(0)
-                 ->setTotalsCollectedFlag(false)
-                 ->collectTotals();
-             $this->quoteRepository->save($this->getQuote());
-
-diff --git a/vendor/magento/module-quote/Model/QuoteManagement.php b/vendor/magento/module-quote/Model/QuoteManagement.php
-index 3a81341e2b0..b0aef022dcd 100644
---- a/vendor/magento/module-quote/Model/QuoteManagement.php
-+++ b/vendor/magento/module-quote/Model/QuoteManagement.php
-@@ -24,7 +24,7 @@ use Magento\Sales\Api\OrderManagementInterface as OrderManagement;
- use Magento\Store\Model\StoreManagerInterface;
-
- /**
-- * Class QuoteManagement
-+ * Class for managing quote
-  *
-  * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
-  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
-@@ -250,6 +250,7 @@ class QuoteManagement implements \Magento\Quote\Api\CartManagementInterface
-
-         $quote->setBillingAddress($this->quoteAddressFactory->create());
-         $quote->setShippingAddress($this->quoteAddressFactory->create());
-+        $quote->setCustomerIsGuest(1);
-
-         try {
-             $quote->getShippingAddress()->setCollectShippingRates(true);
diff --git a/patches/MAGETWO-PAYMENT-BOOSTER_2.3.4.patch b/patches/MAGETWO-PAYMENT-BOOSTER_2.3.4.patch
deleted file mode 100644
index 39fbb814..00000000
--- a/patches/MAGETWO-PAYMENT-BOOSTER_2.3.4.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff --git a/src/vendor/magento/module-sales-rule/view/frontend/web/js/action/select-payment-method-mixin.js b/src/vendor/magento/module-sales-rule/view/frontend/web/js/action/select-payment-method-mixin.js
-new file mode 100644
---- /dev/null
-+++ b/src/vendor/magento/module-sales-rule/view/frontend/web/js/action/select-payment-method-mixin.js
-@@ -0,0 +1,32 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+define([
-+    'jquery',
-+    'mage/utils/wrapper',
-+    'Magento_Checkout/js/model/quote',
-+    'Magento_SalesRule/js/model/payment/discount-messages',
-+    'Magento_Checkout/js/action/set-payment-information',
-+    'Magento_Checkout/js/action/get-totals'
-+], function ($, wrapper, quote, messageContainer, setPaymentInformationAction, getTotalsAction) {
-+    'use strict';
-+
-+    return function (selectPaymentMethodAction) {
-+
-+        return wrapper.wrap(selectPaymentMethodAction, function (originalSelectPaymentMethodAction, paymentMethod) {
-+
-+            originalSelectPaymentMethodAction(paymentMethod);
-+
-+            $.when(
-+                setPaymentInformationAction(
-+                    messageContainer,
-+                    {
-+                        method: paymentMethod.method
-+                    }
-+                )
-+            );
-+        });
-+    };
-+
-+});
-
-===================================================================
-
-diff --git a/src/vendor/magento/module-sales-rule/view/frontend/requirejs-config.js b/src/vendor/magento/module-sales-rule/view/frontend/requirejs-config.js
-new file mode 100644
---- /dev/null
-+++ b/src/vendor/magento/module-sales-rule/view/frontend/requirejs-config.js
-@@ -0,0 +1,14 @@
-+/**
-+ * Copyright © Magento, Inc. All rights reserved.
-+ * See COPYING.txt for license details.
-+ */
-+
-+var config = {
-+  config: {
-+    mixins: {
-+      'Magento_Checkout/js/action/select-payment-method': {
-+        'Magento_SalesRule/js/action/select-payment-method-mixin': true
-+      }
-+    }
-+  }
-+};
diff --git a/view/adminhtml/web/css/system-styles.less b/view/adminhtml/web/css/system-styles.less
index e0c24cb0..db646a34 100644
--- a/view/adminhtml/web/css/system-styles.less
+++ b/view/adminhtml/web/css/system-styles.less
@@ -1,9 +1,9 @@
-#checkout_bold_checkout_life_elements colgroup.label,
-#row_checkout_bold_checkout_life_elements_life_elements .label {
+#checkout_bold_checkout_custom_elements colgroup.label,
+#row_checkout_bold_checkout_custom_elements_life_elements .label {
     width: 15%;
 }
 
-#row_checkout_bold_checkout_life_elements_life_elements .value {
+#row_checkout_bold_checkout_custom_elements_life_elements .value {
     width: 75%;
 }
 
diff --git a/view/frontend/layout/checkout_index_index.xml b/view/frontend/layout/checkout_index_index.xml
deleted file mode 100644
index 4fa78eaf..00000000
--- a/view/frontend/layout/checkout_index_index.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-    <body>
-        <referenceBlock name="checkout.root">
-            <arguments>
-                <argument name="jsLayout" xsi:type="array">
-                    <item name="components" xsi:type="array">
-                        <item name="checkout" xsi:type="array">
-                            <item name="children" xsi:type="array">
-                                <item name="steps" xsi:type="array">
-                                    <item name="children" xsi:type="array">
-                                        <item name="billing-step" xsi:type="array">
-                                            <item name="children" xsi:type="array">
-                                                <item name="payment" xsi:type="array">
-                                                    <item name="children" xsi:type="array">
-                                                        <item name="renders" xsi:type="array">
-                                                            <item name="children" xsi:type="array">
-                                                                <item name="bold" xsi:type="array">
-                                                                    <item name="component" xsi:type="string">Bold_Checkout/js/view/payment/bold-methods</item>
-                                                                    <item name="methods" xsi:type="array">
-                                                                        <item name="bold" xsi:type="array">
-                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
-                                                                        </item>
-                                                                    </item>
-                                                                </item>
-                                                            </item>
-                                                        </item>
-                                                    </item>
-                                                </item>
-                                            </item>
-                                        </item>
-                                    </item>
-                                </item>
-                            </item>
-                        </item>
-                    </item>
-                </argument>
-            </arguments>
-        </referenceBlock>
-    </body>
-</page>
diff --git a/view/frontend/web/iframe-styles.json b/view/frontend/web/iframe-styles.json
deleted file mode 100644
index abe0dca2..00000000
--- a/view/frontend/web/iframe-styles.json
+++ /dev/null
@@ -1,370 +0,0 @@
-{
-  "css_rules": [
-    {
-      "cssText": "*, ::before, ::after { box-sizing: border-box; }"
-    },
-    {
-      "cssText": "html { font-size: 14px; }"
-    },
-    {
-      "cssText": "body { font-family: -apple-system, BlinkMacSystemFont, \"Segoe UI\", Roboto, Helvetica, Arial, sans-serif, \"Apple Color Emoji\", \"Segoe UI Emoji\", \"Segoe UI Symbol\"; font-size: 100%; color: rgb(26, 26, 26); padding: 0px; margin: 0px; }"
-    },
-    {
-      "cssText": ".LoadingSpinner { display: block; width: 20px; height: 20px; position: relative; }"
-    },
-    {
-      "cssText": ".LoadingSpinner::before { content: \"\"; border-width: 2px; border-style: solid; border-color: currentcolor rgba(255, 255, 255, 0.15) rgba(255, 255, 255, 0.15); border-image: initial; border-radius: 50%; position: absolute; width: 100%; height: 100%; left: 50%; top: 50%; margin-left: -10px; margin-top: -10px; animation: 0.5s linear 0s infinite normal none running spin; display: block; }"
-    },
-    {
-      "cssText": ".Button { appearance: none; box-sizing: border-box; display: inline-block; cursor: pointer; font-size: inherit; padding: 1rem 1.25rem; background: rgb(252, 252, 252); border: none; box-shadow: rgb(230, 230, 230) 0px 0px 0px 1px inset; font-weight: 500; border-radius: 4px; transition: background-color 0.2s ease-out 0s, color 0.2s ease-out 0s, box-shadow 0.2s ease-out 0s; position: relative; }"
-    },
-    {
-      "cssText": ".Button:focus { outline: none; }"
-    },
-    {
-      "cssText": ".Button:hover { background-color: rgb(255, 255, 255); }"
-    },
-    {
-      "cssText": ".Button:active { background-color: rgb(229, 229, 229); }"
-    },
-    {
-      "cssText": ".Button--Primary { background-color: rgb(10, 117, 194); color: rgb(255, 255, 255); box-shadow: none; }"
-    },
-    {
-      "cssText": ".Button--Primary:hover { background-color: rgb(0, 191, 255); }"
-    },
-    {
-      "cssText": ".Button--Primary:active { background-color: rgb(0, 115, 153); }"
-    },
-    {
-      "cssText": ".Button__LoadingSpinner { display: none; width: 20px; height: 20px; position: absolute; left: 50%; top: 50%; margin-left: -10px; margin-top: -10px; }"
-    },
-    {
-      "cssText": ".Button:disabled,  .Button:disabled:hover,  .Button:disabled:focus,  .Button:disabled:active { background-color: rgb(204, 204, 204); color: rgb(255, 255, 255); cursor: not-allowed; }"
-    },
-    {
-      "cssText": ".InputField,  .CreditCardInputField { appearance: none; font-size: inherit; border: none; background-color: rgb(255, 255, 255); box-shadow: rgb(148, 148, 148) 0px 0px 0px 1px inset; padding: 1rem 0.5rem; border-radius: 5px; }"
-    },
-    {
-      "cssText": ".InputField:focus,  .CreditCardInputField:focus { outline: none; box-shadow: rgb(10, 117, 194) 0px 0px 0px 2px inset; }"
-    },
-    {
-      "cssText": ".ToggleField__Input { font-size: inherit; width: 18px; height: 18px; cursor: pointer; box-shadow: rgb(148, 148, 148) 0px 0px 0px 1px inset; transition: all 0.2s ease-in-out 0s; border: none; border-radius: 4px; appearance: none; background: transparent; box-sizing: border-box; vertical-align: middle; position: relative; top: -0.1rem; }"
-    },
-    {
-      "cssText": ".ToggleField__Input--Checkbox,  .ToggleField__Input--Radio { margin: 0px 0.5rem 0px 0px; }"
-    },
-    {
-      "cssText": ".ToggleField__Input--Checkbox { width: 18px; height: 18px; cursor: pointer; transition: all 0.2s ease-in-out 0s; border: none; border-radius: 4px; background: 0px 0px; box-sizing: border-box; vertical-align: middle; padding: initial; margin: 0px 15px 0px 0px; }"
-    },
-    {
-      "cssText": ".ToggleField__Input--Checkbox::after { content: \"\"; display: block; position: absolute; width: 18px; height: 18px; top: 0px; left: 0px; background-image: url(\"https://static.boldcommerce.com/images/checkout/experience/checkbox_white.svg\"); background-position: center center; background-repeat: no-repeat; transition: all 0.2s ease-in-out 0.1s; transform: scale(0); }"
-    },
-    {
-      "cssText": ".ToggleField__Input:focus { box-shadow: rgb(10, 117, 194) 0px 0px 0px 2px inset; }"
-    },
-    {
-      "cssText": ".ToggleField__Input--Radio { border-radius: 9px; }"
-    },
-    {
-      "cssText": ".ToggleField__Input:checked { box-shadow: rgb(10, 117, 194) 0px 0px 0px 10px inset; border-color: transparent; }"
-    },
-    {
-      "cssText": ".ToggleField__Input--Checkbox:checked::after { transform: scale(1); }"
-    },
-    {
-      "cssText": ".ToggleField__Input--Radio:checked { box-shadow: rgb(10, 117, 194) 0px 0px 0px 6px inset; }"
-    },
-    {
-      "cssText": ".Field { width: 100%; position: relative; }"
-    },
-    {
-      "cssText": ".Field--WithInputField .Field__Label,  .Field--WithCreditCardField .Field__Label { position: absolute; font-size: 80%; padding-left: 0.5em; padding-top: 0.5em; color: rgb(136, 136, 136); transform: translateY(0.5em); opacity: 0; transition: all 0.2s ease 0s; }"
-    },
-    {
-      "cssText": ".Field .InputField,  .Field .CreditCardInputField { display: block; width: 100%; transition: all 0.2s ease-out 0s; }"
-    },
-    {
-      "cssText": ".Field .CreditCardInputField { padding-top: 1.5rem; padding-bottom: 0.5rem; }"
-    },
-    {
-      "cssText": ".Field--WithCreditCardField .Field__Label { transform: translateY(0px); opacity: 1; }"
-    },
-    {
-      "cssText": ".TogglePanel { border-bottom: 1px solid rgb(217, 217, 217); }"
-    },
-    {
-      "cssText": ".TogglePanel:last-of-type { border-bottom: none; }"
-    },
-    {
-      "cssText": ".TogglePanel:last-of-type .TogglePanel__Content { border-radius: 0px 0px 4px 4px; }"
-    },
-    {
-      "cssText": ".TogglePanel__Header { padding: 10px; }"
-    },
-    {
-      "cssText": ".TogglePanel__Content { display: none; padding: 10px; border-top: 1px solid rgb(230, 230, 230); background-color: rgb(250, 250, 250); }"
-    },
-    {
-      "cssText": ".TogglePanel__Content::after { display: table; content: \"\"; clear: both; }"
-    },
-    {
-      "cssText": ".TogglePanel--alt > .TogglePanel__Content { display: block; }"
-    },
-    {
-      "cssText": ".TogglePanel__Header { display: flex; align-items: baseline; }"
-    },
-    {
-      "cssText": ".TogglePanelGroup { border: 1px solid rgb(148, 148, 148); border-radius: 5px; flex: 0 0 auto; width: 100%; }"
-    },
-    {
-      "cssText": ".FieldSet { margin: 2rem 0px; padding: 0px; }"
-    },
-    {
-      "cssText": ".FieldSet::after { display: table; content: \"\"; clear: both; }"
-    },
-    {
-      "cssText": ".Main { padding: 2rem 4%; }"
-    },
-    {
-      "cssText": ".Field--SaveShippingAddressToggle { margin-top: 1.5rem; }"
-    },
-    {
-      "cssText": ".TogglePanel--alt.PaymentMethod--CreditCard > .TogglePanel__Content,  .TogglePanel--alt.PaymentMethod--CreditCard__StoredOption > .TogglePanel__Content { display: flex; flex-wrap: wrap; }"
-    },
-    {
-      "cssText": ".Field--GiftCardNumber { flex: 1 1 0%; }"
-    },
-    {
-      "cssText": "#gift_card_number:not(:placeholder-shown) { text-transform: uppercase; }"
-    },
-    {
-      "cssText": "#gift_card_cvv { }"
-    },
-    {
-      "cssText": ".Field--WithInputField .Field__Label { position: absolute; font-size: 80%; padding-left: 0.5em; padding-top: 0.5em; color: rgb(136, 136, 136); transform: translateY(0.5em); opacity: 0; transition: all 0.2s ease 0s; }"
-    },
-    {
-      "cssText": ".Field .InputField { display: block; width: 100%; transition: all 0.2s ease-out 0s; }"
-    },
-    {
-      "cssText": ".TogglePanel--alt.PaymentMethod--GiftCard > .TogglePanel__Content { display: flex; flex-wrap: wrap; }"
-    },
-    {
-      "cssText": ".Field--GiftCardCVV { flex: 0 0 auto; width: 25%; }"
-    },
-    {
-      "cssText": ".Field--GiftCardCVV { padding: 0px 10px; }"
-    },
-    {
-      "cssText": ".Action--GiftCardValidate { flex: 0 0 auto; }"
-    },
-    {
-      "cssText": ".Message { width: 100%; flex: 0 0 auto; display: block; margin: 1rem 0px; padding: 1rem 0.5rem 1rem 3rem; border-radius: 4px; position: relative; border: 1px solid rgb(217, 217, 217); color: rgb(136, 136, 136); background-color: rgb(250, 250, 250); min-height: 3.25rem; }"
-    },
-    {
-      "cssText": ".Message__Content :first-child { margin-top: 0px; }"
-    },
-    {
-      "cssText": ".Message__Content :last-child { margin-bottom: 0px; }"
-    },
-    {
-      "cssText": ".Message::before { width: 1.25rem; height: 1.25rem; content: \"\"; display: block; position: absolute; left: 1rem; top: 1rem; background-image: url(\"https://static.boldcommerce.com/images/checkout/experience/message_info_grey.svg\"); background-position: center center; background-repeat: no-repeat; background-size: contain; }"
-    },
-    {
-      "cssText": ".Message--HasError { background-color: white; border-color: red; color: red; }"
-    },
-    {
-      "cssText": ".Message--HasError::before { background-image: url(\"https://static.boldcommerce.com/images/checkout/experience/message_alert_red.svg\"); }"
-    },
-    {
-      "cssText": ".Message--HasWarning { background-color: white; border-color: orange; color: darkorange; }"
-    },
-    {
-      "cssText": ".Message--HasWarning::before { background-image: url(\"https://static.boldcommerce.com/images/checkout/experience/message_alert_orange.svg\"); }"
-    },
-    {
-      "cssText": ".Message--HasSuccess { background-color: white; border-color: limegreen; color: green; }"
-    },
-    {
-      "cssText": ".Message--HasSuccess::before { background-image: url(\"https://static.boldcommerce.com/images/checkout/experience/message_success_green.svg\"); }"
-    },
-    {
-      "cssText": ".Message--HasInfo { background-color: white; border: 0px none; }"
-    },
-    {
-      "cssText": ".Message--HasInfo::before { background-image: url(\"https://static.boldcommerce.com/images/checkout/experience/message_info_current_color.svg\"); }"
-    },
-    {
-      "cssText": ".TogglePanel--alt.PaymentMethod--BrandedCard > .TogglePanel__Content > .Flexiti--BrandedCardInfoGroup,  .TogglePanel--alt.PaymentMethod--GiftCard > .TogglePanel__Content,  .TogglePanel--alt.PaymentMethod--CreditCard > .TogglePanel__Content,  .TogglePanel--alt.PaymentMethod--CreditCard__StoredOption > .TogglePanel__Content,  .TogglePanel--alt.BillingAddressOption--DifferentAddress > .TogglePanel__Content { display: flex; flex-wrap: wrap; }"
-    },
-    {
-      "cssText": ".Field .InputField, .Field .SelectField,  .Field .CreditCardInputField { display: block; width: 100%; transition: all 0.2s ease-out 0s; }"
-    },
-    {
-      "cssText": ".Field--HasValue .InputField,  .Field .SelectField,  .Field .CreditCardInputField { padding-top: 1.5rem; padding-bottom: 0.5rem; }"
-    },
-    {
-      "cssText": ".Field--HasValue .Field__Label,  .Field--WithSelectField .Field__Label,  .Field--WithCreditCardField:not(.Field--PIGI) .Field__Label,  .Field--HasValue .Field--WithCreditCardField .Field--PIGI .Field__Label { transform: translateY(0px); opacity: 1; }"
-    },
-    {
-      "cssText": ".Field--WithCreditCardField.Field--WithPlaceHolder .Field__Label { opacity: 0; }"
-    },
-    {
-      "cssText": ".Field--GiftCardNumber,  .Field--CreditCardNumber { flex: 1 1 0%; }"
-    },
-    {
-      "cssText": ".PaymentMethod--GiftCard { display: none }"
-    },
-    {
-      "cssText": ".Field--GiftCardCVV,  .Field--CreditCardCVV,  .Field--CreditCardExpiration { flex: 0 0 auto; width: 25%; }"
-    },
-    {
-      "cssText": ".CreditCardInfoGroup { display: inherit; }"
-    },
-    {
-      "cssText": ".Field--CreditCardNumber iframe,  .Field--CreditCardCVV iframe { height: 1.2em; }"
-    },
-    {
-      "cssText": ".Expiry-Date-And-Removal { display: inline-block; }"
-    },
-    {
-      "cssText": ".Field--PaysafeCreditCardNumber iframe,  .Field--PaysafeCreditCardExpiration iframe,  .Field--PaysafeCreditCardCVV iframe { height: 1.2em !important; }"
-    },
-    {
-      "cssText": ".Field--AdyenCreditCardNumber iframe,  .Field--AdyenCreditCardExpiration iframe,  .Field--AdyenCreditCardCVV iframe { height: 2em !important; }"
-    },
-    {
-      "cssText": ".Field--SpreedlyCreditCardNumber iframe,  .Field--SpreedlyCreditCardCVV iframe { height: 100%; }"
-    },
-    {
-      "cssText": ".Field--SpreedlyCreditCardExpiration input { height: 50px; }"
-    },
-    {
-      "cssText": ".PaymentMethod--CreditCard .InputField { line-height: 20px; }"
-    },
-    {
-      "cssText": ".Field--GiftCardCVV, .Field--CreditCardExpiration { padding: 0px 10px; }"
-    },
-    {
-      "cssText": ".Action--GiftCardValidate { flex: 0 0 auto; }"
-    },
-    {
-      "cssText": ".Moneris--CreditCardInfoGroup { width: 100%; position: relative; display: block; }"
-    },
-    {
-      "cssText": ".Moneris--CreditCardInfoGroup #monerisFrame { height: 50px; overflow: hidden; border: 0px; }"
-    },
-    {
-      "cssText": ".Flexiti--BrandedCardInfoGroup .Field--FlexitiBrandedCardNumber { flex: inherit; width: 67%; padding-right: 10px; border-radius: 6px; }"
-    },
-    {
-      "cssText": ".PaymentMethod--BrandedCard .FlexitiFinancingOptionsGroup { padding: 10px 0px 0px; }"
-    },
-    {
-      "cssText": "#flexiti-widget { transition: all 0.1s ease-out 0s; position: fixed; background-color: rgb(255, 255, 255); width: 100%; height: 100%; z-index: 9999999; text-align: center; display: table; opacity: 1; inset: 0px; }"
-    },
-    {
-      "cssText": "#flexiti-widget.hidden { opacity: 0.01; z-index: -1000; }"
-    },
-    {
-      "cssText": ".FinancialOption__amount { font-weight: 700; }"
-    },
-    {
-      "cssText": ".FlexitiFinancingOptions__fee-rate { margin-bottom: 1rem; }"
-    },
-    {
-      "cssText": "#cyberSourceIframe { display: none; }"
-    },
-    {
-      "cssText": ".Field--WithCreditCardField.Field--WithPlaceHolder .CreditCardInputField.inputField { padding: 1.5rem 0.5rem 0.5rem; }"
-    },
-    {
-      "cssText": ".Field--WithCreditCardField.Field--WithPlaceHolder .CreditCardInputField.inputField input { padding: 1.5rem 0.5rem 0.5rem; }"
-    },
-    {
-      "cssText": ".Field--WithCreditCardField.Field--WithPlaceHolder .CreditCardInputField.spreedlyInputField { padding: 0.5rem 0px 0.5rem 0.5rem; }"
-    },
-    {
-      "cssText": ".Adyen--CreditCardInfoGroup { display: flex; margin-bottom: -0.5rem; }"
-    },
-    {
-      "cssText": ".Adyen--CreditCardInfoGroup .Field--AdyenCreditCardNumber { width: 67%; }"
-    },
-    {
-      "cssText": ".Adyen--CreditCardInfoGroup .Field--AdyenCreditCardExpiration { width: 18%; }"
-    },
-    {
-      "cssText": ".Adyen--CreditCardInfoGroup .Field--AdyenCreditCardCVV { width: 15%; }"
-    },
-    {
-      "cssText": ".Adyen--CreditCardInfoGroup .CreditCardInputField { padding-left: 1rem; padding-top: 1.2rem; border-radius: 6px; }"
-    },
-    {
-      "cssText": ".Action--Dismiss { display: inline-block; width: 1rem; height: 1rem; line-height: 1rem; border-radius: 8px; background-color: rgb(217, 217, 217); color: rgba(0, 0, 0, 0.6); position: relative; cursor: pointer; flex: 0 0 auto; margin-right: 4px; }"
-    },
-    {
-      "cssText": ".Action--Dismiss:hover { background-color: rgb(204, 204, 204); }"
-    },
-    {
-      "cssText": ".Action--Dismiss:active { background-color: rgb(170, 170, 170); }"
-    },
-    {
-      "cssText": ".Action--Dismiss::before { content: \"×\"; height: 1rem; width: 1rem; text-align: center; position: absolute; justify-content: center; padding: 0px; line-height: inherit; }"
-    },
-    {
-      "cssText": ".PaymentMethod .StoredCard__RemoveAction.Action--Dismiss { margin-left: 5px; font-size: 13px; position: relative; top: 2px; }"
-    },
-    {
-      "cssText": ".PaymentMethod .StoredCard__RemoveAction.Action--Dismiss::before { content: \"✕\"; background: rgb(116, 118, 121); color: white; width: 18px; display: inline-block; line-height: 1.5em; height: 18px; border-radius: 50%; text-align: center; position: absolute; font-size: 12px; top: -2px; cursor: pointer; }"
-    },
-    {
-      "cssText": ".TogglePanel--alt.PaymentMethod--CreditCard > .TogglePanel__Content > .PaypalButton,  .TogglePanel--alt.PaymentMethod--CreditCard__StoredOption > .TogglePanel__Content > .PaypalButton { width: 100%; }"
-    },
-    {
-      "cssText": "#PaymentMethodPPCP .TogglePanel__Content #paypal-button-container,  #PaymentMethodPPCP .TogglePanel__Content #venmo-button-container { display: flex; flex-direction: row; justify-content: center; align-items: center; text-align: center; margin: 0px 2px; width: 100%; padding: 15px 0px; }"
-    },
-    {
-      "cssText": "#ppcp-acdc-form { display: flex; flex-wrap: wrap; }"
-    },
-    {
-      "cssText": "#ppcp-acdc-form .InputField { height: 50px; }"
-    },
-    {
-      "cssText": "#overlay { transition: all 0.5s ease-out 0s; position: fixed; background-color: rgba(0, 0, 0, 0.85); color: rgb(255, 255, 255); width: 100%; height: 100%; z-index: 50; text-align: center; display: table; opacity: 1; inset: 0px; }"
-    },
-    {
-      "cssText": ".message { vertical-align: middle; display: table-cell; }"
-    },
-    {
-      "cssText": "#overlay i { color: rgb(255, 255, 255); font-size: 60px; margin-top: 10px; }"
-    },
-    {
-      "cssText": "#overlay h1 { color: rgb(255, 255, 255); margin-top: 10px; }"
-    },
-    {
-      "cssText": "#overlay h3 { color: rgb(255, 255, 255); font-size: 20px; max-width: 800px; margin: 0px auto; }"
-    },
-    {
-      "cssText": "#overlay div { max-width: 600px; margin: 0px auto; line-height: 24px; }"
-    },
-    {
-      "cssText": "#overlay.inverted { background-color: rgb(255, 255, 255); }"
-    },
-    {
-      "cssText": "#overlay.inverted i,  #overlay.inverted h1,  #overlay.inverted h3 { color: rgb(197, 197, 197); }"
-    },
-    {
-      "cssText": "#overlay.hidden { opacity: 0.01; z-index: -1000; }"
-    },
-    {
-      "cssText": ".CreditCardInfoGroup { flex-wrap: wrap; }"
-    },
-    {
-      "cssText": ".Field--CreditCardNumber { flex: auto; }"
-    },
-    {
-      "cssText": ".Field--CreditCardCVV, .Field--CreditCardExpiration { width: 50%; padding-left: 0; padding-top: 10px; }"
-    }
-  ]
-}
diff --git a/view/frontend/web/js/action/convert-bold-address.js b/view/frontend/web/js/action/convert-bold-address.js
deleted file mode 100644
index b1e95e80..00000000
--- a/view/frontend/web/js/action/convert-bold-address.js
+++ /dev/null
@@ -1,47 +0,0 @@
-define(
-    [
-        'Magento_Checkout/js/model/new-customer-address',
-        'Magento_Customer/js/customer-data'
-    ], function (
-        NewCustomerAddressModel,
-        customerData
-    ) {
-        'use strict';
-        /**
-         * Convert bold address to Magento address.
-         *
-         * @param {Object} boldAddress
-         * @return {Object}
-         */
-        return function (boldAddress) {
-            const directoryData = customerData.get('directory-data');
-            const regions = directoryData()[boldAddress.country_code].regions;
-            let regionId = null;
-            let regionName = null;
-            if (regions !== undefined) {
-                Object.entries(regions).forEach(([key, value]) => {
-                    if (value.code === boldAddress.province_code) {
-                        regionId = key;
-                        regionName = value.name;
-                    }
-                });
-            }
-            const convertedAddress = {
-                firstname: boldAddress.first_name,
-                lastname: boldAddress.last_name,
-                street: [boldAddress.address_line_1, boldAddress.address_line_2],
-                city: boldAddress.city,
-                company: boldAddress.business_name,
-                region: {
-                    region: regionName,
-                    region_code: boldAddress.region || null,
-                    region_id: regionId
-                },
-                region_id: regionId,
-                postcode: boldAddress.postal_code,
-                country_id: boldAddress.country_code,
-                telephone: boldAddress.phone_number,
-            };
-            return new NewCustomerAddressModel(convertedAddress);
-        };
-    });
diff --git a/view/frontend/web/js/model/address.js b/view/frontend/web/js/model/address.js
deleted file mode 100644
index 31688237..00000000
--- a/view/frontend/web/js/model/address.js
+++ /dev/null
@@ -1,118 +0,0 @@
-define([
-    'underscore',
-    'Magento_Checkout/js/model/quote',
-    'uiRegistry',
-], function (_, quote, registry) {
-    'use strict';
-
-    /**
-     * Bold address model.
-     *
-     * @type object
-     */
-    const boldAddress = {
-        initialize: function () {
-            this.countries = window.checkoutConfig.bold.countries;
-        },
-
-        /**
-         * Get billing address api data.
-         *
-         * @return object
-         */
-        getBillingAddress: function () {
-            const address = quote.billingAddress();
-            if (!address) {
-                return null;
-            }
-            const postCode = registry.get('index = postcode')
-            if (postCode && postCode.warn()) {
-                return null;
-            }
-            const countryId = address.countryId;
-            const country = this.countries.find(country => country.value === countryId);
-            const countryName = country ? country.label : '';
-            let street1 = '';
-            let street2 = '';
-            if (address.street && address.street[0]) {
-                street1 = address.street[0];
-            }
-            if (address.street && address.street[1]) {
-                street2 = address.street[1];
-            }
-            const billing = registry.get('index = billingAddress');
-            if (!street1) {
-                const street1Field = billing && billing.isAddressSameAsShipping()
-                    ? registry.get('dataScope = shippingAddress.street.0')
-                    : registry.get('dataScope = billingAddress.street.0');
-                if (street1Field) {
-                    street1 = street1Field.value();
-                }
-            }
-            if (!street2) {
-                const street2Field = billing && billing.isAddressSameAsShipping()
-                    ? registry.get('dataScope = shippingAddress.street.1')
-                    : registry.get('dataScope = billingAddress.street.1');
-                if (street2Field) {
-                    street2 = street2Field.value();
-                }
-            }
-            const payload = {
-                'id': address.customerAddressId ? Number(address.customerAddressId) : null,
-                'business_name': address.company ? address.company : '',
-                'country_code': countryId,
-                'country': countryName,
-                'city': address.city ? address.city : '',
-                'first_name': address.firstname ? address.firstname : '',
-                'last_name': address.lastname ? address.lastname : '',
-                'phone_number': address.telephone ? address.telephone : '',
-                'postal_code': address.postcode ? address.postcode : '',
-                'province': address.region ? address.region : '',
-                'province_code': address.regionCode ? address.regionCode : '',
-                'address_line_1': street1,
-                'address_line_2': street2,
-            }
-            try {
-                this.validatePayload(payload);
-            } catch (e) {
-                return null;
-            }
-            return payload;
-        },
-
-        /**
-         * Validate address payload.
-         *
-         * @param payload object
-         * @return void
-         * @throws Error
-         * @private
-         */
-        validatePayload(payload) {
-            let requiredFields = [
-                'first_name',
-                'last_name',
-                'phone_number',
-                'country',
-                'address_line_1',
-                'city',
-            ];
-            const country = this.countries.find(country => country.value === payload.country_code);
-            if (country && country.is_region_required) {
-                requiredFields.push('province');
-                requiredFields.push('province_code');
-            }
-            if (country && country.is_zipcode_optional !== true) {
-                requiredFields.push('postal_code');
-            }
-            _.each(requiredFields, function (field) {
-                if (!payload[field]) {
-                    throw new Error('Missing required field: ' + field);
-                }
-            })
-        },
-    }
-
-    boldAddress.initialize();
-    return boldAddress;
-});
diff --git a/view/frontend/web/js/model/bold-frontend-client.js b/view/frontend/web/js/model/bold-frontend-client.js
deleted file mode 100644
index 976903f0..00000000
--- a/view/frontend/web/js/model/bold-frontend-client.js
+++ /dev/null
@@ -1,110 +0,0 @@
-define([
-    'jquery',
-    'underscore',
-    'Bold_Checkout/js/model/address',
-    'Bold_Checkout/js/model/customer'
-], function (
-    $,
-    _,
-    boldAddress,
-    boldCustomer
-) {
-    'use strict';
-
-    /**
-     * Bold http client.
-     * @type {object}
-     */
-    return {
-        requestInProgress: false,
-        requestQueue: [],
-
-        /**
-         * Post data to Bold API.
-         *
-         * @param path string
-         * @param body object
-         * @return {Promise}
-         */
-        post: function (path, body = {}) {
-            return new Promise((resolve, reject) => {
-                this.requestQueue.push({
-                    resolve: resolve,
-                    reject: reject,
-                    path: path,
-                    body: body
-                });
-                this.processNextRequest();
-            });
-        },
-
-        /**
-         * Get data from Bold API.
-         *
-         * @param path
-         * @return {*}
-         */
-        get: function (path) {
-            return $.ajax({
-                url: window.checkoutConfig.bold.url + path,
-                type: 'GET',
-                headers: {
-                    'Authorization': 'Bearer ' + window.checkoutConfig.bold.jwtToken,
-                    'Content-Type': 'application/json'
-                }
-            });
-        },
-        /**
-         * Process next request in queue.
-         *
-         * @return void
-         * @private
-         */
-        processNextRequest: function () {
-            if (this.requestInProgress || this.requestQueue.length === 0) {
-                return;
-            }
-            this.requestInProgress = true;
-            const nextRequest = this.requestQueue.shift();
-            let requestData;
-            switch (nextRequest.path) {
-                case 'addresses/billing' :
-                    requestData = boldAddress.getBillingAddress();
-                    if (!requestData) {
-                        this.requestInProgress = false;
-                        this.processNextRequest();
-                        return;
-                    }
-                    break;
-                case 'customer/guest' :
-                    requestData = boldCustomer.getCustomer();
-                    if (!requestData) {
-                        this.requestInProgress = false;
-                        this.processNextRequest();
-                        return;
-                    }
-                    break;
-                default:
-                    requestData = nextRequest.body;
-                    break;
-            }
-            $.ajax({
-                url: window.checkoutConfig.bold.url + nextRequest.path,
-                type: 'POST',
-                headers: {
-                    'Authorization': 'Bearer ' + window.checkoutConfig.bold.jwtToken,
-                    'Content-Type': 'application/json',
-                },
-                data: JSON.stringify(requestData)
-            }).done(function (result) {
-                nextRequest.resolve(result);
-                this.requestInProgress = false;
-                this.processNextRequest();
-            }.bind(this)).fail(function (error) {
-                nextRequest.reject(error);
-                this.requestInProgress = false;
-                this.processNextRequest();
-            }.bind(this));
-        },
-    }
-});
diff --git a/view/frontend/web/js/model/client.js b/view/frontend/web/js/model/client.js
deleted file mode 100644
index 01ba3b31..00000000
--- a/view/frontend/web/js/model/client.js
+++ /dev/null
@@ -1,51 +0,0 @@
-define([
-    'jquery',
-    'underscore',
-    'mage/url',
-    'mage/storage',
-], function ($, _, urlBuilder, storage) {
-    'use strict';
-
-    /**
-     * Bold http client.
-     *
-     * @type {object}
-     */
-    const client = {
-        /**
-         * Initialize client.
-         *
-         * @return void
-         */
-        initialize: function () {
-            this.shopId = window.boldFlowConfig ? window.boldFlowConfig.shopId : null;
-        },
-
-        /**
-         * Get data from Bold API.
-         *
-         * @return {Promise}
-         * @param url {string}
-         * @param data {object}
-         */
-        get: function (url, data) {
-            url = url.replace('{{shopId}}', this.shopId);
-            return storage.get(urlBuilder.build(url), JSON.stringify(data));
-        },
-
-        /**
-         * Post data to Bold API.
-         *
-         * @return {Promise}
-         * @param url {string}
-         * @param data {object}
-         */
-        post: function (url, data) {
-            url = url.replace('{{shopId}}', this.shopId);
-            return storage.post(urlBuilder.build(url), JSON.stringify(data));
-        },
-    };
-
-    client.initialize();
-    return client;
-});
diff --git a/view/frontend/web/js/model/customer.js b/view/frontend/web/js/model/customer.js
deleted file mode 100644
index 925704c8..00000000
--- a/view/frontend/web/js/model/customer.js
+++ /dev/null
@@ -1,33 +0,0 @@
-define([
-    'underscore',
-    'Magento_Checkout/js/model/quote',
-    'checkoutData'
-], function (_, quote, checkoutData) {
-    'use strict';
-
-    return {
-
-        /**
-         * Get customer api data.
-         *
-         * @return object
-         */
-        getCustomer: function () {
-            const billingAddress = quote.billingAddress();
-            if (!billingAddress) {
-                return null;
-            }
-            const firstname = billingAddress.firstname;
-            const lastname = billingAddress.lastname;
-            const payload = {
-                'email_address': checkoutData.getValidatedEmailValue(),
-                'first_name': firstname,
-                'last_name': lastname,
-            }
-            if (!payload.email_address || !payload.first_name || !payload.last_name) {
-                return null;
-            }
-            return payload;
-        }
-    };
-});
diff --git a/view/frontend/web/js/view/payment/bold-methods.js b/view/frontend/web/js/view/payment/bold-methods.js
deleted file mode 100644
index d2701ced..00000000
--- a/view/frontend/web/js/view/payment/bold-methods.js
+++ /dev/null
@@ -1,19 +0,0 @@
-define(
-    [
-        'uiComponent',
-        'Magento_Checkout/js/model/payment/renderer-list'
-    ],
-    function (
-        Component,
-        rendererList
-    ) {
-        'use strict';
-        rendererList.push(
-            {
-                type: 'bold',
-                component: 'Bold_Checkout/js/view/payment/method-renderer/bold-method'
-            }
-        );
-        return Component.extend({});
-    }
-);
diff --git a/view/frontend/web/js/view/payment/method-renderer/bold-method.js b/view/frontend/web/js/view/payment/method-renderer/bold-method.js
deleted file mode 100644
index 978bb3ba..00000000
--- a/view/frontend/web/js/view/payment/method-renderer/bold-method.js
+++ /dev/null
@@ -1,327 +0,0 @@
-define([
-    'Magento_Checkout/js/view/payment/default',
-    'Bold_Checkout/js/model/bold-frontend-client',
-    'Magento_Checkout/js/model/quote',
-    'checkoutData',
-    'Bold_Checkout/js/action/convert-bold-address',
-    'Magento_Checkout/js/model/full-screen-loader',
-    'Magento_Checkout/js/action/get-totals',
-    'Magento_Customer/js/customer-data',
-    'Magento_Checkout/js/model/address-converter',
-    'Magento_Checkout/js/action/select-shipping-address',
-    'Magento_Checkout/js/action/select-billing-address',
-    'Magento_Checkout/js/action/select-shipping-method',
-    'uiRegistry',
-    'underscore',
-    'ko',
-    'mage/translate',
-], function (
-    Component,
-    boldClient,
-    quote,
-    checkoutData,
-    convertBoldAddressAction,
-    loader,
-    getTotals,
-    customerData,
-    coreAddressConverter,
-    selectShippingAddressAction,
-    selectBillingAddressAction,
-    selectShippingMethodAction,
-    registry,
-    _,
-    ko,
-    $t
-) {
-    'use strict';
-    return Component.extend({
-        defaults: {
-            template: 'Bold_Checkout/payment/bold',
-            paymentType: null,
-            iframeWindow: null,
-            customerSynced: ko.observable(window.isCustomerLoggedIn),
-            billingAddressSynced: ko.observable(quote.billingAddress() !== null),
-            pigiInitialized: ko.observable(false),
-            isVisible: ko.observable(true),
-            iframeSrc: ko.observable(null),
-            isPigiLoading: ko.observable(true),
-            error: $t('An error occurred while processing your payment. Please try again.'),
-        },
-
-        /** @inheritdoc */
-        initialize: function () {
-            this._super(); //call Magento_Checkout/js/view/payment/default::initialize()
-            if (!window.checkoutConfig.bold || !window.checkoutConfig.bold) {
-                this.isVisible(false);
-                return;
-            }
-            this.subscribeToPIGI();
-            this.customerSynced.subscribe(function (synced) {
-                if (synced && this.billingAddressSynced() && this.pigiInitialized()) {
-                    this.isPigiLoading(false);
-                }
-            }.bind(this));
-            this.billingAddressSynced.subscribe(function (synced) {
-                if (synced && this.customerSynced() && this.pigiInitialized()) {
-                    this.isPigiLoading(false);
-                }
-            }.bind(this));
-            this.pigiInitialized.subscribe(function (initialized) {
-                if (initialized && this.customerSynced() && this.billingAddressSynced()) {
-                    this.isPigiLoading(false);
-                }
-            }.bind(this));
-            this.awaitingRefreshBeforePlacingOrder = false;
-            this.messageContainer.errorMessages.subscribe(function (errorMessages) {
-                if (errorMessages.length > 0) {
-                    loader.stopLoader();
-                }
-            });
-            const sendBillingAddressData = _.debounce(
-                function () {
-                    this.sendBillingAddress();
-                }.bind(this),
-                500
-            );
-            quote.billingAddress.subscribe(function () {
-                sendBillingAddressData();
-            }, this);
-            const email = registry.get('index = customer-email');
-            if (email) {
-                const sendGuestCustomerInfoData = _.debounce(
-                    function () {
-                        this.sendGuestCustomerInfo();
-                    }.bind(this),
-                    500
-                );
-                email.email.subscribe(function () {
-                    if (email.validateEmail()) {
-                        sendGuestCustomerInfoData();
-                    }
-                }.bind(this));
-            }
-            this.sendBillingAddress();
-            this.initializePaymentGateway();
-        },
-
-        /**
-         * Initialize PIGI iframe.
-         */
-        initializePaymentGateway: function () {
-            console.log('initializing pigi...');
-            this.iframeSrc(window.checkoutConfig.bold.payment.iframeSrc);
-        },
-
-        /** @inheritdoc */
-        selectPaymentMethod: function () {
-            this._super();
-            if (this.iframeWindow) {
-                this.iframeWindow.postMessage({actionType: 'PIGI_REFRESH_ORDER'}, '*');
-            }
-            return true;
-        },
-
-        /**
-         * Refresh the order to get the recent cart updates.
-         *
-         * @returns {void}
-         */
-        refreshAndAddPayment: function () {
-            if (!this.iframeWindow) {
-                return;
-            }
-            const refreshAction = {actionType: 'PIGI_REFRESH_ORDER'};
-            this.awaitingRefreshBeforePlacingOrder = true;
-            this.iframeWindow.postMessage(refreshAction, '*');
-        },
-
-        /** @inheritdoc */
-        placeOrder: function (data, event) {
-            loader.startLoader();
-            if (!this.iframeWindow) {
-                return false;
-            }
-
-            const clearAction = {actionType: 'PIGI_CLEAR_ERROR_MESSAGES'};
-            this.iframeWindow.postMessage(clearAction, '*');
-
-            if (!this.paymentType) {
-                this.refreshAndAddPayment();
-                return false;
-            }
-            const defaultPlaceOrder = this._super;
-            this.processBoldOrder().then(() => {
-                const orderPlacementResult = defaultPlaceOrder.call(this, data, event);//call Magento_Checkout/js/view/payment/default::placeOrder()
-                if (!orderPlacementResult) {
-                    loader.stopLoader()
-                }
-                return orderPlacementResult;
-            }).catch((error) => {
-                this.displayErrorMessage(error);
-                loader.stopLoader();
-                return false;
-            });
-        },
-
-        /**
-         * Refresh the order to get the recent cart updates, calculate taxes and authorize|capture payment on Bold side.
-         *
-         * @return {Promise<void>}
-         */
-        processBoldOrder: async function () {
-            try {
-                await boldClient.get('refresh');
-                await boldClient.post('taxes');
-                const processOrderResult = await boldClient.post('process_order');
-                this.updateCart(processOrderResult.data);
-            } catch (e) {
-                console.error('Error processing order', e);
-                throw new Error(this.error);
-            }
-        },
-
-        /**
-         * Display error message.
-         *
-         * @private
-         * @param {{}} error
-         */
-        displayErrorMessage: function (error) {
-            let message,
-                subType
-            try {
-                message = error.responseJSON.errors[0].message
-                subType = error.responseJSON.errors[0].sub_type
-            } catch (exception) {
-                message = this.error
-                subType = ''
-            }
-            if (!this.iframeWindow) {
-                this.messageContainer.errorMessages([message]);
-                return;
-            }
-            const action = {
-                actionType: 'PIGI_DISPLAY_ERROR_MESSAGE',
-                payload: {
-                    error: {
-                        message: message,
-                        sub_type: subType,
-                    }
-                }
-            };
-            try {
-                this.iframeWindow.postMessage(action, '*');
-            } catch (e) {
-                this.messageContainer.errorMessages([this.error]);
-            }
-        },
-
-        /**
-         * Subscribe to PIGI events.
-         *
-         * @private
-         * @returns {void}
-         */
-        subscribeToPIGI() {
-            window.addEventListener('message', ({data}) => {
-                const responseType = data.responseType;
-                const iframeElement = document.getElementById('PIGI');
-                const addPaymentAction = {actionType: 'PIGI_ADD_PAYMENT'};
-                if (responseType) {
-                    switch (responseType) {
-                        case 'PIGI_UPDATE_HEIGHT':
-                            if (iframeElement.height === Math.round(data.payload.height) + 'px') {
-                                return;
-                            }
-                            iframeElement.height = Math.round(data.payload.height) + 'px';
-                            break;
-                        case 'PIGI_INITIALIZED':
-                            if (data.payload && data.payload.height && iframeElement) {
-                                iframeElement.height = Math.round(data.payload.height) + 'px';
-                            }
-                            this.iframeWindow = iframeElement ? iframeElement.contentWindow : null;
-                            this.pigiInitialized(true);
-                            break;
-                        case 'PIGI_REFRESH_ORDER':
-                            if (this.awaitingRefreshBeforePlacingOrder) {
-                                this.iframeWindow.postMessage(addPaymentAction, '*');
-                                this.awaitingRefreshBeforePlacingOrder = false;
-                            }
-                            break;
-                        case 'PIGI_CHANGED_ORDER':
-                            customerData.reload(['bold'], false).then((cartData) => {
-                                const billingAddress = coreAddressConverter.formAddressDataToQuoteAddress(cartData.bold.billingAddress);
-                                selectBillingAddressAction(billingAddress);
-                                if (cartData.bold.shippingAddress) {
-                                    const shippingAddress = coreAddressConverter.formAddressDataToQuoteAddress(cartData.bold.shippingAddress);
-                                    selectShippingAddressAction(shippingAddress);
-                                    checkoutData.setSelectedShippingAddress(shippingAddress.getKey());
-                                }
-                                if (cartData.bold.shippingMethod) {
-                                    selectShippingMethodAction(cartData.bold.shippingMethod);
-                                }
-                                getTotals([]);
-                            }).catch((error) => {
-                                console.error('Error reloading customer data', error);
-                            });
-                            break;
-                        case 'PIGI_ADD_PAYMENT':
-                            this.messageContainer.errorMessages([]);
-                            loader.stopLoader(true);
-                            if (!data.payload.success) {
-                                this.paymentType = null;
-                                return;
-                            }
-                            this.paymentType = data.payload.paymentType;
-                            this.placeOrder({}, null);
-                    }
-                }
-            });
-        },
-
-        /**
-         * Update cart with the data from Bold.
-         *
-         * @param {{application_state: {addresses:{billing:{}, shipping:{}}}}} data
-         */
-        updateCart(data) {
-            const billingAddress = data.application_state.addresses.billing;
-            const magentoAddress = convertBoldAddressAction(billingAddress);
-            selectBillingAddressAction(magentoAddress);
-        },
-        /**
-         * Send guest customer info to Bold.
-         *
-         * @private
-         * @returns {Promise<void>}
-         */
-        sendGuestCustomerInfo: async function () {
-            if (window.isCustomerLoggedIn) {
-                return;
-            }
-            try {
-                const result = await boldClient.post('customer/guest')
-                this.customerSynced(!result.errors);
-                this.messageContainer.errorMessages([]);
-            } catch (error) {
-                this.displayErrorMessage(error)
-            }
-        },
-        /**
-         * Synchronize billing address with Bold.
-         *
-         * @private
-         * @returns {Promise<void>}
-         */
-        sendBillingAddress: async function () {
-            await this.sendGuestCustomerInfo();
-            try {
-                const result = await boldClient.post('addresses/billing');
-                this.billingAddressSynced(!result.errors);
-                this.messageContainer.errorMessages([]);
-            } catch (error) {
-                this.displayErrorMessage(error);
-            }
-        },
-    });
-});
diff --git a/view/frontend/web/template/payment/bold.html b/view/frontend/web/template/payment/bold.html
deleted file mode 100644
index f625893c..00000000
--- a/view/frontend/web/template/payment/bold.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!-- ko if: isVisible() -->
-<div class="payment-method" data-bind="css: {'_active': (getCode() == isChecked())}">
-    <div class="payment-method-title field choice">
-        <input type="radio"
-               name="payment[method]"
-               class="radio"
-               data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()"/>
-        <label class="label" data-bind="attr: {'for': getCode()}"><span data-bind="text: getTitle()"></span></label>
-    </div>
-    <div class="payment-method-content">
-        <!-- ko foreach: getRegion('messages') -->
-            <!-- ko template: getTemplate() --><!-- /ko -->
-        <!--/ko-->
-        <div class="payment-method-billing-address">
-            <!-- ko foreach: $parent.getRegion(getBillingAddressFormName()) -->
-                <!-- ko template: getTemplate() --><!-- /ko -->
-            <!--/ko-->
-        </div>
-        <div class="checkout-agreements-block">
-            <!-- ko foreach: $parent.getRegion('before-place-order') -->
-                <!-- ko template: getTemplate() --><!-- /ko -->
-            <!--/ko-->
-        </div>
-        <div data-bind="blockLoader: isPigiLoading">
-            <iframe id="PIGI" data-bind="attr: {src: iframeSrc()}" scrolling="no" frameborder="0" width="100%"></iframe>
-        </div>
-        <div class="actions-toolbar">
-            <div class="primary">
-                <button class="action primary checkout"
-                        type="submit"
-                        data-bind="
-                        click: placeOrder,
-                        attr: {title: $t('Place Order')},
-                        css: {disabled: !isPlaceOrderActionAllowed()},
-                        enable: (getCode() == isChecked())
-                        "
-                        disabled>
-                    <span data-bind="i18n: 'Place Order'"></span>
-                </button>
-            </div>
-        </div>
-    </div>
-</div>
-<!-- /ko -->