diff --git a/openerp/addons/base/base_data.xml b/openerp/addons/base/base_data.xml
index afe2291c516..05c4afee931 100644
--- a/openerp/addons/base/base_data.xml
+++ b/openerp/addons/base/base_data.xml
@@ -1058,16 +1058,10 @@
         <record id="main_partner" model="res.partner">
             <field name="name">Your Company</field>
             <!-- Address and Company ID will be set later -->
-            <field name="address" eval="[]"/>
             <field name="company_id" eval="None"/>
             <field name="customer" eval="False"/>
             <field name="is_company" eval="True"/>
         </record>
-        <record id="main_address" model="res.partner.address">
-            <field name="partner_id" ref="main_partner"/>
-            <field name="type">default</field>
-            <field name="company_id" eval="None"/>
-        </record>
 
         <!-- Currencies -->
         <record id="EUR" model="res.currency">
@@ -1103,9 +1097,6 @@
         <record id="main_partner" model="res.partner">
             <field name="company_id" ref="main_company"/>
         </record>
-        <record id="main_address" model="res.partner.address">
-            <field name="company_id" ref="main_company"/>
-        </record>
         <record id="EUR" model="res.currency">
             <field name="company_id" ref="main_company"/>
         </record>