diff --git a/addons/payment/data/payment_method_data.xml b/addons/payment/data/payment_method_data.xml
index 6880733e08f..d0d13e7b13e 100644
--- a/addons/payment/data/payment_method_data.xml
+++ b/addons/payment/data/payment_method_data.xml
@@ -36,28 +36,6 @@
         <field name="support_refund">partial</field>
     </record>
 
-    <record id="payment_method_alipay_plus" model="payment.method">
-        <field name="name">Alipay+</field>
-        <field name="code">alipay_plus</field>
-        <field name="sequence">1000</field>
-        <field name="active">False</field>
-        <field name="image" type="base64" file="payment/static/img/alipay_plus.png"/>
-        <field name="support_tokenization">False</field>
-        <field name="support_express_checkout">False</field>
-        <field name="support_refund"></field>
-    </record>
-
-    <record id="payment_method_apple_pay" model="payment.method">
-        <field name="name">Apple Pay</field>
-        <field name="code">apple_pay</field>
-        <field name="sequence">1000</field>
-        <field name="active">False</field>
-        <field name="image" type="base64" file="payment/static/img/apple_pay.png"/>
-        <field name="support_tokenization">False</field>
-        <field name="support_express_checkout">False</field>
-        <field name="support_refund">partial</field>
-    </record>
-
     <record id="payment_method_bancontact" model="payment.method">
         <field name="name">Bancontact</field>
         <field name="code">bancontact</field>
@@ -79,17 +57,6 @@
         />
     </record>
 
-    <record id="payment_method_western_union" model="payment.method">
-        <field name="name">Western Union</field>
-        <field name="code">western_union</field>
-        <field name="sequence">1000</field>
-        <field name="active">False</field>
-        <field name="image" type="base64" file="payment/static/img/western_union.png"/>
-        <field name="support_tokenization">False</field>
-        <field name="support_express_checkout">False</field>
-        <field name="support_refund"></field>
-    </record>
-
     <record id="payment_method_sepa_direct_debit" model="payment.method">
         <field name="name">SEPA Direct Debit</field>
         <field name="code">sepa_direct_debit</field>
@@ -242,7 +209,6 @@
         <field name="supported_currency_ids"
                eval="[Command.set([
                          ref('base.EUR'),
-                         ref('base.PLN'),
                      ])]"
         />
     </record>
@@ -256,7 +222,6 @@
         <field name="support_tokenization">False</field>
         <field name="support_express_checkout">False</field>
         <field name="support_refund"></field>
-        <field name="support_refund">full_only</field>
         <field name="supported_country_ids"
                eval="[Command.set([
                          ref('base.ke'),
@@ -270,7 +235,7 @@
     </record>
 
     <record id="payment_method_ussd" model="payment.method">
-        <field name="name">USSD by Flutterwave</field>
+        <field name="name">USSD</field>
         <field name="code">ussd</field>
         <field name="sequence">1000</field>
         <field name="active">False</field>
@@ -278,19 +243,6 @@
         <field name="support_tokenization">False</field>
         <field name="support_express_checkout">False</field>
         <field name="support_refund"></field>
-        <field name="support_refund">full_only</field>
-    </record>
-
-    <record id="payment_method_nqr_by_flutterwave" model="payment.method">
-        <field name="name">QR payment by Flutterwave</field>
-        <field name="code">nqr_by_flutterwave</field>
-        <field name="sequence">1000</field>
-        <field name="active">False</field>
-        <field name="image" type="base64" file="payment/static/img/flutterwave.png"/>
-        <field name="support_tokenization">False</field>
-        <field name="support_express_checkout">False</field>
-        <field name="support_refund"></field>
-        <field name="support_refund">full_only</field>
     </record>
 
     <record id="payment_method_mada" model="payment.method">
@@ -465,27 +417,6 @@
         />
     </record>
 
-    <record id="payment_method_cetelem" model="payment.method">
-        <field name="name">Cetelem</field>
-        <field name="code">cetelem</field>
-        <field name="sequence">1000</field>
-        <field name="active">False</field>
-        <field name="image" type="base64" file="payment/static/img/cetelem.png"/>
-        <field name="support_tokenization">False</field>
-        <field name="support_express_checkout">False</field>
-        <field name="support_refund"></field>
-        <field name="supported_country_ids"
-               eval="[Command.set([
-                         ref('base.fr'),
-                     ])]"
-        />
-        <field name="supported_currency_ids"
-               eval="[Command.set([
-                         ref('base.EUR'),
-                     ])]"
-        />
-    </record>
-
     <record id="payment_method_alipay" model="payment.method">
         <field name="name">Alipay</field>
         <field name="code">alipay</field>
@@ -780,39 +711,6 @@
         />
     </record>
 
-    <record id="payment_method_sepa_transfer" model="payment.method">
-        <field name="name">SEPA Transfer</field>
-        <field name="code">sepa_transfer</field>
-        <field name="sequence">1000</field>
-        <field name="active">False</field>
-        <field name="image" type="base64" file="payment/static/img/sepa.png"/>
-        <field name="support_tokenization">False</field>
-        <field name="support_express_checkout">False</field>
-        <field name="support_refund">partial</field>
-    </record>
-
-    <record id="payment_method_google_pay" model="payment.method">
-        <field name="name">Google Pay</field>
-        <field name="code">google_pay</field>
-        <field name="sequence">1000</field>
-        <field name="active">False</field>
-        <field name="image" type="base64" file="payment/static/img/google_pay.png"/>
-        <field name="support_tokenization">False</field>
-        <field name="support_express_checkout">True</field>
-        <field name="support_refund">partial</field>
-    </record>
-
-    <record id="payment_method_link" model="payment.method">
-        <field name="name">Link</field>
-        <field name="code">link</field>
-        <field name="sequence">1000</field>
-        <field name="active">False</field>
-        <field name="image" type="base64" file="payment/static/img/link.png"/>
-        <field name="support_tokenization">False</field>
-        <field name="support_express_checkout">True</field>
-        <field name="support_refund">partial</field>
-    </record>
-
     <record id="payment_method_mobile_pay" model="payment.method">
         <field name="name">MobilePay</field>
         <field name="code">mobile_pay</field>
@@ -825,8 +723,6 @@
         <field name="supported_country_ids"
                eval="[Command.set([
                          ref('base.dk'),
-                         ref('base.no'),
-                         ref('base.se'),
                          ref('base.fi'),
                      ])]"
         />
@@ -926,15 +822,11 @@
         <field name="support_refund">partial</field>
         <field name="supported_country_ids"
                eval="[Command.set([
-                         ref('base.es'),
-                         ref('base.fr'),
-                         ref('base.it'),
                          ref('base.uk'),
                      ])]"
         />
         <field name="supported_currency_ids"
                eval="[Command.set([
-                         ref('base.EUR'),
                          ref('base.GBP'),
                      ])]"
         />
@@ -1685,13 +1577,12 @@
         <field name="supported_country_ids"
                eval="[Command.set([
                          ref('base.uk'),
-                         ref('base.de'),
+
                      ])]"
         />
         <field name="supported_currency_ids"
                eval="[Command.set([
                          ref('base.GBP'),
-                         ref('base.GBP'),
                      ])]"
         />
     </record>
@@ -2986,17 +2877,6 @@
         />
     </record>
 
-    <record id="payment_method_masterpass" model="payment.method">
-        <field name="name">Masterpass</field>
-        <field name="code">masterpass</field>
-        <field name="sequence">1000</field>
-        <field name="active">False</field>
-        <field name="image" type="base64" file="payment/static/img/mastercard.png"/>
-        <field name="support_tokenization">False</field>
-        <field name="support_express_checkout">False</field>
-        <field name="support_refund"></field>
-    </record>
-
     <record id="payment_method_octopus" model="payment.method">
         <field name="name">Octopus</field>
         <field name="code">octopus</field>
@@ -3029,27 +2909,6 @@
         <field name="support_refund"></field>
     </record>
 
-    <record id="payment_method_payconiq" model="payment.method">
-        <field name="name">Payconiq</field>
-        <field name="code">payconiq</field>
-        <field name="sequence">1000</field>
-        <field name="active">False</field>
-        <field name="image" type="base64" file="payment/static/img/payconiq.png"/>
-        <field name="support_tokenization">False</field>
-        <field name="support_express_checkout">False</field>
-        <field name="support_refund"></field>
-        <field name="supported_country_ids"
-               eval="[Command.set([
-                         ref('base.be'),
-                     ])]"
-        />
-        <field name="supported_currency_ids"
-               eval="[Command.set([
-                         ref('base.EUR'),
-                     ])]"
-        />
-    </record>
-
     <record id="payment_method_in3" model="payment.method">
         <field name="name">in3</field>
         <field name="code">in3</field>
@@ -3198,29 +3057,6 @@
         />
     </record>
 
-    <record id="payment_method_visa_electron" model="payment.method">
-        <field name="name">Visa Electron</field>
-        <field name="code">visa_electron</field>
-        <field name="sequence">1000</field>
-        <field name="active">False</field>
-        <field name="image" type="base64" file="payment/static/img/visa.png"/>
-        <field name="support_tokenization">False</field>
-        <field name="support_express_checkout">False</field>
-        <field name="support_refund"></field>
-        <field name="supported_currency_ids"
-               eval="[Command.set([
-                         ref('base.EUR'),
-                         ref('base.GBP'),
-                         ref('base.PLN'),
-                         ref('base.DKK'),
-                         ref('base.NOK'),
-                         ref('base.SEK'),
-                         ref('base.CHF'),
-                         ref('base.USD'),
-                     ])]"
-        />
-    </record>
-
     <record id="payment_method_vpay" model="payment.method">
         <field name="name">V PAY</field>
         <field name="code">vpay</field>
@@ -3244,9 +3080,9 @@
         />
     </record>
 
-    <record id="payment_method_mobile_money_ghana" model="payment.method">
-        <field name="name">Mobile money Ghana</field>
-        <field name="code">mobile_money_ghana</field>
+    <record id="payment_method_mobile_money" model="payment.method">
+        <field name="name">Mobile money</field>
+        <field name="code">mobile_money</field>
         <field name="sequence">1000</field>
         <field name="active">False</field>
         <field name="image" type="base64" file="payment/static/img/mtn-mobile-money.png"/>
@@ -3256,98 +3092,22 @@
         <field name="supported_country_ids"
                eval="[Command.set([
                          ref('base.gh'),
-                     ])]"
-        />
-        <field name="supported_currency_ids"
-               eval="[Command.set([
-                         ref('base.GHS'),
-                     ])]"
-        />
-    </record>
-
-    <record id="payment_method_mobile_money_francophone_africa" model="payment.method">
-        <field name="name">Mobile money Francophone Africa</field>
-        <field name="code">mobile_money_francophone_africa</field>
-        <field name="sequence">1000</field>
-        <field name="active">False</field>
-        <field name="image" type="base64" file="payment/static/img/mtn-mobile-money.png"/>
-        <field name="support_tokenization">False</field>
-        <field name="support_express_checkout">False</field>
-        <field name="support_refund"></field>
-        <field name="supported_country_ids"
-               eval="[Command.set([
                          ref('base.cm'),
                          ref('base.ci'),
                          ref('base.ml'),
                          ref('base.sn'),
-                     ])]"
-        />
-        <field name="supported_currency_ids"
-               eval="[Command.set([
-                         ref('base.XAF'),
-                         ref('base.XOF'),
-                     ])]"
-        />
-    </record>
-
-    <record id="payment_method_mobile_money_uganda" model="payment.method">
-        <field name="name">Mobile money Uganda</field>
-        <field name="code">mobile_money_uganda</field>
-        <field name="sequence">1000</field>
-        <field name="active">False</field>
-        <field name="image" type="base64" file="payment/static/img/mtn-mobile-money.png"/>
-        <field name="support_tokenization">False</field>
-        <field name="support_express_checkout">False</field>
-        <field name="support_refund"></field>
-        <field name="supported_country_ids"
-               eval="[Command.set([
                          ref('base.ug'),
-                     ])]"
-        />
-        <field name="supported_currency_ids"
-               eval="[Command.set([
-                         ref('base.UGX'),
-                     ])]"
-        />
-    </record>
-
-    <record id="payment_method_mobile_money_rwanda" model="payment.method">
-        <field name="name">Mobile money Rwanda</field>
-        <field name="code">mobile_money_rwanda</field>
-        <field name="sequence">1000</field>
-        <field name="active">False</field>
-        <field name="image" type="base64" file="payment/static/img/mtn-mobile-money.png"/>
-        <field name="support_tokenization">False</field>
-        <field name="support_express_checkout">False</field>
-        <field name="support_refund"></field>
-        <field name="supported_country_ids"
-               eval="[Command.set([
                          ref('base.rw'),
-                     ])]"
-        />
-        <field name="supported_currency_ids"
-               eval="[Command.set([
-                         ref('base.RWF'),
-                     ])]"
-        />
-    </record>
-
-    <record id="payment_method_mobile_money_zambia" model="payment.method">
-        <field name="name">Mobile money Zambia</field>
-        <field name="code">mobile_money_zambia</field>
-        <field name="sequence">1000</field>
-        <field name="active">False</field>
-        <field name="image" type="base64" file="payment/static/img/mtn-mobile-money.png"/>
-        <field name="support_tokenization">False</field>
-        <field name="support_express_checkout">False</field>
-        <field name="support_refund"></field>
-        <field name="supported_country_ids"
-               eval="[Command.set([
                          ref('base.zm'),
                      ])]"
         />
         <field name="supported_currency_ids"
                eval="[Command.set([
+                         ref('base.GHS'),
+                         ref('base.XAF'),
+                         ref('base.XOF'),
+                         ref('base.UGX'),
+                         ref('base.RWF'),
                          ref('base.ZMW'),
                      ])]"
         />
@@ -3467,7 +3227,7 @@
         <field name="image" type="base64" file="payment/static/img/bank.png"/>
         <field name="support_tokenization">False</field>
         <field name="support_express_checkout">False</field>
-        <field name="support_refund">partial</field>
+        <field name="support_refund"></field>
         <field name="supported_currency_ids"
                eval="[Command.set([
                          ref('base.INR'),
@@ -3837,15 +3597,6 @@
         <field name="image" type="base64" file="payment/static/img/caixa.png"/>
     </record>
 
-    <record id="payment_method_ceconsund" model="payment.method">
-        <field name="name">Ceconsund</field>
-        <field name="code">ceconsund</field>
-        <field name="primary_payment_method_id" eval="ref('payment.payment_method_card')"/>
-        <field name="sequence">1000</field>
-        <field name="active">False</field>
-        <field name="image" type="base64" file="payment/static/img/cencosud.png"/>
-    </record>
-
     <record id="payment_method_cmr" model="payment.method">
         <field name="name">CMR</field>
         <field name="code">cmr</field>
diff --git a/addons/payment/data/payment_provider_data.xml b/addons/payment/data/payment_provider_data.xml
index b41b14a300b..2ccc62326c0 100644
--- a/addons/payment/data/payment_provider_data.xml
+++ b/addons/payment/data/payment_provider_data.xml
@@ -15,7 +15,6 @@
                          ref('payment.payment_method_alipay_hk'),
                          ref('payment.payment_method_alma'),
                          ref('payment.payment_method_amazon_pay'),
-                         ref('payment.payment_method_apple_pay'),
                          ref('payment.payment_method_bacs_direct_debit'),
                          ref('payment.payment_method_bancontact'),
                          ref('payment.payment_method_benefit'),
@@ -31,7 +30,6 @@
                          ref('payment.payment_method_fpx'),
                          ref('payment.payment_method_gcash'),
                          ref('payment.payment_method_giropay'),
-                         ref('payment.payment_method_google_pay'),
                          ref('payment.payment_method_gopay'),
                          ref('payment.payment_method_hipercard'),
                          ref('payment.payment_method_ideal'),
@@ -115,8 +113,6 @@
                          ref('payment.payment_method_pace'),
                          ref('payment.payment_method_shopback'),
                          ref('payment.payment_method_grabpay'),
-                         ref('payment.payment_method_apple_pay'),
-                         ref('payment.payment_method_google_pay'),
                          ref('payment.payment_method_samsung_pay'),
                          ref('payment.payment_method_hoolah'),
                          ref('payment.payment_method_boost'),
@@ -148,7 +144,6 @@
                          ref('payment.payment_method_tendopay'),
                          ref('payment.payment_method_alipay_hk'),
                          ref('payment.payment_method_bharatqr'),
-                         ref('payment.payment_method_masterpass'),
                          ref('payment.payment_method_momo'),
                          ref('payment.payment_method_octopus'),
                          ref('payment.payment_method_maya'),
@@ -191,12 +186,10 @@
                          ref('payment.payment_method_card'),
                          ref('payment.payment_method_paypal'),
                          ref('payment.payment_method_ideal'),
-                         ref('payment.payment_method_afterpay'),
+                         ref('payment.payment_method_afterpay_riverty'),
                          ref('payment.payment_method_sepa_direct_debit'),
                          ref('payment.payment_method_alipay'),
-                         ref('payment.payment_method_apple_pay'),
                          ref('payment.payment_method_wechat_pay'),
-                         ref('payment.payment_method_payconiq'),
                          ref('payment.payment_method_klarna'),
                          ref('payment.payment_method_trustly'),
                          ref('payment.payment_method_sofort'),
@@ -209,8 +202,6 @@
                          ref('payment.payment_method_p24'),
                          ref('payment.payment_method_poste_pay'),
                          ref('payment.payment_method_eps'),
-                         ref('payment.payment_method_sepa_transfer'),
-                         ref('payment.payment_method_visa_electron'),
                          ref('payment.payment_method_cartes_bancaires'),
                      ])]"
         />
@@ -234,17 +225,12 @@
                eval="[Command.set([
                          ref('payment.payment_method_card'),
                          ref('payment.payment_method_mpesa'),
-                         ref('payment.payment_method_mobile_money_ghana'),
-                         ref('payment.payment_method_mobile_money_francophone_africa'),
-                         ref('payment.payment_method_mobile_money_uganda'),
-                         ref('payment.payment_method_mobile_money_rwanda'),
-                         ref('payment.payment_method_mobile_money_zambia'),
+                         ref('payment.payment_method_mobile_money'),
                          ref('payment.payment_method_bank_transfer'),
                          ref('payment.payment_method_bank_account'),
                          ref('payment.payment_method_credit'),
                          ref('payment.payment_method_paypal'),
                          ref('payment.payment_method_ussd'),
-                         ref('payment.payment_method_nqr_by_flutterwave'),
                      ])]"
         />
     </record>
@@ -275,7 +261,6 @@
         <!-- https://www.mollie.com/en/payments -->
         <field name="payment_method_ids"
                eval="[Command.set([
-                         ref('payment.payment_method_apple_pay'),
                          ref('payment.payment_method_bancontact'),
                          ref('payment.payment_method_bank_transfer'),
                          ref('payment.payment_method_belfius'),
@@ -347,13 +332,11 @@
                          ref('payment.payment_method_giropay'),
                          ref('payment.payment_method_kbc_cbc'),
                          ref('payment.payment_method_paypal'),
-                         ref('payment.payment_method_apple_pay'),
                          ref('payment.payment_method_samsung_pay'),
                          ref('payment.payment_method_bancontact'),
                          ref('payment.payment_method_lyfpay'),
                          ref('payment.payment_method_lydia'),
                          ref('payment.payment_method_floa_bank'),
-                         ref('payment.payment_method_cetelem'),
                          ref('payment.payment_method_cofidis'),
                          ref('payment.payment_method_frafinance'),
                      ])]"
@@ -375,7 +358,6 @@
                          ref('payment.payment_method_affirm'),
                          ref('payment.payment_method_afterpay'),
                          ref('payment.payment_method_alipay'),
-                         ref('payment.payment_method_apple_pay'),
                          ref('payment.payment_method_bacs_direct_debit'),
                          ref('payment.payment_method_bancontact'),
                          ref('payment.payment_method_becs_direct_debit'),
@@ -387,14 +369,11 @@
                          ref('payment.payment_method_eps'),
                          ref('payment.payment_method_fpx'),
                          ref('payment.payment_method_giropay'),
-                         ref('payment.payment_method_google_pay'),
                          ref('payment.payment_method_grabpay'),
                          ref('payment.payment_method_ideal'),
                          ref('payment.payment_method_klarna'),
-                         ref('payment.payment_method_link'),
                          ref('payment.payment_method_mobile_pay'),
                          ref('payment.payment_method_multibanco'),
-                         ref('payment.payment_method_netbanking'),
                          ref('payment.payment_method_p24'),
                          ref('payment.payment_method_paynow'),
                          ref('payment.payment_method_paypal'),
@@ -402,7 +381,6 @@
                          ref('payment.payment_method_promptpay'),
                          ref('payment.payment_method_revolut_pay'),
                          ref('payment.payment_method_sepa_direct_debit'),
-                         ref('payment.payment_method_sepa_transfer'),
                          ref('payment.payment_method_sofort'),
                          ref('payment.payment_method_upi'),
                          ref('payment.payment_method_wechat_pay'),
diff --git a/addons/payment/static/img/alipay_plus.png b/addons/payment/static/img/alipay_plus.png
deleted file mode 100644
index 3fcca89456f..00000000000
Binary files a/addons/payment/static/img/alipay_plus.png and /dev/null differ
diff --git a/addons/payment/views/portal_templates.xml b/addons/payment/views/portal_templates.xml
index 31092047c05..d362763330a 100644
--- a/addons/payment/views/portal_templates.xml
+++ b/addons/payment/views/portal_templates.xml
@@ -331,11 +331,18 @@
             <t t-set="portal_client_category_enable" t-value="True"/>
         </xpath>
         <div id="portal_client_category" position="inside">
-            <t t-set="partner" t-value="request.env.user.partner_id"/>
-            <t t-set="providers_allowing_tokenization"
-               t-value="request.env['payment.provider'].sudo()._get_compatible_providers(request.env.company.id, partner.id, 0., force_tokenization=True, is_validation=True)"/>
-            <t t-set="existing_tokens" t-value="partner.payment_token_ids + partner.commercial_partner_id.sudo().payment_token_ids"/>
-            <t t-if="providers_allowing_tokenization or existing_tokens" t-call="portal.portal_docs_entry">
+            <t t-set="partner_sudo" t-value="request.env.user.partner_id"/>
+            <t t-set="providers_sudo"
+               t-value="request.env['payment.provider'].sudo()._get_compatible_providers(request.env.company.id, partner_sudo.id, 0., force_tokenization=True, is_validation=True)"/>
+            <t t-set="methods_allowing_tokenization"
+               t-value="request.env['payment.method'].sudo()._get_compatible_payment_methods(
+                            providers_sudo.ids,
+                            partner_sudo.id,
+                            force_tokenization=True,
+                        )"
+            />
+            <t t-set="existing_tokens" t-value="partner_sudo.payment_token_ids + partner_sudo.commercial_partner_id.payment_token_ids"/>
+            <t t-if="methods_allowing_tokenization or existing_tokens" t-call="portal.portal_docs_entry">
                 <t t-set="icon" t-value="'/payment/static/img/payment-methods.svg'"/>
                 <t t-set="title">Payment methods</t>
                 <t t-set="text">Manage your payment methods</t>
diff --git a/addons/payment_buckaroo/const.py b/addons/payment_buckaroo/const.py
index 4f0e939fc3f..6ae92f18bea 100644
--- a/addons/payment_buckaroo/const.py
+++ b/addons/payment_buckaroo/const.py
@@ -13,7 +13,6 @@ PAYMENT_METHODS_MAPPING = {
     'sepa_direct_debit': 'SepaDirectDebit',
     'sofort': 'sofortueberweisung',
     'tinka': 'Tinka',
-    'sepa_transfer': 'transfer',
     'trustly': 'Trustly',
     'wechat_pay': 'WeChatPay',
     'klarna': 'klarnakp',
diff --git a/addons/payment_ogone/data/payment_provider_data.xml b/addons/payment_ogone/data/payment_provider_data.xml
index 99e7de48279..78a73261c3c 100644
--- a/addons/payment_ogone/data/payment_provider_data.xml
+++ b/addons/payment_ogone/data/payment_provider_data.xml
@@ -15,7 +15,6 @@
                    ref('payment.payment_method_bizum'),
                    ref('payment.payment_method_klarna_paynow'),
                    ref('payment.payment_method_klarna_pay_over_time'),
-                   ref('payment.payment_method_masterpass'),
                    ref('payment.payment_method_paypal'),
                    ref('payment.payment_method_sofort'),
                    ref('payment.payment_method_twint'),