diff --git a/addons/auth_oauth/auth_oauth_view.xml b/addons/auth_oauth/auth_oauth_view.xml
index 475720af9fd..35397d72dbd 100644
--- a/addons/auth_oauth/auth_oauth_view.xml
+++ b/addons/auth_oauth/auth_oauth_view.xml
@@ -4,7 +4,6 @@
         <record model="ir.ui.view" id="view_oauth_provider_form">
             <field name="name">auth.oauth.provider.form</field>
             <field name="model">auth.oauth.provider</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="arch" version="7.0">
                     <sheet>
@@ -26,7 +25,6 @@
         <record model="ir.ui.view" id="view_oauth_provider_list">
             <field name="name">auth.oauth.provider.list</field>
             <field name="model">auth.oauth.provider</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="arch" version="7.0">
                     <field name="name" />
diff --git a/addons/auth_reset_password/auth_reset_password.py b/addons/auth_reset_password/auth_reset_password.py
index ff208c89b9c..40afbcaa4e6 100644
--- a/addons/auth_reset_password/auth_reset_password.py
+++ b/addons/auth_reset_password/auth_reset_password.py
@@ -31,7 +31,10 @@ def message_check(msg, secret):
 
 class res_users(osv.osv):
     _inherit = 'res.users'
-
+    _columns = {
+        'user_email': fields.related('email', type='char',
+            deprecated='Use the email field instead of user_email. This field will be removed with OpenERP 7.1.')
+    } 
     _sql_constraints = [
         ('email_uniq', 'UNIQUE (user_email)', 'You can not have two users with the same email!')
     ]
diff --git a/addons/auth_reset_password/auth_reset_password.xml b/addons/auth_reset_password/auth_reset_password.xml
index 26ea8878c45..428bcbd044b 100644
--- a/addons/auth_reset_password/auth_reset_password.xml
+++ b/addons/auth_reset_password/auth_reset_password.xml
@@ -25,7 +25,6 @@ If you don't have asked for password reset, you can safely ignore this email.
         <record id="reset_password_wizard_form_view" model="ir.ui.view">
             <field name="name">auth.reset_password.form</field>
             <field name="model">auth.reset_password</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Reset Password" version="7.0">
                     <field name="state" invisible="1"/> 
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index e07f576aa41..949a39159ac 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -6,9 +6,6 @@
         <record id="base.menu_res_company_global" model="ir.ui.menu">
             <field name="groups_id" eval="[(3, ref('base.group_no_one'))]"/>
         </record>
-        <record id="base.menu_publisher_warranty" model="ir.ui.menu">
-            <field name="groups_id" eval="[(3, ref('base.group_no_one'))]"/>
-        </record>
 
         <!-- Specify your terminology config wiz -->
         <record id="base_setup_terminology_form" model="ir.ui.view">