diff --git a/composer.json b/composer.json
index 28c75ff1a..cb2569150 100644
--- a/composer.json
+++ b/composer.json
@@ -15,9 +15,7 @@
         "webmozart/assert": "^1.11",
         "symfony/http-client": "^4.4",
         "http-interop/http-factory-guzzle": "^1.1",
-        "php-http/message-factory": "^1.1",
-        "prestashop/prestashop-accounts-installer": "^1.0.4",
-        "prestashop/module-lib-mbo-installer": "^2.0"
+        "php-http/message-factory": "^1.1"
     },
     "require-dev": {
         "roave/security-advisories": "dev-latest",
@@ -43,11 +41,11 @@
     },
     "config": {
         "platform": {
-            "php": "7.2.5"
+            "php": "7.2"
         },
         "prepend-autoloader": false,
         "allow-plugins": {
-            "php-http/discovery": false
+            "php-http/discovery": true
         }
     },
     "type": "prestashop-module",
diff --git a/controllers/admin/AdminMollieSettingsController.php b/controllers/admin/AdminMollieSettingsController.php
index c543ba194..b9cf243af 100644
--- a/controllers/admin/AdminMollieSettingsController.php
+++ b/controllers/admin/AdminMollieSettingsController.php
@@ -16,25 +16,8 @@
     exit;
 }
 
-use Mollie\Adapter\ConfigurationAdapter;
-use Mollie\Adapter\ToolsAdapter;
-use Mollie\Builder\Content\BaseInfoBlock;
-use Mollie\Builder\Content\UpdateMessageInfoBlock;
-use Mollie\Config\Config;
-use Mollie\Install\PrestaShopDependenciesInstall;
-use Mollie\Logger\PrestaLoggerInterface;
-use Mollie\Repository\ModuleRepository;
-use Mollie\Service\Content\TemplateParserInterface;
-use Mollie\Service\SettingsSaveService;
-use PrestaShop\Module\PsEventbus\Service\PresenterService;
-use PrestaShop\PrestaShop\Core\Addon\Module\ModuleManagerBuilder;
-use PrestaShop\PsAccountsInstaller\Installer\Exception\ModuleNotInstalledException;
-use PrestaShop\PsAccountsInstaller\Installer\Facade\PsAccounts;
-
 class AdminMollieSettingsController extends ModuleAdminController
 {
-    private const FILE_NAME = 'AdminMollieSettingsController';
-
     /** @var Mollie */
     public $module;
 
@@ -44,77 +27,48 @@ public function __construct()
         $this->bootstrap = true;
     }
 
-    public function initContent(): void
+    public function postProcess()
     {
-        $this->checkPrestaShopDependenciesHealth();
-        $this->setEnvironmentForAccounts();
-        $this->setEnvironmentForCloudSync();
-
-        $this->content .= $this->context->smarty->fetch($this->module->getLocalPath() . '/views/templates/admin/_configure/configuration.tpl');
+        /** @var \Mollie\Repository\ModuleRepository $moduleRepository */
+        $moduleRepository = $this->module->getService(\Mollie\Repository\ModuleRepository::class);
+        $moduleDatabaseVersion = $moduleRepository->getModuleDatabaseVersion($this->module->name);
+        $needsUpgrade = Tools::version_compare($this->module->version, $moduleDatabaseVersion, '>');
+        if ($needsUpgrade) {
+            $this->context->controller->errors[] = $this->module->l('Please upgrade Mollie module');
 
-        $this->content .= $this->displayModuleSettings();
+            return;
+        }
 
-        $this->addJs($this->module->getPathUri() . '/views/js/admin/_configure/configuration.js');
+        $isShopContext = Shop::getContext() === Shop::CONTEXT_SHOP;
 
-        parent::initContent();
-    }
+        if (!$isShopContext) {
+            $this->context->controller->errors[] = $this->module->l('Select the shop that you want to configure');
 
-    public function postProcess()
-    {
-        /** @var ConfigurationAdapter $configuration */
-        $configuration = $this->module->getService(ConfigurationAdapter::class);
+            return;
+        }
 
-        /** @var ToolsAdapter $tools */
-        $tools = $this->module->getService(ToolsAdapter::class);
+        /** @var \Mollie\Service\Content\TemplateParserInterface $templateParser */
+        $templateParser = $this->module->getService(\Mollie\Service\Content\TemplateParserInterface::class);
 
-        $isSubmitted = $tools->isSubmit("submit{$this->module->name}");
+        $isSubmitted = (bool) Tools::isSubmit("submit{$this->module->name}");
 
         /* @phpstan-ignore-next-line */
-        if (!$isSubmitted && !$configuration->get(Config::MOLLIE_STATUS_AWAITING)) {
+        if (false === Configuration::get(Mollie\Config\Config::MOLLIE_STATUS_AWAITING) && !$isSubmitted) {
             $this->context->controller->errors[] = $this->module->l('Select an order status for \"Status for Awaiting payments\" in the \"Advanced settings\" tab');
         }
 
         $errors = [];
 
-        if ($tools->isSubmit("submit{$this->module->name}")) {
-            /** @var SettingsSaveService $saveSettingsService */
-            $saveSettingsService = $this->module->getService(SettingsSaveService::class);
-
+        if (Tools::isSubmit("submit{$this->module->name}")) {
+            /** @var \Mollie\Service\SettingsSaveService $saveSettingsService */
+            $saveSettingsService = $this->module->getService(\Mollie\Service\SettingsSaveService::class);
             $resultMessages = $saveSettingsService->saveSettings($errors);
-
             if (!empty($errors)) {
-                $this->context->controller->errors = array_merge(
-                    $this->context->controller->errors,
-                    $resultMessages
-                );
+                $this->context->controller->errors = $resultMessages;
             } else {
-                $this->context->controller->confirmations = array_merge(
-                    $this->context->controller->confirmations,
-                    $resultMessages
-                );
+                $this->context->controller->confirmations = $resultMessages;
             }
         }
-    }
-
-    private function displayModuleSettings(): string
-    {
-        /** @var ModuleRepository $moduleRepository */
-        $moduleRepository = $this->module->getService(ModuleRepository::class);
-
-        $moduleDatabaseVersion = $moduleRepository->getModuleDatabaseVersion($this->module->name);
-        $needsUpgrade = Tools::version_compare($this->module->version, $moduleDatabaseVersion, '>');
-
-        if ($needsUpgrade) {
-            $this->context->controller->errors[] = $this->module->l('Please upgrade Mollie module');
-
-            return '';
-        }
-
-        if (\Shop::getContext() !== \Shop::CONTEXT_SHOP) {
-            $this->context->controller->errors[] = $this->module->l('Select the shop that you want to configure');
-
-            return '';
-        }
 
         Media::addJsDef([
             'description_message' => addslashes($this->module->l('Enter a description')),
@@ -131,9 +85,6 @@ private function displayModuleSettings(): string
             'not_valid_file_message' => addslashes($this->module->l('Invalid file: %s%')),
         ]);
 
-        /** @var TemplateParserInterface $templateParser */
-        $templateParser = $this->module->getService(TemplateParserInterface::class);
-
         $this->context->controller->addJS($this->module->getPathUri() . 'views/js/method_countries.js');
         $this->context->controller->addJS($this->module->getPathUri() . 'views/js/validation.js');
         $this->context->controller->addJS($this->module->getPathUri() . 'views/js/admin/settings.js');
@@ -150,9 +101,8 @@ private function displayModuleSettings(): string
             $this->module->getLocalPath() . 'views/templates/admin/logo.tpl'
         );
 
-        /** @var UpdateMessageInfoBlock $updateMessageInfoBlock */
-        $updateMessageInfoBlock = $this->module->getService(UpdateMessageInfoBlock::class);
-
+        /** @var \Mollie\Builder\Content\UpdateMessageInfoBlock $updateMessageInfoBlock */
+        $updateMessageInfoBlock = $this->module->getService(\Mollie\Builder\Content\UpdateMessageInfoBlock::class);
         $updateMessageInfoBlockData = $updateMessageInfoBlock->setAddons(false);
 
         $html .= $templateParser->parseTemplate(
@@ -161,9 +111,8 @@ private function displayModuleSettings(): string
             $this->module->getLocalPath() . 'views/templates/admin/updateMessage.tpl'
         );
 
-        /** @var BaseInfoBlock $baseInfoBlock */
-        $baseInfoBlock = $this->module->getService(BaseInfoBlock::class);
-
+        /** @var \Mollie\Builder\Content\BaseInfoBlock $baseInfoBlock */
+        $baseInfoBlock = $this->module->getService(\Mollie\Builder\Content\BaseInfoBlock::class);
         $this->context->smarty->assign($baseInfoBlock->buildParams());
 
         /** @var \Mollie\Builder\FormBuilder $settingsFormBuilder */
@@ -177,131 +126,6 @@ private function displayModuleSettings(): string
             $this->context->controller->errors[] = $this->module->l('The database tables are missing. Reset the module.');
         }
 
-        return $html;
-    }
-
-    private function setEnvironmentForAccounts(): void
-    {
-        /** @var PrestaLoggerInterface $logger */
-        $logger = $this->module->getService(PrestaLoggerInterface::class);
-
-        try {
-            /** @var PsAccounts $accountsFacade */
-            $accountsFacade = $this->module->getService(PsAccounts::class);
-
-            $psAccountsPresenter = $accountsFacade->getPsAccountsPresenter();
-            $psAccountsService = $accountsFacade->getPsAccountsService();
-        } catch (ModuleNotInstalledException $exception) {
-            $logger->error('PrestaShop Accounts is not installed', [
-                'Exception message' => $exception->getMessage(),
-                'Exception code' => $exception->getCode(),
-            ]);
-
-            $this->context->controller->errors[] =
-                $this->module->l('PrestaShop Accounts is not installed. Please contact support.', self::FILE_NAME);
-
-            return;
-        } catch (\Throwable $exception) {
-            $logger->error('PrestaShop Accounts unknown error.', [
-                'Exception message' => $exception->getMessage(),
-                'Exception code' => $exception->getCode(),
-            ]);
-
-            $this->context->controller->errors[] =
-                $this->module->l('PrestaShop Accounts initialization failed. Please contact support.', self::FILE_NAME);
-
-            return;
-        }
-
-        try {
-            Media::addJsDef([
-                'contextPsAccounts' => $psAccountsPresenter->present(),
-            ]);
-        } catch (\Throwable $exception) {
-            $logger->error('PrestaShop Accounts presenter unknown error.', [
-                'Exception message' => $exception->getMessage(),
-                'Exception code' => $exception->getCode(),
-            ]);
-
-            $this->context->controller->errors[] =
-                $this->module->l('PrestaShop Accounts presenter error. Please contact support.', self::FILE_NAME);
-
-            return;
-        }
-
-        $this->context->smarty->assign([
-            'urlAccountsCdn' => $psAccountsService->getAccountsCdn(),
-        ]);
-    }
-
-    private function setEnvironmentForCloudSync(): void
-    {
-        /** @var PrestaLoggerInterface $logger */
-        $logger = $this->module->getService(PrestaLoggerInterface::class);
-
-        $moduleManager = ModuleManagerBuilder::getInstance();
-
-        if (!$moduleManager) {
-            $this->context->controller->errors[] =
-                $this->module->l('Failed to get module manager builder instance.', self::FILE_NAME);
-        }
-
-        $moduleManager = $moduleManager->build();
-
-        /** @var \Ps_eventbus $eventbusModule */
-        $eventbusModule = \Module::getInstanceByName('ps_eventbus');
-
-        if (!version_compare($eventbusModule->version, '1.9.0', '>=')) {
-            try {
-                $moduleManager->install('ps_eventbus');
-            } catch (\Throwable $exception) {
-                $logger->error('Failed to upgrade PrestaShop Event Bus.', [
-                    'Exception message' => $exception->getMessage(),
-                    'Exception code' => $exception->getCode(),
-                ]);
-
-                $this->context->controller->errors[] =
-                    $this->module->l('Failed to upgrade PrestaShop Event Bus. Please contact support.', self::FILE_NAME);
-
-                return;
-            }
-        }
-
-        /** @var PresenterService $eventbusPresenterService */
-        $eventbusPresenterService = $eventbusModule->getService(PresenterService::class);
-
-        Media::addJsDef([
-            'contextPsEventbus' => $eventbusPresenterService->expose($this->module, ['orders']),
-        ]);
-
-        $this->context->smarty->assign([
-            'cloudSyncPathCDC' => Config::PRESTASHOP_CLOUDSYNC_CDN,
-        ]);
-    }
-
-    private function checkPrestaShopDependenciesHealth(): void
-    {
-        /** @var PrestaShopDependenciesInstall $prestaShopDependenciesInstaller */
-        $prestaShopDependenciesInstaller = $this->module->getService(PrestaShopDependenciesInstall::class);
-
-        /** @var PrestaLoggerInterface $logger */
-        $logger = $this->module->getService(PrestaLoggerInterface::class);
-
-        try {
-            /*
-             * TODO if eventbus is installed in current page load context, error still will be thrown "install eventbus".
-             * After refresh everything is working, but it could be annoying to some merchants.
-             * Not critical error, but improvement would be nice.
-             */
-            $prestaShopDependenciesInstaller->install();
-        } catch (\Throwable $exception) {
-            $logger->error('Failed to install PrestaShop dependencies', [
-                'Exception message' => $exception->getMessage(),
-                'Exception code' => $exception->getCode(),
-            ]);
-
-            $this->context->controller->errors[] =
-                $this->module->l('Failed to install PrestaShop dependencies. Please contact support.', self::FILE_NAME);
-        }
+        $this->content .= $html;
     }
 }
diff --git a/mollie.php b/mollie.php
index 22357143d..b6d1d4900 100755
--- a/mollie.php
+++ b/mollie.php
@@ -20,7 +20,6 @@
 use Mollie\Exception\ShipmentCannotBeSentException;
 use Mollie\Handler\ErrorHandler\ErrorHandler;
 use Mollie\Handler\Shipment\ShipmentSenderHandlerInterface;
-use Mollie\Install\PrestaShopDependenciesInstall;
 use Mollie\Logger\PrestaLoggerInterface;
 use Mollie\Provider\ProfileIdProviderInterface;
 use Mollie\Repository\MolOrderPaymentFeeRepositoryInterface;
@@ -169,25 +168,6 @@ public function install()
             return false;
         }
 
-        /** @var PrestaShopDependenciesInstall $prestaShopDependenciesInstaller */
-        $prestaShopDependenciesInstaller = $this->getService(PrestaShopDependenciesInstall::class);
-
-        /** @var PrestaLoggerInterface $logger */
-        $logger = $this->getService(PrestaLoggerInterface::class);
-
-        try {
-            $prestaShopDependenciesInstaller->install();
-        } catch (\Throwable $exception) {
-            $logger->error('Failed to install PrestaShop dependencies', [
-                'Exception message' => $exception->getMessage(),
-                'Exception code' => $exception->getCode(),
-            ]);
-
-            $this->_errors[] = $this->l('Failed to install PrestaShop dependencies. Please contact support.');
-
-            return false;
-        }
-
 //        TODO inject base install and subscription services
         $coreInstaller = $this->getService(Mollie\Install\Installer::class);
 
diff --git a/src/Config/Config.php b/src/Config/Config.php
index f18650a50..2ce23d4e1 100644
--- a/src/Config/Config.php
+++ b/src/Config/Config.php
@@ -18,7 +18,6 @@
 use Mollie\Api\Types\PaymentStatus;
 use Mollie\Api\Types\RefundStatus;
 use Mollie\Utility\EnvironmentUtility;
-use Mollie\Utility\PsVersionUtility;
 
 if (!defined('_PS_VERSION_')) {
     exit;
@@ -319,18 +318,6 @@ class Config
 
     const MOLLIE_BUTTON_ORDER_TOTAL_REFRESH = 'MOLLIE_BUTTON_ORDER_TOTAL_REFRESH';
 
-    public const PRESTASHOP_ACCOUNTS_INSTALLER_VERSION = '5.0.0';
-    public const PRESTASHOP_CLOUDSYNC_CDN = 'https://assets.prestashop3.com/ext/cloudsync-merchant-sync-consent/latest/cloudsync-cdc.js';
-
-    public static function getPsAccountsVersion(): string
-    {
-        if (PsVersionUtility::isPsVersionGreaterOrEqualTo(_PS_VERSION_, '8.0.0')) {
-            return '6.0.0';
-        }
-
-        return '5.0.0';
-    }
-
     // TODO migrate functions below to separate service
     public static function getStatuses()
     {
diff --git a/src/Exception/Code/ExceptionCode.php b/src/Exception/Code/ExceptionCode.php
index 492793654..133a43ff1 100644
--- a/src/Exception/Code/ExceptionCode.php
+++ b/src/Exception/Code/ExceptionCode.php
@@ -25,11 +25,6 @@ class ExceptionCode
     public const INFRASTRUCTURE_LOCK_EXISTS = 1003;
     public const INFRASTRUCTURE_LOCK_ON_ACQUIRE_IS_MISSING = 1004;
     public const INFRASTRUCTURE_LOCK_ON_RELEASE_IS_MISSING = 1005;
-    public const INFRASTRUCTURE_FAILED_TO_INSTALL_MBO_INSTALLER = 1006;
-    public const INFRASTRUCTURE_FAILED_TO_INSTALL_DEPENDENCIES = 1007;
-    public const INFRASTRUCTURE_FAILED_TO_RETRIEVE_MODULE_MANAGER_BUILDER = 1008;
-    public const INFRASTRUCTURE_FAILED_TO_INSTALL_PRESTASHOP_ACCOUNTS = 1009;
-    public const INFRASTRUCTURE_FAILED_TO_INSTALL_PRESTASHOP_EVENT_BUS = 1010;
 
     public const FAILED_TO_FIND_CUSTOMER_ADDRESS = 2001;
 
diff --git a/src/Exception/CouldNotInstallPrestaShopDependencies.php b/src/Exception/CouldNotInstallPrestaShopDependencies.php
deleted file mode 100644
index 9e1c696f1..000000000
--- a/src/Exception/CouldNotInstallPrestaShopDependencies.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-namespace Mollie\Exception;
-
-use Mollie\Exception\Code\ExceptionCode;
-
-class CouldNotInstallPrestaShopDependencies extends MollieException
-{
-    public static function failedToInstallMboInstaller(): self
-    {
-        return new self(
-            'Failed to install Mbo installer',
-            ExceptionCode::INFRASTRUCTURE_FAILED_TO_INSTALL_MBO_INSTALLER
-        );
-    }
-
-    public static function failedToInstallDependencies(\Throwable $exception): self
-    {
-        return new self(
-            'Failed to install Mbo installer',
-            ExceptionCode::INFRASTRUCTURE_FAILED_TO_INSTALL_DEPENDENCIES,
-            $exception
-        );
-    }
-
-    public static function failedToRetrieveModuleManagerBuilder(): self
-    {
-        return new self(
-            'Failed to retrieve module manager builder',
-            ExceptionCode::INFRASTRUCTURE_FAILED_TO_RETRIEVE_MODULE_MANAGER_BUILDER
-        );
-    }
-
-    public static function failedToInstallPrestaShopAccounts(): self
-    {
-        return new self(
-            'Failed to install PrestaShop Accounts',
-            ExceptionCode::INFRASTRUCTURE_FAILED_TO_INSTALL_PRESTASHOP_ACCOUNTS
-        );
-    }
-
-    public static function failedToInstallPrestaShopEventBus(): self
-    {
-        return new self(
-            'Failed to install PrestaShop Event Bus',
-            ExceptionCode::INFRASTRUCTURE_FAILED_TO_INSTALL_PRESTASHOP_EVENT_BUS
-        );
-    }
-}
diff --git a/src/Install/DatabaseTableInstaller.php b/src/Install/DatabaseTableInstaller.php
index 972e0e737..b931e2b5c 100644
--- a/src/Install/DatabaseTableInstaller.php
+++ b/src/Install/DatabaseTableInstaller.php
@@ -20,7 +20,7 @@
 
 final class DatabaseTableInstaller implements InstallerInterface
 {
-    public function install(): bool
+    public function install()
     {
         $commands = $this->getCommands();
 
diff --git a/src/Install/Installer.php b/src/Install/Installer.php
index 43091bc88..49fabbf5d 100644
--- a/src/Install/Installer.php
+++ b/src/Install/Installer.php
@@ -81,7 +81,7 @@ public function __construct(
         $this->orderStateInstaller = $orderStateInstaller;
     }
 
-    public function install(): bool
+    public function install()
     {
         $this->segment->setMessage('Mollie installed');
         $this->segment->track();
diff --git a/src/Install/InstallerInterface.php b/src/Install/InstallerInterface.php
index e2afd5fde..1d773e9ff 100644
--- a/src/Install/InstallerInterface.php
+++ b/src/Install/InstallerInterface.php
@@ -18,5 +18,8 @@
 
 interface InstallerInterface
 {
-    public function install(): bool;
+    /**
+     * @return bool
+     */
+    public function install();
 }
diff --git a/src/Install/PrestaShopDependenciesInstall.php b/src/Install/PrestaShopDependenciesInstall.php
deleted file mode 100644
index 0cd266d76..000000000
--- a/src/Install/PrestaShopDependenciesInstall.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-
-namespace Mollie\Install;
-
-use Mollie\Exception\CouldNotInstallPrestaShopDependencies;
-use Mollie\Factory\ModuleFactory;
-use Prestashop\ModuleLibMboInstaller\Installer;
-use Prestashop\ModuleLibMboInstaller\Presenter;
-use PrestaShop\PrestaShop\Core\Addon\Module\ModuleManagerBuilder;
-use PrestaShop\PsAccountsInstaller\Installer\Installer as PsAccountsInstaller;
-
-class PrestaShopDependenciesInstall implements InstallerInterface
-{
-    /** @var \Mollie */
-    private $module;
-
-    public function __construct(
-        ModuleFactory $moduleFactory
-    ) {
-        $this->module = $moduleFactory->getModule();
-    }
-
-    /**
-     * @throws CouldNotInstallPrestaShopDependencies
-     */
-    public function install(): bool
-    {
-        $mboStatus = (new Presenter())->present();
-
-        if (!$mboStatus['isInstalled']) {
-            $mboInstaller = new Installer(_PS_VERSION_);
-
-            if (!$mboInstaller->installModule()) {
-                throw CouldNotInstallPrestaShopDependencies::failedToInstallMboInstaller();
-            }
-        }
-
-        try {
-            $this->installDependencies();
-        } catch (\Throwable $exception) {
-            throw CouldNotInstallPrestaShopDependencies::failedToInstallDependencies($exception);
-        }
-
-        return true;
-    }
-
-    /**
-     * Install PrestaShop Integration Framework Components
-     *
-     * @throws \Throwable
-     */
-    private function installDependencies(): void
-    {
-        $moduleManager = ModuleManagerBuilder::getInstance();
-
-        if (!$moduleManager) {
-            throw CouldNotInstallPrestaShopDependencies::failedToRetrieveModuleManagerBuilder();
-        }
-
-        $moduleManager = $moduleManager->build();
-
-        /** @var PsAccountsInstaller $prestashopAccountsInstaller */
-        $prestashopAccountsInstaller = $this->module->getService(PsAccountsInstaller::class);
-
-        /*
-         * NOTE: install method upgrades the module if there is a newer version
-         */
-        if (
-            $moduleManager->isInstalled('ps_accounts') &&
-            !$moduleManager->isEnabled('ps_accounts')
-        ) {
-            $moduleManager->enable('ps_accounts');
-        }
-
-        if (!$prestashopAccountsInstaller->install()) {
-            throw CouldNotInstallPrestaShopDependencies::failedToInstallPrestaShopAccounts();
-        }
-
-        /*
-         * NOTE: install method upgrades the module if there is a newer version
-         */
-        if (
-            $moduleManager->isInstalled('ps_eventbus') &&
-            !$moduleManager->isEnabled('ps_eventbus')
-        ) {
-            $moduleManager->enable('ps_eventbus');
-        }
-
-        if (!$moduleManager->install('ps_eventbus')) {
-            throw CouldNotInstallPrestaShopDependencies::failedToInstallPrestaShopEventBus();
-        }
-    }
-}
diff --git a/src/ServiceProvider/BaseServiceProvider.php b/src/ServiceProvider/BaseServiceProvider.php
index d351b2cda..c36483ae9 100644
--- a/src/ServiceProvider/BaseServiceProvider.php
+++ b/src/ServiceProvider/BaseServiceProvider.php
@@ -17,7 +17,6 @@
 use League\Container\Container;
 use Mollie;
 use Mollie\Builder\ApiTestFeedbackBuilder;
-use Mollie\Config\Config;
 use Mollie\Factory\ModuleFactory;
 use Mollie\Handler\Api\OrderEndpointPaymentTypeHandler;
 use Mollie\Handler\Api\OrderEndpointPaymentTypeHandlerInterface;
@@ -128,8 +127,6 @@
 use Mollie\Verification\Shipment\CanSendShipment;
 use Mollie\Verification\Shipment\ShipmentVerificationInterface;
 use PrestaShop\PrestaShop\Core\Grid\Action\Row\AccessibilityChecker\AccessibilityCheckerInterface;
-use PrestaShop\PsAccountsInstaller\Installer\Facade\PsAccounts;
-use PrestaShop\PsAccountsInstaller\Installer\Installer as PsAccountsInstaller;
 
 if (!defined('_PS_VERSION_')) {
     exit;
@@ -253,12 +250,6 @@ public function register(Container $container)
         $this->addService($container, ApiTestFeedbackBuilder::class, ApiTestFeedbackBuilder::class)
             ->withArgument($container->get(ModuleFactory::class)->getModuleVersion() ?? '')
             ->withArgument(ApiKeyService::class);
-
-        $this->addService($container, PsAccountsInstaller::class, PsAccountsInstaller::class)
-            ->withArgument(Config::getPsAccountsVersion());
-
-        $this->addService($container, PsAccounts::class, PsAccounts::class)
-            ->withArgument(PsAccountsInstaller::class);
     }
 
     private function addService(Container $container, $className, $service)
diff --git a/tests/phpstan/phpstan_base.neon b/tests/phpstan/phpstan_base.neon
index 9b6453198..bde2361d4 100644
--- a/tests/phpstan/phpstan_base.neon
+++ b/tests/phpstan/phpstan_base.neon
@@ -42,8 +42,5 @@ parameters:
     - '#Parameter \#1 \$value of method ControllerCore\:\:ajaxRender\(\) expects null, string\|false given.#'
     - '#Call to function is_subclass_of\(\) with.*will always evaluate to false.#'
     - '#Call to function is_array\(\) with.*will always evaluate to false.#'
-    - '#ps_eventbus#'
-    - '#Ps_eventbus#'
-    - '#PsEventbus#'
 
   level: 5
diff --git a/upgrade/Upgrade-6.0.5.php b/upgrade/Upgrade-6.0.5.php
deleted file mode 100644
index 1858c4968..000000000
--- a/upgrade/Upgrade-6.0.5.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-/**
- * Mollie       https://www.mollie.nl
- *
- * @author      Mollie B.V. <info@mollie.nl>
- * @copyright   Mollie B.V.
- * @license     https://github.com/mollie/PrestaShop/blob/master/LICENSE.md
- *
- * @see        https://github.com/mollie/PrestaShop
- */
-
-use Mollie\Logger\PrestaLoggerInterface;
-use PrestaShop\PrestaShop\Core\Addon\Module\ModuleManagerBuilder;
-use PrestaShop\PsAccountsInstaller\Installer\Installer as PsAccountsInstaller;
-
-if (!defined('_PS_VERSION_')) {
-    exit;
-}
-
-function upgrade_module_6_0_5(Mollie $module): bool
-{
-    return installPsAccounts605($module)
-        && installCloudSync605($module);
-}
-
-function installPsAccounts605(Mollie $module): bool
-{
-    /** @var PrestaLoggerInterface $logger */
-    $logger = $module->getService(PrestaLoggerInterface::class);
-
-    try {
-        /** @var PsAccountsInstaller $prestashopAccountsInstaller */
-        $prestashopAccountsInstaller = $module->getService(PsAccountsInstaller::class);
-
-        if (!$prestashopAccountsInstaller->install()) {
-            $logger->error('Failed to install Prestashop Accounts module. Please contact support.');
-
-            return false;
-        }
-    } catch (\Throwable $exception) {
-        $logger->error('Failed to install Prestashop Accounts module. Please contact support.', [
-            'Exception message' => $exception->getMessage(),
-            'Exception code' => $exception->getCode(),
-        ]);
-
-        return false;
-    }
-
-    return true;
-}
-
-function installCloudSync605(Mollie $module): bool
-{
-    /** @var PrestaLoggerInterface $logger */
-    $logger = $module->getService(PrestaLoggerInterface::class);
-
-    $moduleManager = ModuleManagerBuilder::getInstance()->build();
-
-    try {
-        if (
-            $moduleManager->isInstalled('ps_eventbus') &&
-            !$moduleManager->isEnabled('ps_eventbus')
-        ) {
-            $moduleManager->enable('ps_eventbus');
-        }
-
-        $moduleManager->install('ps_eventbus');
-    } catch (Exception $exception) {
-        $logger->error('Failed to install/upgrade Prestashop event bus module. Please contact support.', [
-            'Exception message' => $exception->getMessage(),
-            'Exception code' => $exception->getCode(),
-        ]);
-
-        return false;
-    }
-
-    return true;
-}
diff --git a/views/css/admin/logo_input.css b/views/css/admin/logo_input.css
index a185c69f5..96c64bf7c 100644
--- a/views/css/admin/logo_input.css
+++ b/views/css/admin/logo_input.css
@@ -1,16 +1,3 @@
-.header-logo {
-  width: 263px;
-  align-content: center;
-  text-align: left;
-  padding: 20px 0;
-}
-
-.header-logo img {
-  max-width:100%;
-  height:auto;
-  margin: 0 auto;
-}
-
 .mollie-input-file {
     width: 0.1px;
     height: 0.1px;
diff --git a/views/js/admin/_configure/configuration.js b/views/js/admin/_configure/configuration.js
deleted file mode 100644
index 04bf48f4b..000000000
--- a/views/js/admin/_configure/configuration.js
+++ /dev/null
@@ -1,13 +0,0 @@
-$(document).ready(function () {
-  window?.psaccountsVue?.init();
-  // CloudSync
-  const cdc = window.cloudSyncSharingConsent;
-
-  cdc.init('#prestashop-cloudsync');
-  cdc.on('OnboardingCompleted', (isCompleted) => {
-    console.log('OnboardingCompleted', isCompleted);
-  });
-  cdc.isOnboardingCompleted((isCompleted) => {
-    console.log('Onboarding is already Completed', isCompleted);
-  });
-});
diff --git a/views/templates/admin/_configure/configuration.tpl b/views/templates/admin/_configure/configuration.tpl
deleted file mode 100644
index 1aef4597b..000000000
--- a/views/templates/admin/_configure/configuration.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-<div class="prestashop-accounts-wrapper">
-  <prestashop-accounts></prestashop-accounts>
-</div>
-
-<div class="prestashop-cloudsync-wrapper">
-  <div id="prestashop-cloudsync"></div>
-</div>
-
-{if isset($cloudSyncPathCDC)}
-  <script src="{$cloudSyncPathCDC|escape:'htmlall':'UTF-8'}"></script>
-{/if}
-
-{if isset($urlAccountsCdn)}
-  <script src="{$urlAccountsCdn|escape:'htmlall':'UTF-8'}" rel=preload></script>
-{/if}