diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml
index d9041e3002f..c044f447ade 100644
--- a/openerp/addons/base/base_update.xml
+++ b/openerp/addons/base/base_update.xml
@@ -252,59 +252,10 @@
                 </tree>
             </field>
         </record>
-
-        <record id="view_confirm_simple_view_form" model="ir.ui.view">
-            <field name="name">Configure Your Interface</field>
-            <field name="model">res.config.view</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="res_config_view_base"/>
-            <field name="arch" type="xml">
-              <data>
-                <form position="attributes">
-                  <attribute name="string">Configure Your Interface</attribute>
-                </form>
-                <xpath expr="//label[@string='description']"
-                     position="attributes">
-                <attribute name="string">If you use OpenERP for the first time we strongly advise you to select the simplified interface, which has less features but is easier. You can always switch later from the user preferences.</attribute>
-              </xpath>
-              <xpath expr='//separator[@string="title"]' position='attributes'>
-                    <attribute name='string'>Configure Your Interface</attribute>
-              </xpath>
-              <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                    <attribute name='string'></attribute>
-                    <attribute name='rowspan'>12</attribute>
-              </xpath>
-               <group string="res_config_contents" position="replace">
-                      <group colspan="4">
-                          <field colspan="4" name="view" nolabel="1"/>
-                    </group>
-                </group>
-                <xpath expr='//button[@name="action_skip"]' position='replace'/>
-              </data>
-            </field>
-        </record>
-
-        <record id="action_config_simple_view_form" model="ir.actions.act_window">
-            <field name="name">Configure Your Interface</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">res.config.view</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="view_confirm_simple_view_form"/>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
         
         <record id="category_administration_config" model="ir.actions.todo.category">
             <field name="name">Administration</field>
             <field name="sequence">1</field>
-        </record>         
-
-        <record id="config_wizard_simple_view" model="ir.actions.todo">
-            <field name="action_id" ref="action_config_simple_view_form"/>
-            <field name="category_id" ref="category_administration_config"/>
-            <field name="type">automatic</field>
-            <field name="sequence">1</field>
         </record>
-
     </data>
 </openerp>
diff --git a/openerp/addons/base/res/partner/partner_demo.xml b/openerp/addons/base/res/partner/partner_demo.xml
index c98ae837088..e8d8d540422 100644
--- a/openerp/addons/base/res/partner/partner_demo.xml
+++ b/openerp/addons/base/res/partner/partner_demo.xml
@@ -104,6 +104,7 @@
             <field name="name">Camptocamp</field>
             <field eval="[(6, 0, [ref('res_partner_category_10'), ref('res_partner_category_5')])]" name="category_id"/>
             <field name="supplier">1</field>
+            <field name="address" eval="[]"/>
         </record>
         <record id="res_partner_sednacom" model="res.partner">
             <field name="website">http://www.syleam.fr</field>
@@ -166,6 +167,7 @@
             <field name="user_id" ref="user_demo"/>
             <field eval="[(6, 0, [ref('res_partner_category_9')])]" name="category_id"/>
             <field name="supplier">1</field>
+            <field name="address" eval="[]"/>
         </record>
         <record id="res_partner_8" model="res.partner">
             <field name="website">http://mediapole.net</field>
@@ -317,7 +319,6 @@
             <field name="name">Thomas Passot</field>
             <field name="zip">1348</field>
             <field model="res.country" name="country_id" search="[('name','=','Belgium')]"/>
-            <field name="email">info@mediapole.net</field>
             <field name="phone">(+32).10.45.17.73</field>
             <field name="street">Rue de l'Angelique, 1</field>
             <field name="partner_id" ref="res_partner_8"/>
@@ -341,7 +342,7 @@
             <field name="partner_id" ref="res_partner_maxtor"/>
         </record>
         <record id="res_partner_address_6" model="res.partner.address">
-            <field name="city">Bruxelles</field>
+            <field name="city">Brussels</field>
             <field name="name">Etienne Lacarte</field>
             <field name="zip">2365</field>
             <field model="res.country" name="country_id" search="[('name','=','Belgium')]"/>
@@ -455,6 +456,48 @@
             <field name="street">Université de Liège</field>
             <field name="partner_id" ref="res_partner_accent"/>
         </record>
+        <record id="res_partner_address_Camptocamp" model="res.partner.address">
+            <field name="city">Lausanne</field>
+            <field name="name">Luc Maurer</field>
+            <field name="zip">1015</field>
+            <field name="phone">+41 21 619 10 04</field>
+            <field model="res.country" name="country_id" search="[('name','=','Switzerland')]"/>
+            <field name="street">PSE-A, EPFL </field>
+            <field name="type">default</field>
+            <field name="partner_id" ref="res_partner_c2c"/>
+        </record>
+        <record id="res_partner_address_seagate" model="res.partner.address">
+            <field name="city">Cupertino</field>
+            <field name="name">Seagate Technology</field>
+            <field name="zip">95014</field>
+            <field model="res.country" name="country_id" search="[('name','=','United States')]"/>
+            <field name="street">10200 S. De Anza Blvd</field>
+            <field name="type">default</field>
+            <field name="partner_id" ref="res_partner_seagate"/>
+        </record>
+        <record id="res_partner_address_thymbra" model="res.partner.address">
+            <field name="city">Buenos Aires</field>
+            <field name="name">Thymbra</field>
+            <field name="zip">1659</field>
+            <field name="email">contact@thymbra.ar</field>
+            <field name="street">Palermo, Capital Federal </field>
+            <field name="street2">C1414CMS Capital Federal </field>
+            <field name="phone">(5411) 4773-9666 </field>
+            <field model="res.country" name="country_id" search="[('name','=','Argentina')]"/>
+            <field name="type">default</field>
+            <field name="partner_id" ref="res_partner_thymbra"/>
+        </record>
+        <record id="res_partner_address_tinyatwork" model="res.partner.address">
+            <field name="city">Boston</field>
+            <field name="name">Tiny Work</field>
+            <field name="zip">5501</field>
+            <field name="email">info@tinyatwork.com</field>
+            <field name="phone">+33 (0) 2 33 31 22 10</field>
+            <field model="res.country" name="country_id" search="[('name','=','United States')]"/>
+            <field name="street">One Lincoln Street</field>
+            <field name="type">default</field>
+            <field name="partner_id" ref="res_partner_tinyatwork"/>
+        </record>
 
         <!--
         Resource: res.partner.address for Training
@@ -591,3 +634,4 @@
         </record>
     </data>
 </openerp>
+
diff --git a/openerp/addons/base/res/res_user.py b/openerp/addons/base/res/res_user.py
index 6582226c2d5..306ab6fa627 100644
--- a/openerp/addons/base/res/res_user.py
+++ b/openerp/addons/base/res/res_user.py
@@ -501,28 +501,6 @@ class users(osv.osv):
 
 users()
 
-class res_config_view(osv.osv_memory):
-    _name = 'res.config.view'
-    _inherit = 'res.config'
-    _columns = {
-        'name':fields.char('Name', size=64),
-        'view': fields.selection([('simple','Simplified'),
-                                  ('extended','Extended')],
-                                 'Interface', required=True ),
-    }
-    _defaults={
-        'view':lambda self,cr,uid,*args: self.pool.get('res.users').browse(cr, uid, uid).view or 'simple',
-    }
-
-    def execute(self, cr, uid, ids, context=None):
-        res = self.read(cr, uid, ids)[0]
-        self.pool.get('res.users').write(cr, uid, [uid],
-                                 {'view':res['view']}, context=context)
-
-res_config_view()
-
-
-
 #
 # Extension of res.groups and res.users with a relation for "implied" or 
 # "inherited" groups.  Once a user belongs to a group, it automatically belongs