diff --git a/addons/base_setup/models/res_config_settings.py b/addons/base_setup/models/res_config_settings.py
index 70bf35c0bcd..4385ca76c58 100644
--- a/addons/base_setup/models/res_config_settings.py
+++ b/addons/base_setup/models/res_config_settings.py
@@ -25,6 +25,7 @@ class ResConfigSettings(models.TransientModel):
module_google_spreadsheet = fields.Boolean("Google Spreadsheet")
module_auth_oauth = fields.Boolean("Use external authentication providers (OAuth)")
module_auth_ldap = fields.Boolean("LDAP Authentication")
+ # TODO: remove in master
module_base_gengo = fields.Boolean("Translate Your Website with Gengo")
module_account_inter_company_rules = fields.Boolean("Manage Inter Company")
module_pad = fields.Boolean("Collaborative Pads")
diff --git a/addons/base_setup/views/res_config_settings_views.xml b/addons/base_setup/views/res_config_settings_views.xml
index b2c9a48f4cc..e6fda7c11c7 100644
--- a/addons/base_setup/views/res_config_settings_views.xml
+++ b/addons/base_setup/views/res_config_settings_views.xml
@@ -334,20 +334,6 @@
-
diff --git a/addons/website/README.md b/addons/website/README.md
index c427111378e..4da1134e63f 100644
--- a/addons/website/README.md
+++ b/addons/website/README.md
@@ -65,11 +65,6 @@ Get your website translated in multiple languages with no effort. Odoo proposes
and propagates translations automatically across pages, following what you edit
on the master page.
-Benefit from professional translators to translate all your contents
-automatically with the [Gengo](http://gengo.com) integration. Update any part
-of your website and the translated versions are pushed automatically in a few
-hours.
-
Designer-Friendly Templates
---------------------------
diff --git a/odoo/tests/test_module_operations.py b/odoo/tests/test_module_operations.py
index fca6dc274c4..d4d9804d738 100755
--- a/odoo/tests/test_module_operations.py
+++ b/odoo/tests/test_module_operations.py
@@ -17,7 +17,7 @@ import odoo.tests.loader
_logger = logging.getLogger('odoo.tests.test_module_operations')
BLACKLIST = {
- 'auth_ldap', 'document_ftp', 'base_gengo', 'website_gengo', 'website_instantclick', 'pad',
+ 'auth_ldap', 'document_ftp', 'website_instantclick', 'pad',
'pad_project', 'note_pad', 'pos_cache', 'pos_blackbox_be', 'payment_test',
}
IGNORE = ('hw_', 'theme_', 'l10n_', 'test_', 'payment_')