diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 232c8383361..f84d5bd5b69 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -74,7 +74,6 @@ between mails and Open ERP.""",
 
         'wizard/crm_send_email_view.xml',
         'wizard/crm_email_add_cc_view.xml',
-        'crm_wizard.xml',
         'crm_view.xml',
 
         'crm_action_rule_view.xml',
diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index ab2ad042bce..bc6638601c2 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -13,13 +13,12 @@
             <field eval="'Luc Latour'" name="name"/>
             <field eval="'open'" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
-            <field eval="'Michel Lafont'" name="partner_name2"/>
-            <field eval="'(726) 782-0636'" name="partner_mobile"/>
+            <field eval="'(726) 782-0636'" name="mobile"/>
             <field eval="1" name="active"/>
             <field name="categ_id" ref="crm.categ_oppor6"/>
             <field name="stage_id" ref="crm.stage_lead1"/>
             <field eval="'The Oil Company'" name="partner_name"/>
-            <field eval="'(769) 703-274'" name="partner_phone"/>
+            <field eval="'(769) 703-274'" name="phone"/>
         </record>
         <record id="crm_case_electonicgoodsdealer0" model="crm.lead">
             <field name="type_id" ref="crm.type_lead7"/>
@@ -28,13 +27,12 @@
             <field eval="'Marc Dufour'" name="name"/>
             <field eval="'open'" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
-            <field eval="'Luc Latour'" name="partner_name2"/>
-            <field eval="'(392) 895-7917'" name="partner_mobile"/>
+            <field eval="'(392) 895-7917'" name="mobile"/>
             <field eval="1" name="active"/>
             <field name="categ_id" ref="crm.categ_oppor2"/>
             <field name="stage_id" ref="crm.stage_lead2"/>
             <field eval="'Le Club SARL'" name="partner_name"/>
-            <field eval="'(956) 293-2595'" name="partner_phone"/>
+            <field eval="'(956) 293-2595'" name="phone"/>
         </record>
         <record id="crm_case_developingwebapplications0" model="crm.lead">
             <field name="type_id" ref="crm.type_lead5"/>
@@ -43,13 +41,12 @@
             <field eval="'Fabien Pinckaers'" name="name"/>
             <field eval="'done'" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
-            <field eval="'Mike Gardner'" name="partner_name2"/>
-            <field eval="'(820) 167-3208'" name="partner_mobile"/>
+            <field eval="'(820) 167-3208'" name="mobile"/>
             <field eval="1" name="active"/>
             <field name="categ_id" ref="crm.categ_oppor4"/>
             <field name="stage_id" ref="crm.stage_lead4"/>
             <field eval="'TheKompany'" name="partner_name"/>
-            <field eval="'(079) 681-2139'" name="partner_phone"/>
+            <field eval="'(079) 681-2139'" name="phone"/>
             <field eval="'contact@tecsas.fr'" name="email_from"/>
         </record>
         <record id="crm_case_qrecorp0" model="crm.lead">
@@ -59,12 +56,12 @@
             <field eval="'Henry Mc Coy'" name="name"/>
             <field eval="'draft'" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
-            <field eval="'(077) 582-4035'" name="partner_mobile"/>
+            <field eval="'(077) 582-4035'" name="mobile"/>
             <field eval="1" name="active"/>
             <field name="categ_id" ref="crm.categ_oppor1"/>
             <field name="stage_id" ref="crm.stage_lead1"/>
             <field eval="'The Gas Company'" name="partner_name"/>
-            <field eval="'(514) 698-4118'" name="partner_phone"/>
+            <field eval="'(514) 698-4118'" name="phone"/>
         </record>
         <record id="crm_case_itdeveloper0" model="crm.lead">
             <field name="type_id" ref="crm.type_lead4"/>
@@ -73,13 +70,12 @@
             <field eval="'Carrie Helle'" name="name"/>
             <field eval="'pending'" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
-            <field eval="'Sam Stone'" name="partner_name2"/>
-            <field eval="'(333) 715-1450'" name="partner_mobile"/>
+            <field eval="'(333) 715-1450'" name="mobile"/>
             <field eval="1" name="active"/>
             <field name="categ_id" ref="crm.categ_oppor6"/>
             <field name="stage_id" ref="crm.stage_lead3"/>
             <field eval="'Stonage IT'" name="partner_name"/>
-            <field eval="'(855) 924-4364'" name="partner_phone"/>
+            <field eval="'(855) 924-4364'" name="phone"/>
         </record>
         <record id="crm_case_mgroperations0" model="crm.lead">
             <field name="partner_address_id" ref="base.res_partner_address_1"/>
@@ -91,12 +87,11 @@
             <field eval="'Tina Pinero'" name="name"/>
             <field eval="'cancel'" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
-            <field eval="'Benoit Mortier'" name="partner_name2"/>
-            <field eval="'(468) 017-2684'" name="partner_mobile"/>
+            <field eval="'(468) 017-2684'" name="mobile"/>
             <field name="categ_id" ref="crm.categ_oppor8"/>
             <field name="stage_id" ref="crm.stage_lead6"/>
             <field eval="'Opensides SPRL'" name="partner_name"/>
-            <field eval="'(373) 907-1009'" name="partner_phone"/>
+            <field eval="'(373) 907-1009'" name="phone"/>
             <field eval="'info@opensides.be'" name="email_from"/>
         </record>
         <record id="crm_case_vpoperations0" model="crm.lead">
@@ -107,12 +102,11 @@
             <field eval="'Wendi Baltz'" name="name"/>
             <field eval="'done'" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
-            <field eval="'Will Smith'" name="partner_name2"/>
-            <field eval="'(463) 014-1208'" name="partner_mobile"/>
+            <field eval="'(463) 014-1208'" name="mobile"/>
             <field name="categ_id" ref="crm.categ_oppor4"/>
             <field name="stage_id" ref="crm.stage_lead4"/>
             <field eval="'Gardner Group'" name="partner_name"/>
-            <field eval="'(282) 603-7489'" name="partner_phone"/>
+            <field eval="'(282) 603-7489'" name="phone"/>
         </record>
     </data>
 </openerp>
diff --git a/addons/crm/crm_opportunity_demo.xml b/addons/crm/crm_opportunity_demo.xml
index 08976720a0f..e88e0f1ec8e 100644
--- a/addons/crm/crm_opportunity_demo.xml
+++ b/addons/crm/crm_opportunity_demo.xml
@@ -11,13 +11,11 @@
             <field eval="60" name="probability"/>
             <field name="partner_address_id" ref="base.res_partner_address_zen"/>
             <field eval="1" name="active"/>
-            <field eval="17.0" name="duration"/>
             <field name="type_id" ref="crm.type_oppor1"/>
             <field name="partner_id" ref="base.res_partner_3"/>
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;open&quot;" name="state"/>
-            <field eval="75000.0" name="planned_cost"/>
             <field eval="85000.0" name="planned_revenue"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="time.strftime('%Y-%m-07 10:05:15')" name="date"/>
@@ -33,10 +31,8 @@
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;draft&quot;" name="state"/>
-            <field eval="30000.0" name="planned_cost"/>
             <field eval="45000.0" name="planned_revenue"/>
             <field eval="50" name="probability"/>
-            <field eval="8.0" name="duration"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="time.strftime('%Y-%m-05 12:25:15')" name="date"/>
             <field name="categ_id" ref="crm.categ_oppor5"/>
@@ -52,10 +48,8 @@
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;pending&quot;" name="state"/>
-            <field eval="50000.0" name="planned_cost"/>
             <field eval="55000.0" name="planned_revenue"/>
             <field eval="70" name="probability"/>
-            <field eval="10.0" name="duration"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="time.strftime('%Y-%m-14 13:55:10')" name="date"/>
             <field name="categ_id" ref="crm.categ_oppor7"/>
@@ -72,9 +66,7 @@
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_demo"/>
             <field eval="&quot;open&quot;" name="state"/>
-            <field eval="50000.0" name="planned_cost"/>
             <field eval="45000.0" name="planned_revenue"/>
-            <field eval="24.0" name="duration"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="time.strftime('%Y-%m-23 16:32:23')" name="date"/>
             <field name="categ_id" ref="crm.categ_oppor5"/>
@@ -86,12 +78,10 @@
             <field eval="80" name="probability"/>
             <field name="partner_address_id" ref="base.res_partner_address_wong"/>
             <field eval="1" name="active"/>
-            <field eval="2.25" name="duration"/>
             <field name="partner_id" ref="base.res_partner_maxtor"/>
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;done&quot;" name="state"/>
-            <field eval="25000.0" name="planned_cost"/>
             <field eval="42000.0" name="planned_revenue"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="time.strftime('%Y-%m-25 16:05:15')" name="date"/>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index fb2a9eaba5f..c208a91832b 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -248,7 +248,7 @@
         <field name="arch" type="xml">
             <graph string="Opportunity by Categories" type="bar" orientation="horizontal">
                 <field name="categ_id"/>
-                <field name="planned_cost" operator="+"/>
+                <field name="planned_revenue" operator="+"/>
                 <field name="state" group="True"/>
             </graph>
         </field>
diff --git a/addons/crm/crm_wizard.xml b/addons/crm/crm_wizard.xml
deleted file mode 100644
index abcb8520c66..00000000000
--- a/addons/crm/crm_wizard.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        
-    </data>
-</openerp>