diff --git a/addons/account/models/res_config_settings.py b/addons/account/models/res_config_settings.py
index 00eb52b9..047baf0b 100644
--- a/addons/account/models/res_config_settings.py
+++ b/addons/account/models/res_config_settings.py
@@ -24,35 +24,18 @@ class ResConfigSettings(models.TransientModel):
         ('round_per_line', 'Round calculation of taxes per line'),
         ('round_globally', 'Round globally calculation of taxes '),
         ], related='company_id.tax_calculation_rounding_method', string='Tax calculation rounding method')
-    module_account_accountant = fields.Boolean(string='Accounting')
     group_analytic_accounting = fields.Boolean(string='Analytic Accounting',
         implied_group='analytic.group_analytic_accounting')
     group_warning_account = fields.Boolean(string="Warnings", implied_group='account.group_warning_account')
     group_cash_rounding = fields.Boolean(string="Cash Rounding", implied_group='account.group_cash_rounding')
     module_account_asset = fields.Boolean(string='Assets Management')
-    module_account_deferred_revenue = fields.Boolean(string="Revenue Recognition")
     module_account_budget = fields.Boolean(string='Budget Management')
     module_account_payment = fields.Boolean(string='Online Payment')
-    module_account_reports = fields.Boolean("Dynamic Reports")
-    module_account_reports_followup = fields.Boolean("Enable payment followup management")
     default_sale_tax_id = fields.Many2one('account.tax', string="Default Sale Tax",
         company_dependent=True, oldname="default_sale_tax")
     default_purchase_tax_id = fields.Many2one('account.tax', string="Default Purchase Tax",
         company_dependent=True, oldname="default_purchase_tax")
-    module_l10n_us_check_printing = fields.Boolean("Allow check printing and deposits")
-    module_account_batch_deposit = fields.Boolean(string='Use batch deposit',
-        help='This allows you to group received checks before you deposit them to the bank.\n'
-             '-This installs the module account_batch_deposit.')
-    module_account_sepa = fields.Boolean(string='Use SEPA payments')
-    module_account_sepa_direct_debit = fields.Boolean(string='Use SEPA Direct Debit')
     module_account_plaid = fields.Boolean(string="Plaid Connector")
-    module_account_yodlee = fields.Boolean("Bank Interface - Sync your bank feeds automatically")
-    module_account_bank_statement_import_qif = fields.Boolean("Import .qif files")
-    module_account_bank_statement_import_ofx = fields.Boolean("Import in .ofx format")
-    module_account_bank_statement_import_csv = fields.Boolean("Import in .csv format")
-    module_account_bank_statement_import_camt = fields.Boolean("Import in CAMT.053 format")
-    module_currency_rate_live = fields.Boolean(string="Allow Currency Rate Live")
-    module_print_docsaway = fields.Boolean(string="Docsaway")
     module_product_margin = fields.Boolean(string="Allow Product Margin")
     module_l10n_eu_service = fields.Boolean(string="EU Digital Goods VAT")
     module_account_taxcloud = fields.Boolean(string="Account TaxCloud")
@@ -105,11 +88,6 @@ class ResConfigSettings(models.TransientModel):
         self.chart_template_id = self.company_id.chart_template_id or False
         self.has_accounting_entries = self.env['wizard.multi.charts.accounts'].existing_accounting(self.company_id)
 
-    @api.onchange('group_analytic_accounting')
-    def onchange_analytic_accounting(self):
-        if self.group_analytic_accounting:
-            self.module_account_accountant = True
-
     @api.onchange('module_account_budget')
     def onchange_module_account_budget(self):
         if self.module_account_budget:
diff --git a/addons/account/views/res_config_settings_views.xml b/addons/account/views/res_config_settings_views.xml
index b9c65fc0..eb06b5c4 100644
--- a/addons/account/views/res_config_settings_views.xml
+++ b/addons/account/views/res_config_settings_views.xml
@@ -40,23 +40,7 @@
                                         </div>
                                     </div>
                                 </div>
-                            </div>
-                        <t groups="account.group_account_user">
-                            <h2>Setup</h2>
-                            <div class="row mt16 o_settings_container">
-                                <div class="col-xs-12 col-md-6 o_setting_box">
-                                    <div class="o_setting_left_pane">
-                                        <field name="account_hide_setup_bar" widget="upgrade_boolean"/>
-                                    </div>
-                                    <div class="o_setting_right_pane">
-                                        <label string='Hide Setup Bar'/>
-                                        <div class="text-muted">
-                                            Deactivate setup bar on the dashboard
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </t>
+                            </div>>
                         <h2>Taxes</h2>
                         <div class="row mt16 o_settings_container">
                             <div class="col-xs-12 col-md-6 o_setting_box" title="These taxes are set in any new product created.">
@@ -171,17 +155,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="col-xs-12 col-md-6 o_setting_box" attrs="{'invisible': [('group_multi_currency', '=', False)]}">
-                                <div class="o_setting_left_pane">
-                                    <field name="module_currency_rate_live" widget="upgrade_boolean"/>
-                                </div>
-                                <div class="o_setting_right_pane">
-                                    <label string="Automatic Currency Rates"/>
-                                    <div class="text-muted" id="update_currency_live">
-                                        Update exchange rates automatically
-                                    </div>
-                                </div>
-                            </div>
                         </div>
                         <t groups="account.group_account_user">
                             <h2>Fiscal Periods</h2>
@@ -191,22 +164,6 @@
                         </t>
                         <h2>Customer Payments</h2>
                         <div class="row mt16 o_settings_container">
-                            <div class="col-xs-12 col-md-6 o_setting_box" id="account_followup" title="This feature is useful if you issue a high amounts of invoices.">
-                                <div class="o_setting_left_pane">
-                                    <field name="module_account_reports_followup" widget="upgrade_boolean"/>
-                                </div>
-                                <div class="o_setting_right_pane">
-                                    <label string="Follow-up Levels"/>
-                                    <div class="text-muted">
-                                        Use follow-up levels and schedule actions
-                                    </div>
-                                    <div id="account_reports_followup" class="content-group" attrs="{'invisible': [('module_account_reports_followup', '=', False)]}">
-                                        <div class="text-warning mt16 mb4">
-                                            Save this page and come back here to set up the feature.
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
                             <div class="col-xs-12 col-md-6 o_setting_box">
                                 <div class="o_setting_left_pane">
                                     <field name="module_account_payment"/>
@@ -218,134 +175,7 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="col-xs-12 col-md-6 o_setting_box" groups="account.group_account_user">
-                                <div class="o_setting_left_pane">
-                                    <field name="module_account_batch_deposit" widget="upgrade_boolean"/>
-                                </div>
-                                <div class="o_setting_right_pane">
-                                    <label string="Batch Deposits"/>
-                                    <div class="text-muted">
-                                        Group received checks before depositing them to the bank
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-xs-12 col-md-6 o_setting_box" title="If you check this box, you will be able to collect payments using SEPA Direct Debit mandates.">
-                                <div class="o_setting_left_pane">
-                                    <field name="module_account_sepa_direct_debit" class="oe_inline" widget="upgrade_boolean"/>
-                                </div>
-                                <div class="o_setting_right_pane" name="sepa_direct_debit_right_pane">
-                                    <label string="SEPA Direct Debit (SDD)" for="module_account_sepa"/>
-                                    <span class="fa fa-lg fa-building-o" title="Values set here are company-specific." groups="base.group_multi_company"/>
-                                    <div class="text-muted">
-                                        Collect customer payments in one-click using Euro SEPA Service.
-                                    </div>
-                                </div>
-                            </div>
                         </div>
-
-                        <h2>Supplier Payments</h2>
-                        <div class="row mt16 o_settings_container">
-                            <div class="col-xs-12 col-md-6 o_setting_box" groups="account.group_account_user">
-                                <div class="o_setting_left_pane">
-                                    <field name="module_l10n_us_check_printing" widget="upgrade_boolean"/>
-                                </div>
-                                <div class="o_setting_right_pane">
-                                    <label string="Checks" for="module_l10n_us_check_printing"/>
-                                    <span class="fa fa-lg fa-building-o" title="Values set here are company-specific." groups="base.group_multi_company"/>
-                                    <div class="text-muted" id="print_bills_payment">
-                                        Print checks to pay your vendors
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-xs-12 col-md-6 o_setting_box" title="If you check this box, you will be able to register your payment using SEPA.">
-                                <div class="o_setting_left_pane">
-                                    <field name="module_account_sepa" widget="upgrade_boolean"/>
-                                </div>
-                                <div class="o_setting_right_pane" name="sepa_right_pane">
-                                    <label string="SEPA Credit Transfer (SCT)" for="module_account_sepa"/>
-                                    <span class="fa fa-lg fa-building-o" title="Values set here are company-specific." groups="base.group_multi_company"/>
-                                    <div class="text-muted">
-                                        Pay your bills in one-click using Euro SEPA service
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-                        <t groups="account.group_account_user">
-                            <h2>Fiscal Periods</h2>
-                            <div class="row mt16 o_settings_container" id="accounting_reports">
-                                <div class="col-xs-12 col-md-6 o_setting_box" id="fiscalyear" invisible="1"/>
-                                <div class="col-xs-12 col-md-6 o_setting_box" id="dynamic_report" invisible="1" groups="account.group_account_user">
-                                    <div class="o_setting_left_pane">
-                                        <field name="module_account_reports" widget="upgrade_boolean"/>
-                                    </div>
-                                    <div class="o_setting_right_pane">
-                                        <label for="module_account_reports"/>
-                                        <div class="text-muted" id="account_reports">
-                                            Navigate easily through reports and see what is behind the numbers
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <h2>Bank &amp; Cash</h2>
-                            <div class="row mt16 o_settings_container" id="bank_cash">
-                                <div class="col-xs-12 col-md-6 o_setting_box" id="account_yodlee" title="Get your bank statements automatically imported every 4 hours, or in one-click, using Yodlee and Plaid services. Once installed, set “Bank Feeds” to “Bank Synchronization” in bank account settings. Then, click “Configure” on the online account to enter your bank credentials.">
-                                    <div class="o_setting_left_pane">
-                                        <field name="module_account_yodlee" widget="upgrade_boolean"/>
-                                    </div>
-                                    <div class="o_setting_right_pane">
-                                        <label string="Automatic Import"/>
-                                        <div class="text-muted">
-                                            Import your bank statements automatically
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-xs-12 col-md-6 o_setting_box" title="Once installed, set 'Bank Feeds' to 'File Import' in bank account settings.This adds a button to import from the Accounting dashboard.">
-                                    <div class="o_setting_left_pane">
-                                        <field name="module_account_bank_statement_import_csv" widget="upgrade_boolean"/>
-                                    </div>
-                                    <div class="o_setting_right_pane">
-                                        <label string="CSV Import"/>
-                                        <div class="text-muted">
-                                            Import your bank statements in CSV
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-xs-12 col-md-6 o_setting_box" title="Once installed, set 'Bank Feeds' to 'File Import' in bank account settings.This adds a button to import from the Accounting dashboard.">
-                                    <div class="o_setting_left_pane">
-                                        <field name="module_account_bank_statement_import_qif" widget="upgrade_boolean"/>
-                                    </div>
-                                    <div class="o_setting_right_pane">
-                                        <label string="QIF Import"/>
-                                        <div class="text-muted">
-                                            Import your bank statements in QIF
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-xs-12 col-md-6 o_setting_box" title="Once installed, set 'Bank Feeds' to 'File Import' in bank account settings.This adds a button to import from the Accounting dashboard.">
-                                    <div class="o_setting_left_pane">
-                                        <field name="module_account_bank_statement_import_ofx" widget="upgrade_boolean"/>
-                                    </div>
-                                    <div class="o_setting_right_pane">
-                                        <label string="OFX Import"/>
-                                        <div class="text-muted">
-                                            Import your bank statements in OFX
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-xs-12 col-md-6 o_setting_box" title="Once installed, set 'Bank Feeds' to 'File Import' in bank account settings.This adds a button to import from the Accounting dashboard.">
-                                    <div class="o_setting_left_pane">
-                                        <field name="module_account_bank_statement_import_camt" widget="upgrade_boolean"/>
-                                    </div>
-                                    <div class="o_setting_right_pane">
-                                        <label string="CAMT Import"/>
-                                        <div class="text-muted">
-                                            Import your bank statements in CAMT.053
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </t>
                         <h2>Analytics</h2>
                         <div class="row mt16 o_settings_container" id="analytic">
                             <div class="col-xs-12 col-md-6 o_setting_box" title="Allows you to use the analytic accounting." groups="account.group_account_user">
@@ -408,17 +238,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="col-xs-12 col-md-6 o_setting_box">
-                                <div class="o_setting_left_pane">
-                                    <field name="module_print_docsaway" widget="upgrade_boolean"/>
-                                </div>
-                                <div class="o_setting_right_pane">
-                                    <label for="module_print_docsaway"/>
-                                    <div class="text-muted">
-                                        Mail your invoices in one-click using <a target="_blank" href="https://www.docsaway.com/">Docsaway</a>
-                                    </div>
-                                </div>
-                            </div>
                             <div class="col-xs-12 col-md-6 o_setting_box">
                                 <div class="o_setting_left_pane">
                                     <field name="group_cash_rounding"/>
@@ -454,22 +273,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="col-xs-12 col-md-6 o_setting_box" title="This allows you to manage the revenue recognition on selling products. It keeps track of the installments occurred on those revenue recognitions, and creates account moves for those installment lines.">
-                                <div class="o_setting_left_pane">
-                                    <field name="module_account_deferred_revenue" widget="upgrade_boolean"/>
-                                </div>
-                                <div class="o_setting_right_pane">
-                                    <label for="module_account_deferred_revenue" string="Deferred Revenues Management"/>
-                                    <div class="text-muted">
-                                        Automate deferred revenues entries for multi-year contracts
-                                    </div>
-                                    <div id="msg_automate_deferred_revenues" class="content-group" attrs="{'invisible': [('module_account_deferred_revenue', '=', False)]}">
-                                        <div class="text-warning mt16 mb4">
-                                            Save this page and come back here to set up the feature.
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
                         </div>
                     </div>
                 </xpath>
diff --git a/addons/base_setup/models/res_config_settings.py b/addons/base_setup/models/res_config_settings.py
index f68eaf1a..e9ac1d26 100644
--- a/addons/base_setup/models/res_config_settings.py
+++ b/addons/base_setup/models/res_config_settings.py
@@ -22,7 +22,6 @@ class ResConfigSettings(models.TransientModel):
     module_auth_oauth = fields.Boolean("Use external authentication providers (OAuth)")
     module_auth_ldap = fields.Boolean("LDAP Authentication")
     module_base_gengo = fields.Boolean("Translate Your Website with Gengo")
-    module_inter_company_rules = fields.Boolean("Manage Inter Company")
     module_pad = fields.Boolean("Collaborative Pads")
     module_voip = fields.Boolean("Asterisk (VoIP)")
     company_share_partner = fields.Boolean(string='Share partners to all companies',
diff --git a/addons/base_setup/views/res_config_settings_views.xml b/addons/base_setup/views/res_config_settings_views.xml
index e8527b64..c1c755e9 100644
--- a/addons/base_setup/views/res_config_settings_views.xml
+++ b/addons/base_setup/views/res_config_settings_views.xml
@@ -102,20 +102,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="col-xs-12 col-md-6 o_setting_box" title="Configure company rules to automatically create SO/PO when one of your company sells/buys to another of your company." attrs="{'invisible': [('group_multi_company', '=', False)]}" id="inter_company">
-                                <div class="o_setting_left_pane">
-                                    <field name="module_inter_company_rules" widget="upgrade_boolean"/>
-                                </div>
-                                <div class="o_setting_right_pane">
-                                    <label string="Inter-Company Transactions" for="module_inter_company_rules"/>
-                                    <div class="text-muted">
-                                        Automate inter-company transactions
-                                    </div>
-                                    <div class="content-group" attrs="{'invisible': [('module_inter_company_rules','=',False)]}" id="inter_companies_rules">
-                                        <div class="mt16 text-warning"><strong>Save</strong> this page and come back here to set up the feature.</div>
-                                    </div>
-                                </div>
-                            </div>
                         </div>
                         <h2>Integrations</h2>
                         <div class="row mt16 o_settings_container" name="integration">
diff --git a/addons/crm/models/res_config_settings.py b/addons/crm/models/res_config_settings.py
index 8a74885a..cd9d7105 100644
--- a/addons/crm/models/res_config_settings.py
+++ b/addons/crm/models/res_config_settings.py
@@ -11,7 +11,6 @@ class ResConfigSettings(models.TransientModel):
     generate_lead_from_alias = fields.Boolean('Manual Assignation of Emails')
     group_use_lead = fields.Boolean(string="Leads", implied_group='crm.group_use_lead')
     module_crm_phone_validation = fields.Boolean("Phone Validation")
-    module_web_clearbit = fields.Boolean("Customer Autocomplete")
 
     def _find_default_lead_alias_id(self):
         alias = self.env.ref('crm.mail_alias_lead_info', False)
diff --git a/addons/crm/views/res_config_settings_views.xml b/addons/crm/views/res_config_settings_views.xml
index 1d074db9..15c55fc7 100644
--- a/addons/crm/views/res_config_settings_views.xml
+++ b/addons/crm/views/res_config_settings_views.xml
@@ -65,17 +65,6 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="col-xs-12 col-md-6 o_setting_box" title="When populating your address book, Flectra relies on Clearbit’s API to provide you with a list of matching contacts or companies.When selecting one item, the partner name, logo and website get automatically set.">
-                            <div class="o_setting_left_pane">
-                                <field name="module_web_clearbit" widget="upgrade_boolean"/>
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <label for="module_web_clearbit"/>
-                                <div class="text-muted">
-                                    Look up company information (name, logo, etc.)
-                                </div>
-                            </div>
-                        </div>
                     </div>
                 </div>
             </xpath>
diff --git a/addons/event/models/event_config_settings.py b/addons/event/models/event_config_settings.py
index 5216709d..92061248 100644
--- a/addons/event/models/event_config_settings.py
+++ b/addons/event/models/event_config_settings.py
@@ -8,5 +8,4 @@ class ResConfigSettings(models.TransientModel):
     module_event_sale = fields.Boolean("Tickets")
     module_website_event_track = fields.Boolean("Tracks and Agenda")
     module_website_event_questions = fields.Boolean("Registration Survey")
-    module_event_barcode = fields.Boolean("Barcode")
     module_website_event_sale = fields.Boolean("Online Ticketing")
diff --git a/addons/event/views/res_config_settings_views.xml b/addons/event/views/res_config_settings_views.xml
index 7e849999..4268a0df 100644
--- a/addons/event/views/res_config_settings_views.xml
+++ b/addons/event/views/res_config_settings_views.xml
@@ -48,20 +48,6 @@
                                 </div>
                             </div>
                         </div>
-                        <h2>Attendance</h2>
-                        <div class="row mt16 o_settings_container">
-                            <div class="col-xs-12 col-md-6 o_setting_box">
-                                <div class="o_setting_left_pane">
-                                    <field name="module_event_barcode" widget="upgrade_boolean"/>
-                                </div>
-                                <div class="o_setting_right_pane">
-                                    <label for="module_event_barcode"/>
-                                    <div class="text-muted">
-                                        Scan badges to confirm attendances
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
                     </div>
                 </xpath>
             </field>
diff --git a/addons/hr_payroll/models/res_config_settings.py b/addons/hr_payroll/models/res_config_settings.py
index 703e9c86..645a9037 100644
--- a/addons/hr_payroll/models/res_config_settings.py
+++ b/addons/hr_payroll/models/res_config_settings.py
@@ -7,7 +7,6 @@ from flectra import fields, models
 class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
-    module_account_accountant = fields.Boolean(string='Account Accountant')
     module_l10n_fr_hr_payroll = fields.Boolean(string='French Payroll')
     module_l10n_be_hr_payroll = fields.Boolean(string='Belgium Payroll')
     module_l10n_in_hr_payroll = fields.Boolean(string='Indian Payroll')
diff --git a/addons/hr_payroll/views/res_config_settings_views.xml b/addons/hr_payroll/views/res_config_settings_views.xml
index 049f5777..31f0367d 100644
--- a/addons/hr_payroll/views/res_config_settings_views.xml
+++ b/addons/hr_payroll/views/res_config_settings_views.xml
@@ -33,20 +33,6 @@
                             </div>
                         </div>
                     </div>
-                    <h2>Accounting</h2>
-                    <div class="row mt16 o_settings_container" id="hr_payroll_accountant">
-                        <div class="col-md-6 col-xs-12 o_setting_box">
-                            <div class="o_setting_left_pane">
-                                <field name="module_account_accountant" widget="upgrade_boolean"/>
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <label for="module_account_accountant" string="Payroll Entries"/>
-                                <div class="text-muted">
-                                    Post payroll slips in accounting
-                                </div>
-                            </div>
-                        </div>
-                    </div>
                 </div>
                 </xpath>
             </field>
diff --git a/addons/hr_timesheet/models/res_config_settings.py b/addons/hr_timesheet/models/res_config_settings.py
index d105384f..cd7940a0 100644
--- a/addons/hr_timesheet/models/res_config_settings.py
+++ b/addons/hr_timesheet/models/res_config_settings.py
@@ -7,6 +7,5 @@ from flectra import fields, models
 class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
-    module_project_timesheet_synchro = fields.Boolean("Awesome Timesheet")
     module_sale_timesheet = fields.Boolean("Time Billing")
     module_project_timesheet_holidays = fields.Boolean("Leaves")
diff --git a/addons/hr_timesheet/views/res_config_settings_views.xml b/addons/hr_timesheet/views/res_config_settings_views.xml
index 621b5b7c..3b66e0d6 100644
--- a/addons/hr_timesheet/views/res_config_settings_views.xml
+++ b/addons/hr_timesheet/views/res_config_settings_views.xml
@@ -11,39 +11,6 @@
         <field name="arch" type="xml">
             <xpath expr="//div[hasclass('settings')]" position="inside">
                 <div class="app_settings_block" data-string="Timesheets" string="Timesheets" data-key="hr_timesheet" groups="hr_timesheet.group_timesheet_manager">
-                    <h2>Timesheet Apps</h2>
-                    <div class="row mt16 o_settings_container">
-                        <div class="col-xs-12 col-md-6 o_setting_box">
-                            <div class="o_setting_left_pane">
-                                <field name="module_project_timesheet_synchro" widget="upgrade_boolean"/>
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <label for="module_project_timesheet_synchro"/>
-                                <div class="text-muted">
-                                    Synchronize time spent with web/mobile app
-                                </div>
-                                <div class="content-group">
-                                    <div class="row mt16 oe_center">
-                                        <div class="col-md-4">
-                                            <a href="http://www.flectra.com/page/timesheet?platform=chrome">
-                                                <img alt="Google Chrome Store" class="img img-responsive" src="project/static/src/img/chrome_store.png"/>
-                                            </a>
-                                        </div>
-                                        <div class="col-md-4">
-                                            <a href="http://www.flectra.com/page/timesheet?platform=ios">
-                                                <img alt="Apple App Store" class="img img-responsive" src="project/static/src/img/app_store.png"/>
-                                            </a>
-                                        </div>
-                                        <div class="col-md-4">
-                                            <a href="http://www.flectra.com/page/timesheet?platform=android">
-                                                <img alt="Google Play Store" class="img img-responsive" src="project/static/src/img/play_store.png"/>
-                                            </a>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
                     <h2>Billing</h2>
                     <div name="timesheet_billing" class="row mt16 o_settings_container" title="Sell services (e.g. project, maintenance), record time spent using Timesheets app and invoice them based on a fixed price (ordered quantity) or on the time spent (delivered quantity)">
                         <div class="col-xs-12 col-md-6 o_setting_box">
diff --git a/addons/l10n_mx/__manifest__.py b/addons/l10n_mx/__manifest__.py
index b9e2f44c..e28cfe28 100644
--- a/addons/l10n_mx/__manifest__.py
+++ b/addons/l10n_mx/__manifest__.py
@@ -40,6 +40,5 @@ With this module you will have:
         "data/account_tax_data.xml",
         "data/fiscal_position_data.xml",
         "data/account_chart_template_data.yml",
-        "views/res_config_settings_views.xml",
     ],
 }
diff --git a/addons/l10n_mx/models/__init__.py b/addons/l10n_mx/models/__init__.py
index 2e1acea6..aac007e7 100644
--- a/addons/l10n_mx/models/__init__.py
+++ b/addons/l10n_mx/models/__init__.py
@@ -3,5 +3,4 @@
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
 
 from . import account
-from . import res_config_settings
 from . import chart_template
diff --git a/addons/l10n_mx/models/res_config_settings.py b/addons/l10n_mx/models/res_config_settings.py
deleted file mode 100644
index 8a4bf0f4..00000000
--- a/addons/l10n_mx/models/res_config_settings.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from flectra import fields, models
-
-
-class ResConfigSettings(models.TransientModel):
-    _inherit = 'res.config.settings'
-
-    module_l10n_mx_edi = fields.Boolean('Mexican Electronic Invoicing')
diff --git a/addons/l10n_mx/views/res_config_settings_views.xml b/addons/l10n_mx/views/res_config_settings_views.xml
deleted file mode 100644
index 6ebab648..00000000
--- a/addons/l10n_mx/views/res_config_settings_views.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<flectra>
-    <record id="res_config_settings_view_form" model="ir.ui.view">
-        <field name="name">res.config.settings.view.form.inherit.l10n.mx</field>
-        <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="account.res_config_settings_view_form"/>
-        <field name="arch" type="xml">
-            <xpath expr=".//div[@id='invoicing_settings']" position="inside">
-                <div class="col-xs-12 col-md-6 o_setting_box">
-                    <div class="o_setting_left_pane">
-                        <field name="module_l10n_mx_edi" class="oe_inline" widget="upgrade_boolean"/>
-                    </div>
-                    <div class="o_setting_right_pane">
-                        <label for="module_l10n_mx_edi"/>
-                        <div class="text-muted">
-                            Create your electronic invoices automatically (CFDI format)
-                        </div>
-                    </div>
-                </div>
-            </xpath>
-        </field>
-    </record>
-</flectra>
diff --git a/addons/mrp/models/res_config_settings.py b/addons/mrp/models/res_config_settings.py
index d9851e70..789080b1 100644
--- a/addons/mrp/models/res_config_settings.py
+++ b/addons/mrp/models/res_config_settings.py
@@ -10,13 +10,9 @@ class ResConfigSettings(models.TransientModel):
     manufacturing_lead = fields.Float(related='company_id.manufacturing_lead', string="Manufacturing Lead Time")
     use_manufacturing_lead = fields.Boolean(string="Default Manufacturing Lead Time", oldname='default_use_manufacturing_lead')
     module_mrp_byproduct = fields.Boolean("By-Products")
-    module_mrp_mps = fields.Boolean("Master Production Schedule")
     module_mrp_plm = fields.Boolean("Product Lifecycle Management (PLM)")
-    module_mrp_maintenance = fields.Boolean("Maintenance")
     module_quality_mrp = fields.Boolean("Quality")
     module_mrp_repair = fields.Boolean("Repair")
-    group_mrp_routings = fields.Boolean("Work Orders & Quality",
-        implied_group='mrp.group_mrp_routings')
 
     @api.model
     def get_values(self):
@@ -35,7 +31,3 @@ class ResConfigSettings(models.TransientModel):
     def _onchange_use_manufacturing_lead(self):
         if not self.use_manufacturing_lead:
             self.manufacturing_lead = 0.0
-
-    @api.onchange('group_mrp_routings')
-    def _onchange_group_mrp_routings(self):
-        self.module_quality_mrp = self.group_mrp_routings
diff --git a/addons/mrp/security/mrp_security.xml b/addons/mrp/security/mrp_security.xml
index 8610651d..ee0250d9 100644
--- a/addons/mrp/security/mrp_security.xml
+++ b/addons/mrp/security/mrp_security.xml
@@ -13,13 +13,6 @@
         <field name="implied_ids" eval="[(4, ref('group_mrp_user'))]"/>
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
-
-
-    <record id="group_mrp_routings" model="res.groups">
-        <field name="name">Manage Work Order Operations</field>
-        <field name="category_id" ref="base.module_category_hidden"/>
-    </record>
-
 </data>
 <data noupdate="1">
     <record id="base.default_user" model="res.users">
diff --git a/addons/mrp/views/mrp_bom_views.xml b/addons/mrp/views/mrp_bom_views.xml
index 5a2389d2..42dea04c 100644
--- a/addons/mrp/views/mrp_bom_views.xml
+++ b/addons/mrp/views/mrp_bom_views.xml
@@ -24,7 +24,7 @@
                                 <field name="product_qty"/>
                                 <field name="product_uom_id" options="{'no_open':True,'no_create':True}" groups="product.group_uom"/>
                             </div>
-                            <field name="routing_id" groups="mrp.group_mrp_routings"/>
+                            <field name="routing_id"/>
                         </group>
                         <group>
                             <field name="code"/>
@@ -59,7 +59,7 @@
                                     <field name="product_qty"/>
                                     <field name="product_uom_id" options="{'no_open':True,'no_create':True}" groups="product.group_uom"/>
                                     <field name="attribute_value_ids" widget="many2many_tags" options="{'no_create': True}" domain="[('product_ids.product_tmpl_id', '=', parent.product_tmpl_id)]" groups="product.group_product_variant"/>
-                                    <field name="operation_id" groups="mrp.group_mrp_routings" domain="[('routing_id', '=', parent.routing_id)]" options="{'no_quick_create':True,'no_create_edit':True}"/>
+                                    <field name="operation_id" domain="[('routing_id', '=', parent.routing_id)]" options="{'no_quick_create':True,'no_create_edit':True}"/>
                                 </tree>
                             </field>
                         </page>
@@ -95,7 +95,7 @@
                     <field name="product_id" groups="product.group_product_variant"/>
                     <field name="product_qty"/>
                     <field name="product_uom_id" groups="product.group_uom"/>
-                    <field name="routing_id" groups="mrp.group_mrp_routings"/>
+                    <field name="routing_id"/>
                 </tree>
             </field>
         </record>
@@ -188,7 +188,7 @@
                         </group>
                         <group string="BoM details">
                             <field name="sequence"/>
-                            <field name="operation_id" groups="mrp.group_mrp_routings"/>
+                            <field name="operation_id"/>
                         </group>
                     </group>
                 </form>
diff --git a/addons/mrp/views/mrp_message_views.xml b/addons/mrp/views/mrp_message_views.xml
index d6ebf294..c6502fdd 100644
--- a/addons/mrp/views/mrp_message_views.xml
+++ b/addons/mrp/views/mrp_message_views.xml
@@ -148,6 +148,5 @@
     <menuitem id="mrp_message_menu"
           parent="menu_mrp_bom"
           action="mrp_message_action_main"
-          groups="group_mrp_routings"
           sequence="99"/>
 </flectra>
diff --git a/addons/mrp/views/mrp_production_views.xml b/addons/mrp/views/mrp_production_views.xml
index aa8c917a..e4d9ed85 100644
--- a/addons/mrp/views/mrp_production_views.xml
+++ b/addons/mrp/views/mrp_production_views.xml
@@ -14,7 +14,7 @@
                     <field name="product_qty" sum="Total Qty" string="Quantity"/>
                     <field name="product_uom_id" string="Unit of Measure" options="{'no_open':True,'no_create':True}" groups="product.group_uom"/>
                     <field name="availability"/>
-                    <field name="routing_id" groups="mrp.group_mrp_routings"/>
+                    <field name="routing_id"/>
                     <field name="origin" groups="base.group_no_one"/>
                     <field name="state"/>
                 </tree>
@@ -97,7 +97,7 @@
                                                 ('product_id','=',False),
                                                 ('type', '=', 'normal')]"
                                 context="{'default_product_tmpl_id': product_tmpl_id}" required="1" attrs="{'readonly': [('has_moves', '=', True)]}"/>
-                            <field name="routing_id" groups="mrp.group_mrp_routings"/>
+                            <field name="routing_id"/>
                         </group>
                         <group>
                             <field name="date_planned_start"/>
@@ -260,11 +260,11 @@
                     <filter string="Late" domain="['&amp;', ('date_planned_start', '&lt;', current_date), ('state', '=', 'confirmed')]"
                         name="late" help="Production started late"/>
                     <separator/>
-                    <filter string="No Routing" domain="[('routing_id','=', False)]" name="norouting" groups="mrp.group_mrp_routings"/>
+                    <filter string="No Routing" domain="[('routing_id','=', False)]" name="norouting"/>
                     <field name="product_id"/>
                     <field name="move_raw_ids" string="Raw Material" filter_domain="[('move_raw_ids.product_id','ilike',self)]"/>
                     <field name="name" string="Work Center" filter_domain="[('routing_id.operation_ids.workcenter_id','ilike',self)]"/>
-                    <field name="routing_id" groups="mrp.group_mrp_routings"/>
+                    <field name="routing_id" />
                     <separator/>
                     <filter string="My Activities" name="activities_my"
                         domain="[('activity_ids.user_id', '=', uid)]"/>
@@ -380,8 +380,7 @@
     <menuitem id="menu_mrp_workorder_todo"
             name="Work Orders"
             action="mrp_workorder_todo"
-            parent="menu_mrp_manufacturing"
-            groups="group_mrp_routings"/>
+            parent="menu_mrp_manufacturing"/>
 
     <menuitem id="menu_mrp_production_report"
           name="Manufacturing Orders"
@@ -393,7 +392,6 @@
           name="Work Orders"
           parent="menu_mrp_reporting"
           action="mrp_workorder_report"
-          groups="group_mrp_routings"
           sequence="11"/>
 
         <record id="act_product_mrp_production" model="ir.actions.act_window">
diff --git a/addons/mrp/views/mrp_routing_views.xml b/addons/mrp/views/mrp_routing_views.xml
index 59d2af62..f05905d4 100644
--- a/addons/mrp/views/mrp_routing_views.xml
+++ b/addons/mrp/views/mrp_routing_views.xml
@@ -174,7 +174,6 @@
         <menuitem id="menu_mrp_routing_action"
           action="mrp_routing_action"
           parent="menu_mrp_bom"
-          groups="group_mrp_routings"
           sequence="50"/>
     </data>
-</flectra>
\ No newline at end of file
+</flectra>
diff --git a/addons/mrp/views/mrp_workcenter_views.xml b/addons/mrp/views/mrp_workcenter_views.xml
index 13ea515c..793ff4a0 100644
--- a/addons/mrp/views/mrp_workcenter_views.xml
+++ b/addons/mrp/views/mrp_workcenter_views.xml
@@ -416,14 +416,12 @@
 
         <menuitem id="menu_view_resource_search_mrp"
             action="mrp_workcenter_action"
-            groups="group_mrp_routings"
             parent="menu_mrp_bom"
             sequence="90"/>
 
         <menuitem id="menu_mrp_dashboard"
             name="Dashboard"
             action="mrp_workcenter_kanban_action"
-            groups="group_mrp_routings"
             parent="menu_mrp_root"
             sequence="5"/>
 
@@ -514,7 +512,6 @@
 
     <menuitem id="menu_mrp_workcenter_productivity_loss"
             action="mrp_workcenter_productivity_loss_action"
-            groups="group_mrp_routings"
             sequence="20"
             parent="menu_mrp_configuration"/>
 
@@ -626,7 +623,6 @@
     <menuitem id="menu_mrp_workcenter_productivity_report"
           parent="menu_mrp_reporting"
           action="mrp_workcenter_productivity_report"
-          groups="group_mrp_routings"
           sequence="12"/>
     </data>
 </flectra>
diff --git a/addons/mrp/views/res_config_settings_views.xml b/addons/mrp/views/res_config_settings_views.xml
index f2a956fa..8b91dea7 100644
--- a/addons/mrp/views/res_config_settings_views.xml
+++ b/addons/mrp/views/res_config_settings_views.xml
@@ -11,29 +11,6 @@
                     <div class="app_settings_block" data-string="Manufacturing" string="Manufacturing" data-key="mrp" groups="mrp.group_mrp_manager">
                         <h2>Operations</h2>
                         <div class="row mt16 o_settings_container">
-                            <div class="col-md-6 col-xs-12 o_setting_box" id="work_order" title="Work Order Operations allow you to create and manage the manufacturing operations that should be followed within your work centers in order to produce a product. They are attached to bills of materials that will define the required raw materials.">
-                                <div class="o_setting_left_pane">
-                                    <field name="group_mrp_routings" widget="upgrade_boolean"/>
-                                    <field name="module_quality_mrp" invisible="1"/>
-                                </div>
-                                <div class="o_setting_right_pane">
-                                    <label for="group_mrp_routings"/>
-                                    <div class="text-muted">
-                                        Process operations at specific work centers based on the routing
-                                        and carry out quality checks.
-                                    </div>
-                                    <div class="content-group" attrs="{'invisible': [('group_mrp_routings','=',False)]}">
-                                        <div class="mt16">
-                                            <div>
-                                                <button name="%(mrp.mrp_routing_action)d" icon="fa-arrow-right" type="action" string="Routings" class="btn-link"/>
-                                            </div>
-                                            <div>
-                                                <button name="%(mrp.mrp_workcenter_action)d" icon="fa-arrow-right" type="action" string="Work Centers" class="btn-link"/>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
                             <div class="col-md-6 col-xs-12 o_setting_box" id="mrp_repair">
                                 <div class="o_setting_left_pane">
                                     <field name="module_mrp_repair"/>
@@ -45,17 +22,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="col-md-6 col-xs-12 o_setting_box" id="mrp_maintenance">
-                                <div class="o_setting_left_pane">
-                                    <field name="module_mrp_maintenance" widget="upgrade_boolean"/>
-                                </div>
-                                <div class="o_setting_right_pane">
-                                    <label for="module_mrp_maintenance"/>
-                                    <div class="text-muted">
-                                        Schedule the maintenance of your equipment
-                                    </div>
-                                </div>
-                            </div>
                         </div>
                         <h2>Products</h2>
                         <div class="row mt16 o_settings_container">
@@ -73,18 +39,6 @@
                         </div>
                         <h2>Planning</h2>
                         <div class="row mt16 o_settings_container">
-                            <div class="col-md-6 col-xs-12 o_setting_box" id="mrp_mps" title="Using a MPS report to schedule your reordering and manufacturing operations is useful if you have long lead time and if you produce based on sales forecasts.">
-                                <div class="o_setting_left_pane">
-                                    <field name="module_mrp_mps" widget="upgrade_boolean"/>
-                                </div>
-                                <div class="o_setting_right_pane">
-                                    <label for="module_mrp_mps"/>
-                                    <div class="text-muted">
-                                        Plan manufacturing or purchase orders based on forecasts
-                                    </div>
-                                    <div class="content-group" id="content_mrp_mps"/>
-                                </div>
-                            </div>
                             <div class="col-md-6 col-xs-12 o_setting_box" id="security_lead_time">
                                 <div class="o_setting_left_pane">
                                     <field name="use_manufacturing_lead"/>
diff --git a/addons/point_of_sale/models/pos_config.py b/addons/point_of_sale/models/pos_config.py
index 0bba11b5..e0f17cde 100644
--- a/addons/point_of_sale/models/pos_config.py
+++ b/addons/point_of_sale/models/pos_config.py
@@ -158,7 +158,6 @@ class PosConfig(models.Model):
     start_category = fields.Boolean("Set Start Category")
     module_pos_restaurant = fields.Boolean("Is a Bar/Restaurant")
     module_pos_discount = fields.Boolean("Global Discounts")
-    module_pos_loyalty = fields.Boolean("Loyalty Program")
     module_pos_mercury = fields.Boolean(string="Integrated Card Payments")
     module_pos_reprint = fields.Boolean(string="Reprint Receipt")
     is_posbox = fields.Boolean("PosBox")
diff --git a/addons/point_of_sale/views/pos_config_view.xml b/addons/point_of_sale/views/pos_config_view.xml
index d1d64b8e..d3e70b09 100644
--- a/addons/point_of_sale/views/pos_config_view.xml
+++ b/addons/point_of_sale/views/pos_config_view.xml
@@ -265,22 +265,6 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="col-xs-12 col-md-6 o_setting_box">
-                            <div class="o_setting_left_pane">
-                                <field name="module_pos_loyalty" widget="upgrade_boolean"/>
-                            </div>
-                            <div class="o_setting_right_pane" title="Loyalty program to use for this point of sale. ">
-                                <label for="module_pos_loyalty"/>
-                                <div class="text-muted" id="loyalty_program">
-                                    Give customer rewards, free samples, etc.
-                                </div>
-                                <div class="content-group" attrs="{'invisible': [('module_pos_loyalty', '=', False)]}">
-                                    <div class="mt16" id="btn_use_pos_loyalty">
-                                        <button string="Save" type="object" name="execute" class="oe_highlight"/>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
                         <div class="col-xs-12 col-md-6 o_setting_box" title="Only users with Manager access rights for PoS app can modify the product prices on orders.">
                             <div class="o_setting_left_pane">
                                 <field name="restrict_price_control"/>
diff --git a/addons/project/models/res_config_settings.py b/addons/project/models/res_config_settings.py
index a195cc66..adc42fb0 100644
--- a/addons/project/models/res_config_settings.py
+++ b/addons/project/models/res_config_settings.py
@@ -9,5 +9,4 @@ class ResConfigSettings(models.TransientModel):
 
     module_hr_timesheet = fields.Boolean("Timesheets")
     module_rating_project = fields.Boolean(string="Rating on Tasks")
-    module_project_forecast = fields.Boolean(string="Forecasts")
     group_subtask_project = fields.Boolean("Sub-tasks", implied_group="project.group_subtask_project")
diff --git a/addons/project/views/res_config_settings_views.xml b/addons/project/views/res_config_settings_views.xml
index 16bba18e..1d1e3892 100644
--- a/addons/project/views/res_config_settings_views.xml
+++ b/addons/project/views/res_config_settings_views.xml
@@ -58,17 +58,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="col-xs-12 col-md-6 o_setting_box">
-                                <div class="o_setting_left_pane">
-                                    <field name="module_project_forecast" widget="upgrade_boolean"/>
-                                </div>
-                                <div class="o_setting_right_pane">
-                                    <label for="module_project_forecast"/>
-                                    <div class="text-muted">
-                                        Manage your resources with Gantt charts
-                                    </div>
-                                </div>
-                            </div>
                         </div>
                     </div>
                 </xpath>
diff --git a/addons/purchase/models/res_config_settings.py b/addons/purchase/models/res_config_settings.py
index ab5f8515..7f5a26f5 100644
--- a/addons/purchase/models/res_config_settings.py
+++ b/addons/purchase/models/res_config_settings.py
@@ -25,7 +25,6 @@ class ResConfigSettings(models.TransientModel):
     module_stock_dropshipping = fields.Boolean("Dropshipping")
     group_manage_vendor_price = fields.Boolean("Vendor Pricelists",
         implied_group="purchase.group_manage_vendor_price")
-    module_account_3way_match = fields.Boolean("3-way matching: purchases, receptions and bills")
     is_installed_sale = fields.Boolean(string="Is the Sale Module Installed")
     group_analytic_account_for_purchases = fields.Boolean('Analytic accounting for purchases',
         implied_group='purchase.group_analytic_accounting')
diff --git a/addons/purchase/views/res_config_settings_views.xml b/addons/purchase/views/res_config_settings_views.xml
index 1508b5e4..fbc9895f 100644
--- a/addons/purchase/views/res_config_settings_views.xml
+++ b/addons/purchase/views/res_config_settings_views.xml
@@ -85,17 +85,6 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="col-xs-12 col-md-6 o_setting_box" title="If enabled, activates 3-way matching on vendor bills : the items must be received in order to pay the invoice.">
-                            <div class="o_setting_left_pane">
-                                <field name="module_account_3way_match" string="3-way matching" widget="upgrade_boolean"/>
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <label for="module_account_3way_match"/>
-                                <div class="text-muted">
-                                    Make sure you only pay bills for which you received the goods you ordered
-                                </div>
-                            </div>
-                        </div>
                     </div>
                     <h2>Products</h2>
                     <div class="row mt16 o_settings_container">
diff --git a/addons/sale/models/res_config_settings.py b/addons/sale/models/res_config_settings.py
index 9118e9fd..c8342fc3 100644
--- a/addons/sale/models/res_config_settings.py
+++ b/addons/sale/models/res_config_settings.py
@@ -69,15 +69,8 @@ class ResConfigSettings(models.TransientModel):
     ], string='Customer Account')
 
     module_delivery = fields.Boolean("Shipping Costs")
-    module_delivery_dhl = fields.Boolean("DHL")
-    module_delivery_fedex = fields.Boolean("FedEx")
-    module_delivery_ups = fields.Boolean("UPS")
-    module_delivery_usps = fields.Boolean("USPS")
-    module_delivery_bpost = fields.Boolean("bpost")
-
     module_product_email_template = fields.Boolean("Specific Email")
-    module_sale_coupon = fields.Boolean("Coupons & Promotions")
-
+    
     @api.onchange('multi_sales_price', 'multi_sales_price_method')
     def _onchange_sale_price(self):
         if self.multi_sales_price and not self.multi_sales_price_method:
diff --git a/addons/sale/views/res_config_settings_views.xml b/addons/sale/views/res_config_settings_views.xml
index c1a3a459..533bf53d 100644
--- a/addons/sale/views/res_config_settings_views.xml
+++ b/addons/sale/views/res_config_settings_views.xml
@@ -79,17 +79,6 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="col-xs-12 col-md-6 o_setting_box" title="Boost your sales with two kinds of discount programs: promotions and coupon codes. Specific conditions can be set (products, customers, minimum purchase amount, period). Rewards can be discounts (% or amount) or free products.">
-                            <div class="o_setting_left_pane">
-                                <field name="module_sale_coupon" widget="upgrade_boolean"/>
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <label for="module_sale_coupon"/>
-                                <div class="text-muted" id="sale_coupon">
-                                    Manage promotion &amp; coupon programs
-                                </div>
-                            </div>
-                        </div>
                         <div class="col-xs-12 col-md-6 o_setting_box" title="There are two ways to manage pricelists: 1) Multiple prices per product: must be set in the Sales tab of the product detail form. 2) Price computed from formulas: must be set in the pricelist form.">
                             <div class="o_setting_left_pane">
                                 <field name="multi_sales_price"/>
@@ -277,76 +266,6 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="col-xs-12 col-md-6 o_setting_box" id="ups">
-                            <div class="o_setting_left_pane">
-                                <field name="module_delivery_ups" widget="upgrade_boolean"/>
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <label for="module_delivery_ups"/>
-                                <div class="text-muted">
-                                    Compute shipping costs and ship with UPS
-                                </div>
-                                <div class="content-group">
-                                    <div id="sale_delivery_ups"/>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-xs-12 col-md-6 o_setting_box">
-                            <div class="o_setting_left_pane">
-                                <field name="module_delivery_dhl" widget="upgrade_boolean"/>
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <label for="module_delivery_dhl"/>
-                                <div class="text-muted">
-                                    Compute shipping costs and ship with DHL
-                                </div>
-                                <div class="content-group">
-                                    <div id="sale_delivery_dhl"></div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-xs-12 col-md-6 o_setting_box">
-                            <div class="o_setting_left_pane">
-                                <field name="module_delivery_fedex" widget="upgrade_boolean"/>
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <label for="module_delivery_fedex"/>
-                                <div class="text-muted">
-                                    Compute shipping costs and ship with FedEx
-                                </div>
-                                <div class="content-group">
-                                    <div id="sale_delivery_fedex"/>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-xs-12 col-md-6 o_setting_box">
-                            <div class="o_setting_left_pane">
-                                <field name="module_delivery_usps" widget="upgrade_boolean"/>
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <label for="module_delivery_usps"/>
-                                <div class="text-muted">
-                                    Compute shipping costs and ship with USPS
-                                </div>
-                                <div class="content-group">
-                                    <div id="sale_delivery_usps"/>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-xs-12 col-md-6 o_setting_box">
-                            <div class="o_setting_left_pane">
-                                <field name="module_delivery_bpost" widget="upgrade_boolean"/>
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <label for="module_delivery_bpost"/>
-                                <div class="text-muted">
-                                    Compute shipping costs and ship with bpost
-                                </div>
-                                <div class="content-group">
-                                    <div id="sale_delivery_bpost"/>
-                                </div>
-                            </div>
-                        </div>
                     </div>
                     <h2>Invoicing</h2>
                     <div class="row mt16 o_settings_container">
diff --git a/addons/stock/models/res_config_settings.py b/addons/stock/models/res_config_settings.py
index 198a3923..472feda4 100644
--- a/addons/stock/models/res_config_settings.py
+++ b/addons/stock/models/res_config_settings.py
@@ -30,12 +30,6 @@ class ResConfigSettings(models.TransientModel):
         oldname='default_new_propagation_minimum_delta',
         help="Rescheduling applies to any chain of operations (e.g. Make To Order, Pick Pack Ship). In the case of MTO sales, a vendor delay (updated incoming date) impacts the expected delivery date to the customer. \n This option allows to not propagate the rescheduling if the change is not critical.")
     module_stock_picking_batch = fields.Boolean("Batch Pickings", oldname="module_stock_picking_wave")
-    module_stock_barcode = fields.Boolean("Barcode Scanner")
-    module_delivery_dhl = fields.Boolean("DHL USA")
-    module_delivery_fedex = fields.Boolean("FedEx")
-    module_delivery_ups = fields.Boolean("UPS")
-    module_delivery_usps = fields.Boolean("USPS")
-    module_delivery_bpost = fields.Boolean("bpost")
     group_stock_multi_locations = fields.Boolean('Storage Locations', implied_group='stock.group_stock_multi_locations',
         help="Store products in specific locations of your warehouse (e.g. bins, racks) and to track inventory accordingly.")
     group_stock_multi_warehouses = fields.Boolean('Multi-Warehouses', implied_group='stock.group_stock_multi_warehouses')
diff --git a/addons/stock/views/res_config_settings_views.xml b/addons/stock/views/res_config_settings_views.xml
index 9abe89a6..c6caa7e0 100644
--- a/addons/stock/views/res_config_settings_views.xml
+++ b/addons/stock/views/res_config_settings_views.xml
@@ -11,20 +11,6 @@
                     <div class="app_settings_block" data-string="Inventory" string="Inventory" data-key="stock" groups="stock.group_stock_manager">
                         <h2>Operations</h2>
                         <div class="row mt16 o_settings_container">
-                            <div class="col-xs-12 col-md-6 o_setting_box">
-                                <div class="o_setting_left_pane">
-                                    <field name="module_stock_barcode" widget="upgrade_boolean"/>
-                                </div>
-                                <div class="o_setting_right_pane">
-                                    <label for="module_stock_barcode"/>
-                                    <div class="text-muted">
-                                        Process operations faster with barcodes
-                                    </div>
-                                    <div class="content-group">
-                                        <div id="use_product_barcode"/>
-                                    </div>
-                                </div>
-                            </div>
                             <div class="col-xs-12 col-md-6 o_setting_box" title="Put your products in packs (e.g. parcels, boxes) and track them">
                                 <div class="o_setting_left_pane">
                                     <field name="group_stock_tracking_lot"/>
@@ -59,79 +45,6 @@
                                 </div>
                             </div>
                         </div>
-                        <h2>Shipping Connectors</h2>
-                        <div class="row mt16 o_settings_container" title="Shipping connectors allow to compute accurate shipping costs, print shipping labels and request carrier picking at your warehouse to ship to the customer. Apply shipping connector from delivery methods.">
-                            <div class="col-xs-12 col-md-6 o_setting_box">
-                                <div class="o_setting_left_pane">
-                                    <field name="module_delivery_ups" widget="upgrade_boolean"/>
-                                </div>
-                                <div class="o_setting_right_pane">
-                                    <label for="module_delivery_ups"/>
-                                    <div class="text-muted">
-                                        Compute shipping costs and ship with UPS
-                                    </div>
-                                    <div class="content-group">
-                                        <div id="stock_delivery_ups"/>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-xs-12 col-md-6 o_setting_box">
-                                <div class="o_setting_left_pane">
-                                    <field name="module_delivery_dhl" widget="upgrade_boolean"/>
-                                </div>
-                                <div class="o_setting_right_pane">
-                                    <label for="module_delivery_dhl"/>
-                                    <div class="text-muted">
-                                        Compute shipping costs and ship with DHL
-                                    </div>
-                                    <div class="content-group">
-                                        <div id="stock_delivery_dhl"/>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-xs-12 col-md-6 o_setting_box">
-                                <div class="o_setting_left_pane">
-                                    <field name="module_delivery_fedex" widget="upgrade_boolean"/>
-                                </div>
-                                <div class="o_setting_right_pane">
-                                    <label for="module_delivery_fedex"/>
-                                    <div class="text-muted">
-                                        Compute shipping costs and ship with FedEx
-                                    </div>
-                                    <div class="content-group">
-                                        <div id="stock_delivery_fedex"/>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-xs-12 col-md-6 o_setting_box">
-                                <div class="o_setting_left_pane">
-                                    <field name="module_delivery_usps" widget="upgrade_boolean"/>
-                                </div>
-                                <div class="o_setting_right_pane">
-                                    <label for="module_delivery_usps"/>
-                                    <div class="text-muted">
-                                        Compute shipping costs and ship with USPS
-                                    </div>
-                                    <div class="content-group">
-                                        <div id="stock_delivery_usps"/>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-xs-12 col-md-6 o_setting_box">
-                                <div class="o_setting_left_pane">
-                                    <field name="module_delivery_bpost" widget="upgrade_boolean"/>
-                                </div>
-                                <div class="o_setting_right_pane">
-                                    <label for="module_delivery_bpost"/>
-                                    <div class="text-muted">
-                                        Compute shipping costs and ship with bpost
-                                    </div>
-                                    <div class="content-group">
-                                        <div id="stock_delivery_bpost"/>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
                         <h2>Products</h2>
                         <div class="row mt16 o_settings_container">
                             <div class="col-xs-12 col-md-6 o_setting_box">
diff --git a/addons/website/models/res_config_settings.py b/addons/website/models/res_config_settings.py
index 1d57097c..db8eaf62 100644
--- a/addons/website/models/res_config_settings.py
+++ b/addons/website/models/res_config_settings.py
@@ -30,8 +30,6 @@ class ResConfigSettings(models.TransientModel):
     cdn_activated = fields.Boolean('Use a Content Delivery Network (CDN)', related='website_id.cdn_activated')
     cdn_url = fields.Char(related='website_id.cdn_url')
     cdn_filters = fields.Text(related='website_id.cdn_filters')
-    module_website_version = fields.Boolean("A/B Testing")
-
     favicon = fields.Binary('Favicon', related='website_id.favicon')
     # Set as global config parameter since methods using it are not website-aware. To be changed
     # when multi-website is implemented
diff --git a/addons/website/views/res_config_settings_views.xml b/addons/website/views/res_config_settings_views.xml
index 17542d18..80b7f143 100644
--- a/addons/website/views/res_config_settings_views.xml
+++ b/addons/website/views/res_config_settings_views.xml
@@ -132,17 +132,6 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="col-xs-12 col-md-6 o_setting_box">
-                                    <div class="o_setting_left_pane">
-                                        <field name="module_website_version" widget="upgrade_boolean"/>
-                                    </div>
-                                    <div class="o_setting_right_pane">
-                                        <label for="module_website_version"/>
-                                        <div class="text-muted">
-                                            Create several versions of your website pages
-                                        </div>
-                                    </div>
-                                </div>
                                 <div class="col-xs-12 col-md-6 o_setting_box">
                                     <div class="o_setting_left_pane">
                                     </div>
diff --git a/addons/website_sale/views/res_config_settings_views.xml b/addons/website_sale/views/res_config_settings_views.xml
index 928863d6..23b73b80 100644
--- a/addons/website_sale/views/res_config_settings_views.xml
+++ b/addons/website_sale/views/res_config_settings_views.xml
@@ -204,17 +204,6 @@
                             </div>
                         </div>
                     </div>
-                    <div class="col-xs-12 col-md-6 o_setting_box" title="Boost your sales with two kinds of discount programs: promotions and coupon codes. Specific conditions can be set (products, customers, minimum purchase amount, period). Rewards can be discounts (% or amount) or free products.">
-                        <div class="o_setting_left_pane">
-                            <field name="module_sale_coupon" widget="upgrade_boolean"/>
-                        </div>
-                        <div class="o_setting_right_pane">
-                            <label for="module_sale_coupon"/>
-                            <div class="text-muted" id="website_sale_coupon">
-                                Manage promotion &amp; coupon programs
-                            </div>
-                        </div>
-                    </div>
                 </div>
 
                 <h2>Shipping</h2>
@@ -241,61 +230,6 @@
                             </div>
                         </div>
                     </div>
-                    <div class="col-xs-12 col-md-6 o_setting_box" id="ups_provider_setting">
-                        <div class="o_setting_left_pane">
-                            <field name="module_delivery_ups" widget="upgrade_boolean"/>
-                        </div>
-                        <div class="o_setting_right_pane">
-                            <label string="UPS" for="module_delivery_ups"/>
-                            <div class="text-muted" id="website_delivery_ups">
-                                Compute shipping costs and ship with UPS
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-xs-12 col-md-6 o_setting_box" id="shipping_provider_dhl_setting">
-                        <div class="o_setting_left_pane">
-                            <field name="module_delivery_dhl" widget="upgrade_boolean"/>
-                        </div>
-                        <div class="o_setting_right_pane">
-                            <label string="DHL" for="module_delivery_dhl"/>
-                            <div class="text-muted" id="website_delivery_dhl">
-                                Compute shipping costs and ship with DHL
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-xs-12 col-md-6 o_setting_box" id="shipping_provider_fedex_setting">
-                        <div class="o_setting_left_pane">
-                            <field name="module_delivery_fedex" widget="upgrade_boolean"/>
-                        </div>
-                        <div class="o_setting_right_pane">
-                            <label string="FedEx" for="module_delivery_fedex"/>
-                            <div class="text-muted" id="website_delivery_fedex">
-                                Compute shipping costs and ship with FedEx
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-xs-12 col-md-6 o_setting_box" id="shipping_provider_usps_setting">
-                        <div class="o_setting_left_pane">
-                            <field name="module_delivery_usps" widget="upgrade_boolean"/>
-                        </div>
-                        <div class="o_setting_right_pane">
-                            <label string="USPS" for="module_delivery_usps"/>
-                            <div class="text-muted" id="website_delivery_usps">
-                                Compute shipping costs and ship with USPS
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-xs-12 col-md-6 o_setting_box" id="shipping_provider_bpost_setting">
-                        <div class="o_setting_left_pane">
-                            <field name="module_delivery_bpost" widget="upgrade_boolean"/>
-                        </div>
-                        <div class="o_setting_right_pane">
-                            <label string="bpost" for="module_delivery_bpost"/>
-                            <div class="text-muted" id="website_delivery_bpost">
-                                Compute shipping costs and ship with bpost
-                            </div>
-                        </div>
-                    </div>
                 </div>
 
                 <h2>Invoicing</h2>
diff --git a/addons/website_sale_delivery/views/res_config_settings_views.xml b/addons/website_sale_delivery/views/res_config_settings_views.xml
index 6f645bfc..b66a91e7 100644
--- a/addons/website_sale_delivery/views/res_config_settings_views.xml
+++ b/addons/website_sale_delivery/views/res_config_settings_views.xml
@@ -12,34 +12,6 @@
                     </div>
                 </div>
             </div>
-            <div id="website_delivery_dhl" position="after">
-                <div class="content-group">
-                    <div class="mt16" attrs="{'invisible': [('module_delivery_dhl', '=', False)]}">
-                        <button name="%(delivery.action_delivery_carrier_form)d" icon="fa-arrow-right" type="action" string="DHL Delivery Methods" class="btn-link" context="{'search_default_delivery_type': 'dhl'}"/>
-                    </div>
-                </div>
-            </div>
-            <div id="website_delivery_fedex" position="after">
-                <div class="content-group">
-                    <div class="mt16" attrs="{'invisible': [('module_delivery_fedex', '=', False)]}">
-                        <button name="%(delivery.action_delivery_carrier_form)d" icon="fa-arrow-right" type="action" string="FedEx Delivery Methods" class="btn-link" context="{'search_default_delivery_type': 'fedex'}"/>
-                    </div>
-                </div>
-            </div>
-            <div id="website_delivery_usps" position="after">
-                <div class="content-group">
-                    <div class="mt16" attrs="{'invisible': [('module_delivery_usps', '=', False)]}">
-                        <button name="%(delivery.action_delivery_carrier_form)d" icon="fa-arrow-right" type="action" string="USPS Delivery Methods" class="btn-link" context="{'search_default_delivery_type': 'usps'}"/>
-                    </div>
-                </div>
-            </div>
-            <div id="website_delivery_bpost" position="after">
-                <div class="content-group">
-                    <div class="mt16" attrs="{'invisible': [('module_delivery_bpost', '=', False)]}">
-                        <button name="%(delivery.action_delivery_carrier_form)d" icon="fa-arrow-right" type="action" string="bpost Delivery Methods" class="btn-link" context="{'search_default_delivery_type': 'bpost'}"/>
-                    </div>
-                </div>
-            </div>
         </field>
     </record>
 </flectra>