diff --git a/Gateway/Validator/AvailableBasedOnIPValidator.php b/Gateway/Validator/AvailableBasedOnIPValidator.php
deleted file mode 100644
index f339db0a9..000000000
--- a/Gateway/Validator/AvailableBasedOnIPValidator.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/**
- * NOTICE OF LICENSE
- *
- * This source file is subject to the MIT License
- * It is available through the world-wide-web at this URL:
- * https://tldrlegal.com/license/mit-license
- * If you are unable to obtain it through the world-wide-web, please email
- * to support@buckaroo.nl, so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade this module to newer
- * versions in the future. If you wish to customize this module for your
- * needs please contact support@buckaroo.nl for more information.
- *
- * @copyright Copyright (c) Buckaroo B.V.
- * @license   https://tldrlegal.com/license/mit-license
- */
-declare(strict_types=1);
-
-namespace Buckaroo\Magento2\Gateway\Validator;
-
-use Buckaroo\Magento2\Gateway\Helper\SubjectReader;
-use Buckaroo\Magento2\Model\ConfigProvider\Account as AccountConfig;
-use Buckaroo\Magento2\Model\ConfigProvider\Factory as ConfigProviderMethodFactory;
-use Magento\Developer\Helper\Data;
-use Magento\Payment\Gateway\Validator\AbstractValidator;
-use Magento\Payment\Gateway\Validator\ResultInterface;
-use Magento\Payment\Gateway\Validator\ResultInterfaceFactory;
-
-class AvailableBasedOnIPValidator extends AbstractValidator
-{
-    /**
-     * @var Data
-     */
-    protected Data $developmentHelper;
-    /**
-     * @var AccountConfig
-     */
-    private AccountConfig $accountConfig;
-    /**
-     * @var ConfigProviderMethodFactory
-     */
-    private ConfigProviderMethodFactory $configProviderMethodFactory;
-
-    /**
-     * @param ResultInterfaceFactory $resultFactory
-     * @param AccountConfig $accountConfig
-     * @param ConfigProviderMethodFactory $configProviderMethodFactory
-     * @param Data $developmentHelper
-     */
-    public function __construct(
-        ResultInterfaceFactory $resultFactory,
-        AccountConfig $accountConfig,
-        ConfigProviderMethodFactory $configProviderMethodFactory,
-        Data $developmentHelper
-    ) {
-        $this->accountConfig = $accountConfig;
-        $this->configProviderMethodFactory = $configProviderMethodFactory;
-        $this->developmentHelper = $developmentHelper;
-        parent::__construct($resultFactory);
-    }
-
-    /**
-     * Check if this payment method is limited by IP.
-     *
-     * @param array $validationSubject
-     * @return ResultInterface
-     */
-    public function validate(array $validationSubject): ResultInterface
-    {
-        $isValid = true;
-
-        $paymentMethodInstance = SubjectReader::readPaymentMethodInstance($validationSubject);
-
-        if ($this->accountConfig->getLimitByIp() == 1 || $paymentMethodInstance->getConfigData('limit_by_ip') == 1) {
-            $storeId = SubjectReader::readQuote($validationSubject)->getStoreId() ?? null;
-            $isAllowed = $this->developmentHelper->isDevAllowed($storeId);
-
-            if (!$isAllowed) {
-                $isValid = false;
-            }
-        }
-
-        return $this->createResult($isValid);
-    }
-}
diff --git a/Logging/Mail.php b/Logging/Mail.php
index 23779e372..7221dc1b7 100644
--- a/Logging/Mail.php
+++ b/Logging/Mail.php
@@ -54,32 +54,6 @@ public function __construct(DebugConfiguration $debugConfiguration)
         $this->debugConfiguration = $debugConfiguration;
     }
 
-    /**
-     * Mail the debug message to the debug recipients
-     *
-     * @return void
-     */
-    public function mailMessage()
-    {
-        $debugEmails = $this->debugConfiguration->getDebugEmails();
-        $message = $this->getMessageAsString();
-
-        if (count($debugEmails) <= 0 || !$message) {
-            return;
-        }
-
-        $headers =  'From: ' . $this->getMailFrom() . "\r\n" .
-            'Reply-To: ' . $this->getMailFrom() . "\r\n" .
-            'X-Mailer: PHP/' . phpversion();
-
-        foreach ($debugEmails as $mailTo) {
-            //@codingStandardsIgnoreLine
-            mail($mailTo, $this->getMailSubject(), $message, $headers);
-        }
-
-        $this->resetMessage();
-    }
-
     /**
      * Reset the message
      *
diff --git a/Model/Checks/CanUseForIP.php b/Model/Checks/CanUseForIP.php
deleted file mode 100644
index 9834fc550..000000000
--- a/Model/Checks/CanUseForIP.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-/**
- * NOTICE OF LICENSE
- *
- * This source file is subject to the MIT License
- * It is available through the world-wide-web at this URL:
- * https://tldrlegal.com/license/mit-license
- * If you are unable to obtain it through the world-wide-web, please email
- * to support@buckaroo.nl, so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade this module to newer
- * versions in the future. If you wish to customize this module for your
- * needs please contact support@buckaroo.nl for more information.
- *
- * @copyright Copyright (c) Buckaroo B.V.
- * @license   https://tldrlegal.com/license/mit-license
- */
-declare(strict_types=1);
-
-namespace Buckaroo\Magento2\Model\Checks;
-
-use Buckaroo\Magento2\Exception;
-use Buckaroo\Magento2\Model\ConfigProvider\Account;
-use Buckaroo\Magento2\Model\ConfigProvider\Factory;
-use Magento\Developer\Helper\Data;
-use Magento\Payment\Model\Checks\SpecificationInterface;
-use Magento\Payment\Model\MethodInterface;
-use Magento\Quote\Api\Data\CartInterface;
-use Magento\Quote\Model\Quote;
-
-class CanUseForIP implements SpecificationInterface
-{
-    /**
-     * @var Factory
-     */
-    public Factory $configProviderFactory;
-
-    /**
-     * @var Data
-     */
-    protected Data $developmentHelper;
-
-    /**
-     * @param Factory $configProviderFactory
-     * @param Data $developmentHelper
-     */
-    public function __construct(Factory $configProviderFactory, Data $developmentHelper)
-    {
-        $this->configProviderFactory = $configProviderFactory;
-        $this->developmentHelper = $developmentHelper;
-    }
-
-    /**
-     * Check whether payment method is applicable to quote
-     *
-     * @param MethodInterface $paymentMethod
-     * @param Quote $quote
-     * @return bool
-     * @throws Exception
-     */
-    public function isApplicable(MethodInterface $paymentMethod, Quote $quote): bool
-    {
-        /**
-         * @var Account $accountConfig
-         */
-        $accountConfig = $this->configProviderFactory->get('account');
-        if ($accountConfig->getActive() == 0) {
-            return false;
-        }
-
-        if (!$this->isAvailableBasedOnIp($paymentMethod, $accountConfig, $quote)) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Check if this payment method is limited by IP.
-     *
-     * @param MethodInterface $paymentMethod
-     * @param Account $accountConfig
-     * @param CartInterface|null $quote
-     *
-     * @return bool
-     */
-    protected function isAvailableBasedOnIp(
-        MethodInterface $paymentMethod,
-        Account $accountConfig,
-        CartInterface $quote = null
-    ): bool {
-        $methodValue = $paymentMethod->getConfigData('limit_by_ip');
-        if ($accountConfig->getLimitByIp() == 1 || $methodValue == 1) {
-            $storeId = $quote ? $quote->getStoreId() : null;
-            $isAllowed = $this->developmentHelper->isDevAllowed($storeId);
-
-            if (!$isAllowed) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-}
diff --git a/Model/ConfigProvider/Account.php b/Model/ConfigProvider/Account.php
index 2586539ca..e27181259 100644
--- a/Model/ConfigProvider/Account.php
+++ b/Model/ConfigProvider/Account.php
@@ -52,8 +52,6 @@ class Account extends AbstractConfigProvider
     public const XPATH_ACCOUNT_LOG_HANDLER                     = 'buckaroo_magento2/account/log_handler';
     public const XPATH_ACCOUNT_LOG_DBTRACE_DEPTH               = 'buckaroo_magento2/account/log_handler_db_depth';
     public const XPATH_ACCOUNT_LOG_RETENTION                   = 'buckaroo_magento2/account/log_retention';
-    public const XPATH_ACCOUNT_DEBUG_EMAIL                     = 'buckaroo_magento2/account/debug_email';
-    public const XPATH_ACCOUNT_LIMIT_BY_IP                     = 'buckaroo_magento2/account/limit_by_ip';
     public const XPATH_ACCOUNT_FEE_PERCENTAGE_MODE             = 'buckaroo_magento2/account/fee_percentage_mode';
     public const XPATH_ACCOUNT_PAYMENT_FEE_LABEL               = 'buckaroo_magento2/account/payment_fee_label';
     public const XPATH_ACCOUNT_ORDER_STATUS_NEW                = 'buckaroo_magento2/account/order_status_new';
@@ -113,10 +111,8 @@ public function getConfig($store = null): array
             'failure_redirect_to_checkout'      => $this->getFailureRedirectToCheckout($store),
             'cancel_on_failed'                  => $this->getCancelOnFailed($store),
             'debug_types'                       => $this->getLogLevel($store),
-            'debug_email'                       => $this->getDebugEmail($store),
             'log_handler'                       => $this->getLogHandler($store),
             'log_retention'                     => $this->getLogRetention($store),
-            'limit_by_ip'                       => $this->getLimitByIp($store),
             'fee_percentage_mode'               => $this->getFeePercentageMode($store),
             'payment_fee_label'                 => $this->getPaymentFeeLabel($store),
             'order_status_new'                  => $this->getOrderStatusNew($store),
@@ -494,36 +490,6 @@ public function getLogRetention($store = null)
         );
     }
 
-    /**
-     * Get comma-separated emails where debug information will be sent
-     *
-     * @param null|int|string $store
-     * @return mixed
-     */
-    public function getDebugEmail($store = null)
-    {
-        return $this->scopeConfig->getValue(
-            self::XPATH_ACCOUNT_DEBUG_EMAIL,
-            ScopeInterface::SCOPE_STORE,
-            $store
-        );
-    }
-
-    /**
-     * Display only for selected IPs
-     *
-     * @param null|int|string $store
-     * @return mixed
-     */
-    public function getLimitByIp($store = null)
-    {
-        return $this->scopeConfig->getValue(
-            self::XPATH_ACCOUNT_LIMIT_BY_IP,
-            ScopeInterface::SCOPE_STORE,
-            $store
-        );
-    }
-
     /**
      * Get Fee percentage mode (Subtotal/Subtotal incl. tax)
      *
diff --git a/Model/ConfigProvider/DebugConfiguration.php b/Model/ConfigProvider/DebugConfiguration.php
index 1abe4fbcd..2bf044a36 100644
--- a/Model/ConfigProvider/DebugConfiguration.php
+++ b/Model/ConfigProvider/DebugConfiguration.php
@@ -52,25 +52,6 @@ public function getLogLevel()
         return (string)$this->accountConfig->getLogLevel();
     }
 
-    /**
-     * Get array of emails where debug information will be sent
-     *
-     * @return array
-     */
-    public function getDebugEmails(): array
-    {
-        $debugEmails = $this->accountConfig->getDebugEmail();
-        if (!is_scalar($debugEmails)) {
-            return [];
-        }
-
-        $debugEmails = explode(',', preg_replace('/\s+/', '', (string)$debugEmails));
-
-        return array_filter($debugEmails, function ($debugEmail) {
-            return filter_var($debugEmail, FILTER_VALIDATE_EMAIL);
-        });
-    }
-
     /**
      * Is Logger active
      *
diff --git a/Model/ConfigProvider/Method/AbstractConfigProvider.php b/Model/ConfigProvider/Method/AbstractConfigProvider.php
index 503bfe593..2cf10a7ea 100644
--- a/Model/ConfigProvider/Method/AbstractConfigProvider.php
+++ b/Model/ConfigProvider/Method/AbstractConfigProvider.php
@@ -47,7 +47,6 @@ abstract class AbstractConfigProvider extends BaseAbstractConfigProvider impleme
     public const XPATH_ACTIVE_STATUS = 'active_status';
     public const XPATH_ORDER_STATUS_SUCCESS = 'order_status_success';
     public const XPATH_ORDER_STATUS_FAILED = 'order_status_failed';
-    public const XPATH_LIMIT_BY_IP = 'limit_by_ip';
 
     public const XPATH_ALLOWED_CURRENCIES = 'allowed_currencies';
     public const XPATH_ALLOW_SPECIFIC   = 'allowspecific';
@@ -456,17 +455,6 @@ public function getOrderStatusFailed($store = null)
         return $this->getMethodConfigValue(static::XPATH_ORDER_STATUS_FAILED, $store);
     }
 
-    /**
-     * Get Limit By IP
-     *
-     * @param null|int|string $store
-     * @return mixed|null
-     */
-    public function getLimitByIp($store = null)
-    {
-        return $this->getMethodConfigValue(static::XPATH_LIMIT_BY_IP, $store);
-    }
-
     /**
      * Get subtext
      *
diff --git a/Test/Unit/Gateway/Validator/AvailableBasedOnIPValidatorTest.php b/Test/Unit/Gateway/Validator/AvailableBasedOnIPValidatorTest.php
deleted file mode 100644
index dae6f00aa..000000000
--- a/Test/Unit/Gateway/Validator/AvailableBasedOnIPValidatorTest.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-
-namespace Buckaroo\Magento2\Test\Unit\Gateway\Validator;
-
-use Buckaroo\Magento2\Gateway\Validator\AvailableBasedOnIPValidator;
-use Buckaroo\Magento2\Model\ConfigProvider\Account as AccountConfig;
-use Buckaroo\Magento2\Model\ConfigProvider\Factory as ConfigProviderMethodFactory;
-use Magento\Payment\Gateway\Validator\ResultInterface;
-use Magento\Payment\Gateway\Validator\ResultInterfaceFactory;
-use Magento\Payment\Model\MethodInterface;
-use PHPUnit\Framework\TestCase;
-
-class AvailableBasedOnIPValidatorTest extends TestCase
-{
-    /**
-     * @var ResultInterfaceFactory|\PHPUnit\Framework\MockObject\MockObject
-     */
-    private $resultFactoryMock;
-
-    /**
-     * @var AccountConfig|\PHPUnit\Framework\MockObject\MockObject
-     */
-    private $accountConfigMock;
-
-    /**
-     * @var ConfigProviderMethodFactory|\PHPUnit\Framework\MockObject\MockObject
-     */
-    private $configProviderMethodFactoryMock;
-
-    /**
-     * @var \Magento\Developer\Helper\Data|\PHPUnit\Framework\MockObject\MockObject
-     */
-    private $developmentHelperMock;
-
-    /**
-     * @var AvailableBasedOnIPValidator
-     */
-    private $validator;
-
-    protected function setUp(): void
-    {
-        $this->resultFactoryMock = $this->getMockBuilder(ResultInterfaceFactory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->accountConfigMock = $this->getMockBuilder(AccountConfig::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->configProviderMethodFactoryMock = $this->getMockBuilder(ConfigProviderMethodFactory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->developmentHelperMock = $this->getMockBuilder(\Magento\Developer\Helper\Data::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->validator = new AvailableBasedOnIPValidator(
-            $this->resultFactoryMock,
-            $this->accountConfigMock,
-            $this->configProviderMethodFactoryMock,
-            $this->developmentHelperMock
-        );
-    }
-
-    /**
-     * @dataProvider availableBasedOnIPValidationDataProvider
-     */
-    public function testValidate($limitByIp, $configLimitByIp, $storeId, $isDevAllowed, $expectedResult)
-    {
-        $quoteMock = $this->getMockBuilder(\Magento\Quote\Model\Quote::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $quoteMock->expects($this->atMost(1))
-            ->method('getStoreId')
-            ->willReturn($storeId);
-
-        $validationSubject = [
-            'paymentMethodInstance' => $this->getMockBuilder(MethodInterface::class)
-                ->disableOriginalConstructor()
-                ->getMock(),
-            'quote' => $quoteMock,
-        ];
-
-        $this->accountConfigMock->expects($this->once())
-            ->method('getLimitByIp')
-            ->willReturn($limitByIp);
-
-        $validationSubject['paymentMethodInstance']->expects($this->atMost(1))
-            ->method('getConfigData')
-            ->with('limit_by_ip')
-            ->willReturn($configLimitByIp);
-
-        $this->developmentHelperMock->expects($this->atMost(1))
-            ->method('isDevAllowed')
-            ->with($storeId)
-            ->willReturn($isDevAllowed);
-
-        $expectedResultObj = $this->createMock(ResultInterface::class);
-        $this->resultFactoryMock->expects($this->once())
-            ->method('create')
-            ->with(['isValid' => $expectedResult, 'failsDescription' => [], 'errorCodes' => []])
-            ->willReturn($expectedResultObj);
-
-        $result = $this->validator->validate($validationSubject);
-        $this->assertSame($expectedResultObj, $result);
-    }
-
-    public function availableBasedOnIPValidationDataProvider()
-    {
-        return [
-            'limitByIp=0, config=0, isDevAllowed=1' => [
-                'limitByIp' => false,
-                'configLimitByIp' => '0',
-                'storeId' => 1,
-                'isDevAllowed' => true,
-                'expectedResult' => true,
-            ],
-            'limitByIp=0, config=1, isDevAllowed=1' => [
-                'limitByIp' => false,
-                'configLimitByIp' => '1',
-                'storeId' => 1,
-                'isDevAllowed' => true,
-                'expectedResult' => true,
-            ],
-            'limitByIp=1, config=0, isDevAllowed=1' => [
-                'limitByIp' => true,
-                'configLimitByIp' => '0',
-                'storeId' => 1,
-                'isDevAllowed' => true,
-                'expectedResult' => true,
-            ],
-            'limitByIp=1, config=1, isDevAllowed=1' => [
-                'limitByIp' => true,
-                'configLimitByIp' => '1',
-                'storeId' => 1,
-                'isDevAllowed' => true,
-                'expectedResult' => true,
-            ],
-            'limitByIp=0, config=1, store=0, isDevAllowed=0' => [
-                'limitByIp' => false,
-                'configLimitByIp' => '1',
-                'storeId' => 0,
-                'isDevAllowed' => false,
-                'expectedResult' => false,
-            ],
-        ];
-    }
-}
diff --git a/etc/adminhtml/system/account.xml b/etc/adminhtml/system/account.xml
index f7d2d9941..2aa8d16af 100644
--- a/etc/adminhtml/system/account.xml
+++ b/etc/adminhtml/system/account.xml
@@ -249,23 +249,10 @@
                     <comment><![CDATA[[Decide what period will be for log retention]]></comment>
                     <config_path>buckaroo_magento2/account/log_retention</config_path>
                 </field>
-
-                <field id="debug_email" translate="label comment" type="text" sortOrder="240" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Debug email</label>
-                    <comment><![CDATA[Debug information will be sent to these comma-separated email addresses.]]></comment>
-                    <config_path>buckaroo_magento2/account/debug_email</config_path>
-                    <validate>validate-emails</validate>
-                </field>
             </group>
 
             <group id="buckaroo_magento2_miscellaneous_section" translate="label" type="text" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Miscellaneous</label>
-                <field id="limit_by_ip" translate="label comment" type="select" sortOrder="140" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Display only for selected IPs</label>
-                    <comment><![CDATA[Show method only to Magento set IPs.]]></comment>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <config_path>buckaroo_magento2/account/limit_by_ip</config_path>
-                </field>
 
                 <field id="create_order_before_transaction" translate="label comment" type="select" sortOrder="170" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Create order before transaction</label>
diff --git a/etc/adminhtml/system/payment_methods/afterpay.xml b/etc/adminhtml/system/payment_methods/afterpay.xml
index e5d4323af..0fd2d2e94 100644
--- a/etc/adminhtml/system/payment_methods/afterpay.xml
+++ b/etc/adminhtml/system/payment_methods/afterpay.xml
@@ -237,14 +237,6 @@
                     <source_model>Buckaroo\Magento2\Model\Config\Source\AllowedCurrencies::afterpay</source_model>
                     <backend_model>Buckaroo\Magento2\Model\Config\Backend\AllowedCurrencies</backend_model>
                 </field>
-
-                <field id="limit_by_ip" translate="label comment" type="select" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Display only for selected IPs</label>
-                    <comment><![CDATA[Show method only to Magento set IPs.]]></comment>
-                    <tooltip>Magento developer client restrictions.</tooltip>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <config_path>payment/buckaroo_magento2_afterpay/limit_by_ip</config_path>
-                </field>
             </group>
             <group id="buckaroo_magento2_spam" translate="label" type="text" sortOrder="150" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Spam Prevention</label>
diff --git a/etc/adminhtml/system/payment_methods/afterpay2.xml b/etc/adminhtml/system/payment_methods/afterpay2.xml
index de70c0522..7db8e2dba 100644
--- a/etc/adminhtml/system/payment_methods/afterpay2.xml
+++ b/etc/adminhtml/system/payment_methods/afterpay2.xml
@@ -239,14 +239,6 @@
                     <source_model>Buckaroo\Magento2\Model\Config\Source\AllowedCurrencies::afterpay2</source_model>
                     <backend_model>Buckaroo\Magento2\Model\Config\Backend\AllowedCurrencies</backend_model>
                 </field>
-
-                <field id="limit_by_ip" translate="label comment" type="select" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Display only for selected IPs</label>
-                    <comment><![CDATA[Show method only to Magento set IPs.]]></comment>
-                    <tooltip>Magento developer client restrictions.</tooltip>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <config_path>payment/buckaroo_magento2_afterpay2/limit_by_ip</config_path>
-                </field>
             </group>
 
             <group id="buckaroo_magento2_spam" translate="label" type="text" sortOrder="150" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/system/payment_methods/afterpay20.xml b/etc/adminhtml/system/payment_methods/afterpay20.xml
index d545aba1a..11e28be8a 100644
--- a/etc/adminhtml/system/payment_methods/afterpay20.xml
+++ b/etc/adminhtml/system/payment_methods/afterpay20.xml
@@ -219,14 +219,6 @@
                     <source_model>Buckaroo\Magento2\Model\Config\Source\AllowedCurrencies::afterpay20</source_model>
                     <backend_model>Buckaroo\Magento2\Model\Config\Backend\AllowedCurrencies</backend_model>
                 </field>
-
-                <field id="limit_by_ip" translate="label comment" type="select" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Display only for selected IPs</label>
-                    <comment><![CDATA[Show method only to Magento set IPs.]]></comment>
-                    <tooltip>Magento developer client restrictions.</tooltip>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <config_path>payment/buckaroo_magento2_afterpay20/limit_by_ip</config_path>
-                </field>
             </group>
             <group id="buckaroo_magento2_spam" translate="label" type="text" sortOrder="150" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Spam Prevention</label>
diff --git a/etc/adminhtml/system/payment_methods/alipay.xml b/etc/adminhtml/system/payment_methods/alipay.xml
index 30bde4fab..e4cbbdacc 100644
--- a/etc/adminhtml/system/payment_methods/alipay.xml
+++ b/etc/adminhtml/system/payment_methods/alipay.xml
@@ -166,14 +166,6 @@
                     <source_model>Buckaroo\Magento2\Model\Config\Source\AllowedCurrencies::alipay</source_model>
                     <backend_model>Buckaroo\Magento2\Model\Config\Backend\AllowedCurrencies</backend_model>
                 </field>
-
-                <field id="limit_by_ip" translate="label comment tooltip" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Display only for selected IPs</label>
-                    <comment><![CDATA[Show method only to Magento set IPs.]]></comment>
-                    <tooltip>Magento developer client restrictions.</tooltip>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <config_path>payment/buckaroo_magento2_alipay/limit_by_ip</config_path>
-                </field>
             </group>
         </group>
     </group>
diff --git a/etc/adminhtml/system/payment_methods/applepay.xml b/etc/adminhtml/system/payment_methods/applepay.xml
index a2a65568c..fc755cfad 100644
--- a/etc/adminhtml/system/payment_methods/applepay.xml
+++ b/etc/adminhtml/system/payment_methods/applepay.xml
@@ -168,14 +168,6 @@
                     <source_model>Buckaroo\Magento2\Model\Config\Source\AllowedCurrencies::applepay</source_model>
                     <backend_model>Buckaroo\Magento2\Model\Config\Backend\AllowedCurrencies</backend_model>
                 </field>
-
-                <field id="limit_by_ip" translate="label comment tooltip" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Display only for selected IPs</label>
-                    <comment><![CDATA[Show method only to Magento set IPs.]]></comment>
-                    <tooltip>Magento developer client restrictions.</tooltip>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <config_path>payment/buckaroo_magento2_applepay/limit_by_ip</config_path>
-                </field>
             </group>
         </group>
     </group>
diff --git a/etc/adminhtml/system/payment_methods/belfius.xml b/etc/adminhtml/system/payment_methods/belfius.xml
index 2a967bc9a..370e146d3 100644
--- a/etc/adminhtml/system/payment_methods/belfius.xml
+++ b/etc/adminhtml/system/payment_methods/belfius.xml
@@ -166,14 +166,6 @@
                     <source_model>Buckaroo\Magento2\Model\Config\Source\AllowedCurrencies::belfius</source_model>
                     <backend_model>Buckaroo\Magento2\Model\Config\Backend\AllowedCurrencies</backend_model>
                 </field>
-
-                <field id="limit_by_ip" translate="label comment tooltip" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Display only for selected IPs</label>
-                    <comment><![CDATA[Show method only to Magento set IPs.]]></comment>
-                    <tooltip>Magento developer client restrictions.</tooltip>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <config_path>payment/buckaroo_magento2_belfius/limit_by_ip</config_path>
-                </field>
             </group>
         </group>
     </group>
diff --git a/etc/adminhtml/system/payment_methods/billink.xml b/etc/adminhtml/system/payment_methods/billink.xml
index 115fdaa58..9a8d9e968 100644
--- a/etc/adminhtml/system/payment_methods/billink.xml
+++ b/etc/adminhtml/system/payment_methods/billink.xml
@@ -198,14 +198,6 @@
                     <backend_model>Buckaroo\Magento2\Model\Config\Backend\AllowedCurrencies</backend_model>
                 </field>
 
-                <field id="limit_by_ip" translate="label comment" type="select" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Display only for selected IPs</label>
-                    <comment><![CDATA[Show method only to Magento set IPs.]]></comment>
-                    <tooltip>Magento developer client restrictions.</tooltip>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <config_path>payment/buckaroo_magento2_billink/limit_by_ip</config_path>
-                </field>
-
                 <group id="buckaroo_magento2_spam" translate="label" type="text" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Spam Prevention</label>
                     <field id="spam_prevention" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/adminhtml/system/payment_methods/capayable_in3.xml b/etc/adminhtml/system/payment_methods/capayable_in3.xml
index 7f9d59cfd..3a32d3e7a 100644
--- a/etc/adminhtml/system/payment_methods/capayable_in3.xml
+++ b/etc/adminhtml/system/payment_methods/capayable_in3.xml
@@ -182,14 +182,6 @@
                     <source_model>Buckaroo\Magento2\Model\Config\Source\AllowedCurrencies::capayablein3</source_model>
                     <backend_model>Buckaroo\Magento2\Model\Config\Backend\AllowedCurrencies</backend_model>
                 </field>
-                
-                <field id="limit_by_ip" translate="label comment tooltip" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Display only for selected IPs</label>
-                    <comment><![CDATA[Show method only to Magento set IPs.]]></comment>
-                    <tooltip>Magento developer client restrictions.</tooltip>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <config_path>payment/buckaroo_magento2_capayablein3/limit_by_ip</config_path>
-                </field>
 
                 <group id="buckaroo_magento2_spam" translate="label" type="text" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Spam Prevention</label>
diff --git a/etc/adminhtml/system/payment_methods/capayable_postpay.xml b/etc/adminhtml/system/payment_methods/capayable_postpay.xml
index 468573c83..5ae933afe 100644
--- a/etc/adminhtml/system/payment_methods/capayable_postpay.xml
+++ b/etc/adminhtml/system/payment_methods/capayable_postpay.xml
@@ -156,14 +156,6 @@
                 </depends>
             </field>
 
-            <field id="limit_by_ip" translate="label comment tooltip" type="select" sortOrder="120" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>Display only for selected IPs</label>
-                <comment><![CDATA[Show method only to Magento set IPs.]]></comment>
-                <tooltip>Magento developer client restrictions.</tooltip>
-                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                <config_path>payment/buckaroo_magento2_capayablepostpay/limit_by_ip</config_path>
-            </field>
-
             <field id="specificcustomergroup" translate="label" type="multiselect" sortOrder="130" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Allow customer groups</label>
                 <source_model>Buckaroo\Magento2\Model\Config\Source\SpecificCustomerGroups</source_model>
diff --git a/etc/adminhtml/system/payment_methods/creditcard.xml b/etc/adminhtml/system/payment_methods/creditcard.xml
index 30b179e3a..8dcb29a95 100644
--- a/etc/adminhtml/system/payment_methods/creditcard.xml
+++ b/etc/adminhtml/system/payment_methods/creditcard.xml
@@ -100,7 +100,7 @@
                     <label>Verify address</label>
                     <comment><![CDATA[Set true to verify the address at American Express. Set false to disable address verification.]]></comment>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <config_path>payment/buckaroo_magento2_creditcard/limit_by_ip</config_path>
+                    <config_path>payment/buckaroo_magento2_creditcard/amex_address_verification</config_path>
                 </field>
 
                 <!-- Mastercard specific -->
@@ -266,14 +266,6 @@
                     <source_model>Buckaroo\Magento2\Model\Config\Source\AllowedCurrencies::creditcard</source_model>
                     <backend_model>Buckaroo\Magento2\Model\Config\Backend\AllowedCurrencies</backend_model>
                 </field>
-
-                <field id="limit_by_ip" translate="label comment" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Display only for selected IPs</label>
-                    <comment><![CDATA[Show method only to Magento set IPs.]]></comment>
-                    <tooltip>Magento developer client restrictions.</tooltip>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <config_path>payment/buckaroo_magento2_creditcard/limit_by_ip</config_path>
-                </field>
             </group>
         </group>
     </group>
diff --git a/etc/adminhtml/system/payment_methods/creditcards.xml b/etc/adminhtml/system/payment_methods/creditcards.xml
index f62050145..6ac72a135 100644
--- a/etc/adminhtml/system/payment_methods/creditcards.xml
+++ b/etc/adminhtml/system/payment_methods/creditcards.xml
@@ -187,14 +187,6 @@
                     <source_model>Buckaroo\Magento2\Model\Config\Source\AllowedCurrencies::creditcards</source_model>
                     <backend_model>Buckaroo\Magento2\Model\Config\Backend\AllowedCurrencies</backend_model>
                 </field>
-
-                <field id="limit_by_ip" translate="label comment tooltip" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Display only for selected IPs</label>
-                    <comment><![CDATA[Show method only to Magento set IPs.]]></comment>
-                    <tooltip>Magento developer client restrictions.</tooltip>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <config_path>payment/buckaroo_magento2_creditcards/limit_by_ip</config_path>
-                </field>
             </group>
         </group>
     </group>
diff --git a/etc/adminhtml/system/payment_methods/creditclick.xml b/etc/adminhtml/system/payment_methods/creditclick.xml
index fc3abce51..25e210d2b 100644
--- a/etc/adminhtml/system/payment_methods/creditclick.xml
+++ b/etc/adminhtml/system/payment_methods/creditclick.xml
@@ -167,14 +167,6 @@
                     <source_model>Buckaroo\Magento2\Model\Config\Source\AllowedCurrencies::creditclick</source_model>
                     <backend_model>Buckaroo\Magento2\Model\Config\Backend\AllowedCurrencies</backend_model>
                 </field>
-            
-                <field id="limit_by_ip" translate="label comment tooltip" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Display only for selected IPs</label>
-                    <comment><![CDATA[Show method only to Magento set IPs.]]></comment>
-                    <tooltip>Magento developer client restrictions.</tooltip>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <config_path>payment/buckaroo_magento2_creditclick/limit_by_ip</config_path>
-                </field>
             </group>
         </group>
     </group>
diff --git a/etc/adminhtml/system/payment_methods/eps.xml b/etc/adminhtml/system/payment_methods/eps.xml
index 5e29c3bbb..a7b6ffad2 100644
--- a/etc/adminhtml/system/payment_methods/eps.xml
+++ b/etc/adminhtml/system/payment_methods/eps.xml
@@ -166,14 +166,6 @@
                     <source_model>Buckaroo\Magento2\Model\Config\Source\AllowedCurrencies::eps</source_model>
                     <backend_model>Buckaroo\Magento2\Model\Config\Backend\AllowedCurrencies</backend_model>
                 </field>
-
-                <field id="limit_by_ip" translate="label comment tooltip" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Display only for selected IPs</label>
-                    <comment><![CDATA[Show method only to Magento set IPs.]]></comment>
-                    <tooltip>Magento developer client restrictions.</tooltip>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <config_path>payment/buckaroo_magento2_eps/limit_by_ip</config_path>
-                </field>
             </group>
         </group>
     </group>
diff --git a/etc/adminhtml/system/payment_methods/giftcards.xml b/etc/adminhtml/system/payment_methods/giftcards.xml
index b80e4793a..d351d7286 100644
--- a/etc/adminhtml/system/payment_methods/giftcards.xml
+++ b/etc/adminhtml/system/payment_methods/giftcards.xml
@@ -184,14 +184,6 @@
                     <source_model>Buckaroo\Magento2\Model\Config\Source\AllowedCurrencies::ideal</source_model>
                     <backend_model>Buckaroo\Magento2\Model\Config\Backend\AllowedCurrencies</backend_model>
                 </field>
-                
-                <field id="limit_by_ip" translate="label comment tooltip" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Display only for selected IPs</label>
-                    <comment><![CDATA[Show method only to Magento set IPs.]]></comment>
-                    <tooltip>Magento developer client restrictions.</tooltip>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <config_path>payment/buckaroo_magento2_giftcards/limit_by_ip</config_path>
-                </field>
             </group>
         </group>
     </group>
diff --git a/etc/adminhtml/system/payment_methods/giropay.xml b/etc/adminhtml/system/payment_methods/giropay.xml
index 6e1950d97..cddb6ba33 100644
--- a/etc/adminhtml/system/payment_methods/giropay.xml
+++ b/etc/adminhtml/system/payment_methods/giropay.xml
@@ -167,14 +167,6 @@
                     <source_model>Buckaroo\Magento2\Model\Config\Source\AllowedCurrencies::giropay</source_model>
                     <backend_model>Buckaroo\Magento2\Model\Config\Backend\AllowedCurrencies</backend_model>
                 </field>
-                
-                <field id="limit_by_ip" translate="label comment tooltip" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Display only for selected IPs</label>
-                    <comment><![CDATA[Show method only to Magento set IPs.]]></comment>
-                    <tooltip>Magento developer client restrictions.</tooltip>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <config_path>payment/buckaroo_magento2_giropay/limit_by_ip</config_path>
-                </field>
             </group>
         </group>
     </group>
diff --git a/etc/adminhtml/system/payment_methods/ideal.xml b/etc/adminhtml/system/payment_methods/ideal.xml
index 16bbdc7e5..34a9b2c42 100644
--- a/etc/adminhtml/system/payment_methods/ideal.xml
+++ b/etc/adminhtml/system/payment_methods/ideal.xml
@@ -177,14 +177,6 @@
                     <source_model>Buckaroo\Magento2\Model\Config\Source\AllowedCurrencies::ideal</source_model>
                     <backend_model>Buckaroo\Magento2\Model\Config\Backend\AllowedCurrencies</backend_model>
                 </field>
-
-                <field id="limit_by_ip" translate="label comment tooltip" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Display only for selected IPs</label>
-                    <comment><![CDATA[Show method only to Magento set IPs.]]></comment>
-                    <tooltip>Magento developer client restrictions.</tooltip>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <config_path>payment/buckaroo_magento2_ideal/limit_by_ip</config_path>
-                </field>
             </group>
         </group>
     </group>
diff --git a/etc/adminhtml/system/payment_methods/idealprocessing.xml b/etc/adminhtml/system/payment_methods/idealprocessing.xml
index cae47b9ac..8e46fd9c2 100644
--- a/etc/adminhtml/system/payment_methods/idealprocessing.xml
+++ b/etc/adminhtml/system/payment_methods/idealprocessing.xml
@@ -175,14 +175,6 @@
                     <source_model>Buckaroo\Magento2\Model\Config\Source\AllowedCurrencies::ideal</source_model>
                     <backend_model>Buckaroo\Magento2\Model\Config\Backend\AllowedCurrencies</backend_model>
                 </field>
-
-                <field id="limit_by_ip" translate="label comment tooltip" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Display only for selected IPs</label>
-                    <comment><![CDATA[Show method only to Magento set IPs.]]></comment>
-                    <tooltip>Magento developer client restrictions.</tooltip>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <config_path>payment/buckaroo_magento2_idealprocessing/limit_by_ip</config_path>
-                </field>
             </group>
         </group>
     </group>
diff --git a/etc/adminhtml/system/payment_methods/kbc.xml b/etc/adminhtml/system/payment_methods/kbc.xml
index 481b04fb6..dac16aa9f 100644
--- a/etc/adminhtml/system/payment_methods/kbc.xml
+++ b/etc/adminhtml/system/payment_methods/kbc.xml
@@ -165,14 +165,6 @@
                     <source_model>Buckaroo\Magento2\Model\Config\Source\AllowedCurrencies::ideal</source_model>
                     <backend_model>Buckaroo\Magento2\Model\Config\Backend\AllowedCurrencies</backend_model>
                 </field>
-
-                <field id="limit_by_ip" translate="label comment tooltip" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Display only for selected IPs</label>
-                    <comment><![CDATA[Show method only to Magento set IPs.]]></comment>
-                    <tooltip>Magento developer client restrictions.</tooltip>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <config_path>payment/buckaroo_magento2_kbc/limit_by_ip</config_path>
-                </field>
             </group>
         </group>
     </group>
diff --git a/etc/adminhtml/system/payment_methods/klarna.xml b/etc/adminhtml/system/payment_methods/klarna.xml
index fde867e90..d4e277db4 100644
--- a/etc/adminhtml/system/payment_methods/klarna.xml
+++ b/etc/adminhtml/system/payment_methods/klarna.xml
@@ -167,14 +167,6 @@
                     <source_model>Buckaroo\Magento2\Model\Config\Source\AllowedCurrencies::ideal</source_model>
                     <backend_model>Buckaroo\Magento2\Model\Config\Backend\AllowedCurrencies</backend_model>
                 </field>
-
-                <field id="limit_by_ip" translate="label comment" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Display only for selected IPs</label>
-                    <comment><![CDATA[Show method only to Magento set IPs.]]></comment>
-                    <tooltip>Magento developer client restrictions.</tooltip>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <config_path>payment/buckaroo_magento2_klarna/limit_by_ip</config_path>
-                </field>        
             </group>
         </group>
     </group>
diff --git a/etc/adminhtml/system/payment_methods/klarnain.xml b/etc/adminhtml/system/payment_methods/klarnain.xml
index 28a4bac1d..b63ed53f9 100644
--- a/etc/adminhtml/system/payment_methods/klarnain.xml
+++ b/etc/adminhtml/system/payment_methods/klarnain.xml
@@ -168,14 +168,6 @@
                     <source_model>Buckaroo\Magento2\Model\Config\Source\AllowedCurrencies::ideal</source_model>
                     <backend_model>Buckaroo\Magento2\Model\Config\Backend\AllowedCurrencies</backend_model>
                 </field>
-
-                <field id="limit_by_ip" translate="label comment" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Display only for selected IPs</label>
-                    <comment><![CDATA[Show method only to Magento set IPs.]]></comment>
-                    <tooltip>Magento developer client restrictions.</tooltip>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <config_path>payment/buckaroo_magento2_klarnain/limit_by_ip</config_path>
-                </field>
             </group>
         </group>
     </group>
diff --git a/etc/adminhtml/system/payment_methods/klarnakp.xml b/etc/adminhtml/system/payment_methods/klarnakp.xml
index 50172b1d6..c86034562 100644
--- a/etc/adminhtml/system/payment_methods/klarnakp.xml
+++ b/etc/adminhtml/system/payment_methods/klarnakp.xml
@@ -179,14 +179,6 @@
                     <source_model>Buckaroo\Magento2\Model\Config\Source\AllowedCurrencies::ideal</source_model>
                     <backend_model>Buckaroo\Magento2\Model\Config\Backend\AllowedCurrencies</backend_model>
                 </field>
-                
-                <field id="limit_by_ip" translate="label comment" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Display only for selected IPs</label>
-                    <comment><![CDATA[Show method only to Magento set IPs.]]></comment>
-                    <tooltip>Magento developer client restrictions.</tooltip>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <config_path>payment/buckaroo_magento2_klarnakp/limit_by_ip</config_path>
-                </field>
             </group>
         </group>
     </group>
diff --git a/etc/adminhtml/system/payment_methods/mrcash.xml b/etc/adminhtml/system/payment_methods/mrcash.xml
index 309eaaa54..1d5155679 100644
--- a/etc/adminhtml/system/payment_methods/mrcash.xml
+++ b/etc/adminhtml/system/payment_methods/mrcash.xml
@@ -177,14 +177,6 @@
                     <source_model>Buckaroo\Magento2\Model\Config\Source\AllowedCurrencies::mrcash</source_model>
                     <backend_model>Buckaroo\Magento2\Model\Config\Backend\AllowedCurrencies</backend_model>
                 </field>
-                
-                <field id="limit_by_ip" translate="label comment tooltip" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Display only for selected IPs</label>
-                    <comment><![CDATA[Show method only to Magento set IPs.]]></comment>
-                    <tooltip>Magento developer client restrictions.</tooltip>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <config_path>payment/buckaroo_magento2_mrcash/limit_by_ip</config_path>
-                </field>
             </group>
         </group>
     </group>
diff --git a/etc/adminhtml/system/payment_methods/p24.xml b/etc/adminhtml/system/payment_methods/p24.xml
index 1146e7290..cc86cb28e 100644
--- a/etc/adminhtml/system/payment_methods/p24.xml
+++ b/etc/adminhtml/system/payment_methods/p24.xml
@@ -167,14 +167,6 @@
                     <source_model>Buckaroo\Magento2\Model\Config\Source\AllowedCurrencies::p24</source_model>
                     <backend_model>Buckaroo\Magento2\Model\Config\Backend\AllowedCurrencies</backend_model>
                 </field>
-            
-                <field id="limit_by_ip" translate="label comment tooltip" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Display only for selected IPs</label>
-                    <comment><![CDATA[Show method only to Magento set IPs.]]></comment>
-                    <tooltip>Magento developer client restrictions.</tooltip>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <config_path>payment/buckaroo_magento2_p24/limit_by_ip</config_path>
-                </field>
             </group>
         </group>
     </group>
diff --git a/etc/adminhtml/system/payment_methods/paybybank.xml b/etc/adminhtml/system/payment_methods/paybybank.xml
index 882404d62..c176f0795 100644
--- a/etc/adminhtml/system/payment_methods/paybybank.xml
+++ b/etc/adminhtml/system/payment_methods/paybybank.xml
@@ -167,14 +167,6 @@
                     <source_model>Buckaroo\Magento2\Model\Config\Source\AllowedCurrencies::paybybank</source_model>
                     <backend_model>Buckaroo\Magento2\Model\Config\Backend\AllowedCurrencies</backend_model>
                 </field>
-
-                <field id="limit_by_ip" translate="label comment tooltip" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Display only for selected IPs</label>
-                    <comment><![CDATA[Show method only to Magento set IPs.]]></comment>
-                    <tooltip>Magento developer client restrictions.</tooltip>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <config_path>payment/buckaroo_magento2_paybybank/limit_by_ip</config_path>
-                </field>
             </group>
         </group>
     </group>
diff --git a/etc/adminhtml/system/payment_methods/payconiq.xml b/etc/adminhtml/system/payment_methods/payconiq.xml
index 528c7efd0..1ea6bfa38 100644
--- a/etc/adminhtml/system/payment_methods/payconiq.xml
+++ b/etc/adminhtml/system/payment_methods/payconiq.xml
@@ -167,14 +167,6 @@
                     <source_model>Buckaroo\Magento2\Model\Config\Source\AllowedCurrencies::payconiq</source_model>
                     <backend_model>Buckaroo\Magento2\Model\Config\Backend\AllowedCurrencies</backend_model>
                 </field>
-
-                <field id="limit_by_ip" translate="label comment" type="select" sortOrder="170" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Display only for selected IPs</label>
-                    <comment><![CDATA[Show method only to Magento set IPs.]]></comment>
-                    <tooltip>Magento developer client restrictions.</tooltip>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <config_path>payment/buckaroo_magento2_payconiq/limit_by_ip</config_path>
-                </field>
             </group>
         </group>
     </group>
diff --git a/etc/adminhtml/system/payment_methods/paypal.xml b/etc/adminhtml/system/payment_methods/paypal.xml
index 7e0758ede..c4c7a5546 100644
--- a/etc/adminhtml/system/payment_methods/paypal.xml
+++ b/etc/adminhtml/system/payment_methods/paypal.xml
@@ -247,14 +247,6 @@
                     <source_model>Buckaroo\Magento2\Model\Config\Source\AllowedCurrencies::paypal</source_model>
                     <backend_model>Buckaroo\Magento2\Model\Config\Backend\AllowedCurrencies</backend_model>
                 </field>
-
-                <field id="limit_by_ip" translate="label comment" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Display only for selected IPs</label>
-                    <comment><![CDATA[Show method only to Magento set IPs.]]></comment>
-                    <tooltip>Magento developer client restrictions.</tooltip>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <config_path>payment/buckaroo_magento2_paypal/limit_by_ip</config_path>
-                </field> 
             </group>
         </group>
     </group>
diff --git a/etc/adminhtml/system/payment_methods/payperemail.xml b/etc/adminhtml/system/payment_methods/payperemail.xml
index 2187bb34b..67c4b1aba 100644
--- a/etc/adminhtml/system/payment_methods/payperemail.xml
+++ b/etc/adminhtml/system/payment_methods/payperemail.xml
@@ -283,14 +283,6 @@
                     <source_model>Buckaroo\Magento2\Model\Config\Source\AllowedCurrencies::payperemail</source_model>
                     <backend_model>Buckaroo\Magento2\Model\Config\Backend\AllowedCurrencies</backend_model>
                 </field>
-
-                <field id="limit_by_ip" translate="label comment" type="select" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Display only for selected IPs</label>
-                    <comment><![CDATA[Show method only to Magento set IPs.]]></comment>
-                    <tooltip>Magento developer client restrictions.</tooltip>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <config_path>payment/buckaroo_magento2_payperemail/limit_by_ip</config_path>
-                </field>
             </group>
         </group>
     </group>
diff --git a/etc/adminhtml/system/payment_methods/pospayment.xml b/etc/adminhtml/system/payment_methods/pospayment.xml
index ef6651e1c..80754bcc3 100644
--- a/etc/adminhtml/system/payment_methods/pospayment.xml
+++ b/etc/adminhtml/system/payment_methods/pospayment.xml
@@ -182,14 +182,6 @@
                     <source_model>Buckaroo\Magento2\Model\Config\Source\AllowedCurrencies::pospayment</source_model>
                     <backend_model>Buckaroo\Magento2\Model\Config\Backend\AllowedCurrencies</backend_model>
                 </field>
-
-                <field id="limit_by_ip" translate="label comment tooltip" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Display only for selected IPs</label>
-                    <comment><![CDATA[Show method only to Magento set IPs.]]></comment>
-                    <tooltip>Magento developer client restrictions.</tooltip>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <config_path>payment/buckaroo_magento2_pospayment/limit_by_ip</config_path>
-                </field>
             </group>
         </group>
     </group>
diff --git a/etc/adminhtml/system/payment_methods/sepa_direct_debit.xml b/etc/adminhtml/system/payment_methods/sepa_direct_debit.xml
index cd0c2946d..cada6c7d2 100644
--- a/etc/adminhtml/system/payment_methods/sepa_direct_debit.xml
+++ b/etc/adminhtml/system/payment_methods/sepa_direct_debit.xml
@@ -217,14 +217,6 @@
                     <source_model>Buckaroo\Magento2\Model\Config\Source\AllowedCurrencies::sepadirectdebit</source_model>
                     <backend_model>Buckaroo\Magento2\Model\Config\Backend\AllowedCurrencies</backend_model>
                 </field>
-
-                <field id="limit_by_ip" translate="label comment tooltip" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Display only for selected IPs</label>
-                    <comment><![CDATA[Show method only to Magento set IPs.]]></comment>
-                    <tooltip>Magento developer client restrictions.</tooltip>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <config_path>payment/buckaroo_magento2_sepadirectdebit/limit_by_ip</config_path>
-                </field>
             </group>
         </group>
     </group>
diff --git a/etc/adminhtml/system/payment_methods/sofort_banking.xml b/etc/adminhtml/system/payment_methods/sofort_banking.xml
index a6498cf8f..a5b8ded2a 100644
--- a/etc/adminhtml/system/payment_methods/sofort_banking.xml
+++ b/etc/adminhtml/system/payment_methods/sofort_banking.xml
@@ -167,14 +167,6 @@
                     <source_model>Buckaroo\Magento2\Model\Config\Source\AllowedCurrencies::sofortbanking</source_model>
                     <backend_model>Buckaroo\Magento2\Model\Config\Backend\AllowedCurrencies</backend_model>
                 </field>
-
-                <field id="limit_by_ip" translate="label comment tooltip" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Display only for selected IPs</label>
-                    <comment><![CDATA[Show method only to Magento set IPs.]]></comment>
-                    <tooltip>Magento developer client restrictions.</tooltip>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <config_path>payment/buckaroo_magento2_sofortbanking/limit_by_ip</config_path>
-                </field>
             </group>
         </group>
     </group>
diff --git a/etc/adminhtml/system/payment_methods/tinka.xml b/etc/adminhtml/system/payment_methods/tinka.xml
index 6a9ad1366..063e7bf8f 100644
--- a/etc/adminhtml/system/payment_methods/tinka.xml
+++ b/etc/adminhtml/system/payment_methods/tinka.xml
@@ -179,14 +179,6 @@
                     <backend_model>Buckaroo\Magento2\Model\Config\Backend\AllowedCurrencies</backend_model>
                 </field>
 
-                <field id="limit_by_ip" translate="label comment tooltip" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Display only for selected IPs</label>
-                    <comment><![CDATA[Show method only to Magento set IPs.]]></comment>
-                    <tooltip>Magento developer client restrictions.</tooltip>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <config_path>payment/buckaroo_magento2_tinka/limit_by_ip</config_path>
-                </field>
-
                 <group id="buckaroo_magento2_spam" translate="label" type="text" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Spam Prevention</label>
                     
diff --git a/etc/adminhtml/system/payment_methods/transfer.xml b/etc/adminhtml/system/payment_methods/transfer.xml
index e45aa6d35..e13f16d46 100644
--- a/etc/adminhtml/system/payment_methods/transfer.xml
+++ b/etc/adminhtml/system/payment_methods/transfer.xml
@@ -235,14 +235,6 @@
                     <source_model>Buckaroo\Magento2\Model\Config\Source\AllowedCurrencies::transfer</source_model>
                     <backend_model>Buckaroo\Magento2\Model\Config\Backend\AllowedCurrencies</backend_model>
                 </field>
-
-                <field id="limit_by_ip" translate="label comment tooltip" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Display only for selected IPs</label>
-                    <comment><![CDATA[Show method only to Magento set IPs.]]></comment>
-                    <tooltip>Magento developer client restrictions.</tooltip>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <config_path>payment/buckaroo_magento2_transfer/limit_by_ip</config_path>
-                </field>
             </group>
         </group>
     </group>
diff --git a/etc/adminhtml/system/payment_methods/trustly.xml b/etc/adminhtml/system/payment_methods/trustly.xml
index 5a8158a6b..f4a59af6f 100644
--- a/etc/adminhtml/system/payment_methods/trustly.xml
+++ b/etc/adminhtml/system/payment_methods/trustly.xml
@@ -166,14 +166,6 @@
                     <source_model>Buckaroo\Magento2\Model\Config\Source\AllowedCurrencies::trustly</source_model>
                     <backend_model>Buckaroo\Magento2\Model\Config\Backend\AllowedCurrencies</backend_model>
                 </field>
-
-                <field id="limit_by_ip" translate="label comment tooltip" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Display only for selected IPs</label>
-                    <comment><![CDATA[Show method only to Magento set IPs.]]></comment>
-                    <tooltip>Magento developer client restrictions.</tooltip>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <config_path>payment/buckaroo_magento2_trustly/limit_by_ip</config_path>
-                </field>
             </group>
         </group>
     </group>
diff --git a/etc/adminhtml/system/payment_methods/voucher.xml b/etc/adminhtml/system/payment_methods/voucher.xml
index 847a62a7a..0c84f6501 100644
--- a/etc/adminhtml/system/payment_methods/voucher.xml
+++ b/etc/adminhtml/system/payment_methods/voucher.xml
@@ -166,14 +166,6 @@
                     <source_model>Buckaroo\Magento2\Model\Config\Source\AllowedCurrencies::tinka</source_model>
                     <backend_model>Buckaroo\Magento2\Model\Config\Backend\AllowedCurrencies</backend_model>
                 </field>
-
-                <field id="limit_by_ip" translate="label comment tooltip" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Display only for selected IPs</label>
-                    <comment><![CDATA[Show method only to Magento set IPs.]]></comment>
-                    <tooltip>Magento developer client restrictions.</tooltip>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <config_path>payment/buckaroo_magento2_voucher/limit_by_ip</config_path>
-                </field>
             </group>
         </group>
     </group>
diff --git a/etc/adminhtml/system/payment_methods/wechatpay.xml b/etc/adminhtml/system/payment_methods/wechatpay.xml
index 814aa9b8e..66898bc05 100644
--- a/etc/adminhtml/system/payment_methods/wechatpay.xml
+++ b/etc/adminhtml/system/payment_methods/wechatpay.xml
@@ -167,14 +167,6 @@
                     <source_model>Buckaroo\Magento2\Model\Config\Source\AllowedCurrencies::wechatpay</source_model>
                     <backend_model>Buckaroo\Magento2\Model\Config\Backend\AllowedCurrencies</backend_model>
                 </field>
-
-                <field id="limit_by_ip" translate="label comment tooltip" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Display only for selected IPs</label>
-                    <comment><![CDATA[Show method only to Magento set IPs.]]></comment>
-                    <tooltip>Magento developer client restrictions.</tooltip>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <config_path>payment/buckaroo_magento2_wechatpay/limit_by_ip</config_path>
-                </field>
             </group>
         </group>
     </group>
diff --git a/etc/di.xml b/etc/di.xml
index cc9564659..e3778b5d7 100644
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -520,7 +520,6 @@
             <argument name="validators" xsi:type="array">
                 <item name="account_config" xsi:type="string">Buckaroo\Magento2\Gateway\Validator\ActiveAccountValidator</item>
                 <item name="area_code" xsi:type="string">Buckaroo\Magento2\Gateway\Validator\AreaCodeValidator</item>
-                <item name="based_on_ip" xsi:type="string">Buckaroo\Magento2\Gateway\Validator\AvailableBasedOnIPValidator</item>
                 <item name="based_on_amount" xsi:type="string">Buckaroo\Magento2\Gateway\Validator\AvailableBasedOnAmountValidator</item>
                 <item name="based_on_currency" xsi:type="string">Buckaroo\Magento2\Gateway\Validator\AvailableBasedOnCurrencyValidator</item>
                 <item name="based_on_customer_group" xsi:type="string">Buckaroo\Magento2\Gateway\Validator\AvailableBasedOnCustomerGroupValidator</item>
@@ -1051,14 +1050,6 @@
         </arguments>
     </type>
 
-    <type name="Magento\Payment\Model\Checks\SpecificationFactory">
-        <arguments>
-            <argument name="mapping" xsi:type="array">
-                <item name="ip" xsi:type="object">Buckaroo\Magento2\Model\Checks\CanUseForIP</item>
-            </argument>
-        </arguments>
-    </type>
-
 
     <!-- Payment Method: iDEAL -->
     <!-- iDEAL Payment Method Facade configuration -->
diff --git a/i18n/de_DE.csv b/i18n/de_DE.csv
index 9d3d3f38c..a0e937047 100644
--- a/i18n/de_DE.csv
+++ b/i18n/de_DE.csv
@@ -142,7 +142,6 @@
 "Redirect after failed payments.","Weiterleitung nach fehlgeschlagenen Zahlungen."
 "'Canceled' state on failed payment","'Status 'Storniert' bei fehlgeschlagener Zahlung"
 "Orders will stay open after failed payments.","Bestellungen bleiben nach fehlgeschlagenen Zahlungen offen."
-"Debug email","E-Mail debuggen"
 "Transaction data send as raw data.","Transaktionsdaten werden als Rohdaten gesendet."
 "Fee percentage mode","Gebührenprozentsatzmodus"
 "This setting only applies to percentage-based Buckaroo fees.<br />Please choose over which amount the fee percentage is calculated.","Diese Einstellung gilt nur für prozentuale Buckaroo-Gebühren.<br />Bitte wählen Sie aus, über welchen Betrag der Gebührenprozentsatz berechnet wird.."
@@ -197,8 +196,6 @@
 "Specific Countries","Bestimmte Länder"
 "Do not log debug information","Keine Debug-Informationen protokollieren"
 "Log to file","In Datei protokollieren"
-"Mail to debug email","E-Mail zum Debuggen von E-Mails"
-"Log to file and mail to debug email","In Datei protokollieren und E-Mail zum Debuggen von E-Mails senden"
 "Off","Aus"
 "Test","Testmodus"
 "Live","Live-Modus"
diff --git a/i18n/es_ES.csv b/i18n/es_ES.csv
index ac89812b7..cfc1c0019 100644
--- a/i18n/es_ES.csv
+++ b/i18n/es_ES.csv
@@ -144,7 +144,6 @@
 "Redirect after failed payments.","Redirigir después de los pagos fallidos."
 "'Canceled' state on failed payment","Estado 'cancelado' después de un pago fallido"
 "Orders will stay open after failed payments.","Los pedidos seguirán abiertos después de un pago fallido."
-"Debug email","Correo electrónico de corrección de errores"
 "Transaction data send as raw data.","Los datos de la transacción se han enviado como datos no procesados."
 "Fee percentage mode","Modo porcentaje de comisión"
 "This setting only applies to percentage-based Buckaroo fees.<br />Please choose over which amount the fee percentage is calculated.","Este ajuste solo se aplica a las comisiones de Buckaroo basadas en porcentajes.<br/>Elija sobre qué importe se calcula el porcentaje de comisión."
@@ -199,8 +198,6 @@
 "Specific Countries","Países específicos"
 "Do not log debug information","No registrar la información de corrección de errores"
 "Log to file","Registrar en archivo"
-"Mail to debug email","Correo para correo electrónico de corrección de errores"
-"Log to file and mail to debug email","Registrar en archivo y correo para correo electrónico de corrección de errores"
 "Off","Off"
 "Test","Prueba"
 "Live","Directo"
diff --git a/i18n/fr_FR.csv b/i18n/fr_FR.csv
index eacacccf9..4f9935323 100644
--- a/i18n/fr_FR.csv
+++ b/i18n/fr_FR.csv
@@ -142,7 +142,6 @@
 "Redirect after failed payments.","Rediriger après des paiements échoués."
 "'Canceled' state on failed payment","'Canceled' status bij mislukte betalingen"
 "Orders will stay open after failed payments.","État 'Annulé' en cas d'échec de paiement"
-"Debug email","E-mail de débogage"
 "Transaction data send as raw data.","Les données de transaction sont envoyées sous forme de données brutes."
 "Fee percentage mode","Mode de pourcentage de frais"
 "This setting only applies to percentage-based Buckaroo fees.<br />Please choose over which amount the fee percentage is calculated.","Ce paramètre s'applique uniquement aux frais Buckaroo basés sur un pourcentage.<br />Veuillez choisir sur quel montant le pourcentage de frais est calculé."
@@ -197,8 +196,6 @@
 "Specific Countries","Pays spécifiques"
 "Do not log debug information","Ne pas consigner les informations de débogage"
 "Log to file","Se connecter au fichier"
-"Mail to debug email","Courrier pour déboguer le courrier électronique"
-"Log to file and mail to debug email","Connectez-vous au fichier et envoyez-le pour déboguer le courrier électronique"
 "Off","À l'arrêt"
 "Test","Mode d'essai"
 "Live","Mode direct"
diff --git a/i18n/nl_BE.csv b/i18n/nl_BE.csv
index 8f1d84191..2ce0049ad 100644
--- a/i18n/nl_BE.csv
+++ b/i18n/nl_BE.csv
@@ -142,7 +142,6 @@
 "Redirect after failed payments.","Redirect URL na een afgeweze betaling."
 "'Canceled' state on failed payment","'Canceled' status bij mislukte betalingen"
 "Orders will stay open after failed payments.","Orders worden niet geannuleerd na een afgewezen betaling."
-"Debug email","Debug e-mail"
 "Transaction data send as raw data.","De e-mail bevat de onbewerkte data."
 "Fee percentage mode","Toeslag percentage modus"
 "This setting only applies to percentage-based Buckaroo fees.<br />Please choose over which amount the fee percentage is calculated.","Deze instelling is enkel van toepassing op percentage-gebaseerde toeslagen.<br />Kies s.v.p. over welk bedrag het toeslag percentage wordt berekend."
@@ -197,8 +196,6 @@
 "Specific Countries","Specifieke landen"
 "Do not log debug information","Log geen debug informatie"
 "Log to file","Log naar bestand"
-"Mail to debug email","Mail naar debug e-mail"
-"Log to file and mail to debug email","Log naar bestand en mail naar debug e-mail"
 "Off","Uitgeschakeld"
 "Test","Testmodus"
 "Live","Live-modus"
diff --git a/i18n/nl_NL.csv b/i18n/nl_NL.csv
index 426776f60..09e848c47 100644
--- a/i18n/nl_NL.csv
+++ b/i18n/nl_NL.csv
@@ -142,7 +142,6 @@
 "Redirect after failed payments.","Redirect URL na een afgeweze betaling."
 "'Canceled' state on failed payment","'Canceled' status bij mislukte betalingen"
 "Orders will stay open after failed payments.","Orders worden niet geannuleerd na een afgewezen betaling."
-"Debug email","Debug e-mail"
 "Transaction data send as raw data.","De e-mail bevat de onbewerkte data."
 "Fee percentage mode","Toeslag percentage modus"
 "This setting only applies to percentage-based Buckaroo fees.<br />Please choose over which amount the fee percentage is calculated.","Deze instelling is enkel van toepassing op percentage-gebaseerde toeslagen.<br />Kies s.v.p. over welk bedrag het toeslag percentage wordt berekend."
@@ -197,8 +196,6 @@
 "Specific Countries","Specifieke landen"
 "Do not log debug information","Log geen debug informatie"
 "Log to file","Log naar bestand"
-"Mail to debug email","Mail naar debug e-mail"
-"Log to file and mail to debug email","Log naar bestand en mail naar debug e-mail"
 "Off","Uitgeschakeld"
 "Test","Testmodus"
 "Live","Live-modus"