diff --git a/openerp/addons/base/__openerp__.py b/openerp/addons/base/__openerp__.py
index fd2d514791b..c797d3cf47e 100644
--- a/openerp/addons/base/__openerp__.py
+++ b/openerp/addons/base/__openerp__.py
@@ -76,7 +76,6 @@ The kernel of OpenERP, needed for all installation.
'res/res_lang_view.xml',
'res/res_partner_report.xml',
'res/res_partner_view.xml',
- 'res/res_partner_shortcut_data.xml',
'res/res_bank_view.xml',
'res/res_country_view.xml',
'res/res_currency_view.xml',
diff --git a/openerp/addons/base/ir/ir_ui_menu.py b/openerp/addons/base/ir/ir_ui_menu.py
index c23d0e08be8..f01ce54bfc2 100644
--- a/openerp/addons/base/ir/ir_ui_menu.py
+++ b/openerp/addons/base/ir/ir_ui_menu.py
@@ -32,14 +32,6 @@ from openerp import SUPERUSER_ID
MENU_ITEM_SEPARATOR = "/"
-def one_in(setA, setB):
- """Check the presence of an element of setA in setB
- """
- for x in setA:
- if x in setB:
- return True
- return False
-
class ir_ui_menu(osv.osv):
_name = 'ir.ui.menu'
diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py
index 794f3fcd826..123b20db15f 100644
--- a/openerp/addons/base/ir/ir_ui_view.py
+++ b/openerp/addons/base/ir/ir_ui_view.py
@@ -305,41 +305,5 @@ class view(osv.osv):
ids = map(itemgetter(0), cr.fetchall())
return self._check_xml(cr, uid, ids)
-
-class view_sc(osv.osv):
- _name = 'ir.ui.view_sc'
- _columns = {
- 'name': fields.char('Shortcut Name', size=64), # Kept for backwards compatibility only - resource name used instead (translatable)
- 'res_id': fields.integer('Resource Ref.', help="Reference of the target resource, whose model/table depends on the 'Resource Name' field."),
- 'sequence': fields.integer('Sequence'),
- 'user_id': fields.many2one('res.users', 'User Ref.', required=True, ondelete='cascade', select=True),
- 'resource': fields.char('Resource Name', size=64, required=True, select=True)
- }
-
- def _auto_init(self, cr, context=None):
- super(view_sc, self)._auto_init(cr, context)
- cr.execute('SELECT indexname FROM pg_indexes WHERE indexname = \'ir_ui_view_sc_user_id_resource\'')
- if not cr.fetchone():
- cr.execute('CREATE INDEX ir_ui_view_sc_user_id_resource ON ir_ui_view_sc (user_id, resource)')
-
- def get_sc(self, cr, uid, user_id, model='ir.ui.menu', context=None):
- ids = self.search(cr, uid, [('user_id','=',user_id),('resource','=',model)], context=context)
- results = self.read(cr, uid, ids, ['res_id'], context=context)
- name_map = dict(self.pool[model].name_get(cr, uid, [x['res_id'] for x in results], context=context))
- # Make sure to return only shortcuts pointing to exisintg menu items.
- filtered_results = filter(lambda result: result['res_id'] in name_map, results)
- for result in filtered_results:
- result.update(name=name_map[result['res_id']])
- return filtered_results
-
- _order = 'sequence,name'
- _defaults = {
- 'resource': 'ir.ui.menu',
- 'user_id': lambda obj, cr, uid, context: uid,
- }
- _sql_constraints = [
- ('shortcut_unique', 'unique(res_id, resource, user_id)', 'Shortcut for this menu already exists!'),
- ]
-
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/ir/ir_ui_view_view.xml b/openerp/addons/base/ir/ir_ui_view_view.xml
index 44594c1e616..82a7db2c723 100644
--- a/openerp/addons/base/ir/ir_ui_view_view.xml
+++ b/openerp/addons/base/ir/ir_ui_view_view.xml
@@ -114,27 +114,5 @@
-
-
- ir.ui.view_sc
-
-
-
-
-
- ir.ui.view_sc
-
-
-
-
-
-
-
-
diff --git a/openerp/addons/base/res/res_partner_shortcut_data.xml b/openerp/addons/base/res/res_partner_shortcut_data.xml
deleted file mode 100644
index ee534a2ff6b..00000000000
--- a/openerp/addons/base/res/res_partner_shortcut_data.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
- Customers
- ir.ui.menu
-
-
-
-
-
-
diff --git a/openerp/addons/base/security/ir.model.access.csv b/openerp/addons/base/security/ir.model.access.csv
index 1efd28b9afa..167c18ae884 100644
--- a/openerp/addons/base/security/ir.model.access.csv
+++ b/openerp/addons/base/security/ir.model.access.csv
@@ -40,7 +40,6 @@
"access_ir_ui_view_group_user","ir_ui_view group_user","model_ir_ui_view",,1,0,0,0
"access_ir_ui_view_group_system","ir_ui_view group_system","model_ir_ui_view","group_system",1,1,1,1
"access_ir_ui_view_custom_group_user","ir_ui_view_custom_group_user","model_ir_ui_view_custom",,1,1,1,1
-"access_ir_ui_view_sc_group_user","ir_ui_view_sc group_user","model_ir_ui_view_sc",,1,1,1,1
"access_ir_values_group_all","ir_values group_all","model_ir_values",,1,1,1,1
"access_res_company_group_erp_manager","res_company group_erp_manager","model_res_company","group_erp_manager",1,1,1,1
"access_res_company_group_user","res_company group_user","model_res_company",,1,0,0,0