diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index c9ee9f63732..0e0b1b4c848 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -1033,12 +1033,6 @@
                 id="menu_mrp_production_order_action" name="Order Planning"
                 parent="menu_mrp_planning" sequence="1"/>
 
-        <record id="act_product_mrp_bom_open" model="ir.actions.act_window">
-            <field name="name">BoM Structure</field>
-            <field name="context">{'default_product_tmpl_id': active_id}</field>
-            <field name="domain">[('product_tmpl_id', 'in', active_ids)]</field>
-            <field name="res_model">mrp.bom</field>
-        </record>
         <record model="ir.actions.act_window" id="product_open_bom">
             <field name="context">{'default_product_tmpl_id': active_id, 'search_default_product_tmpl_id': active_id}</field>
             <field name="name">Bill of Materials</field>
@@ -1061,10 +1055,6 @@
                         groups="mrp.group_mrp_user" attrs="{'invisible':[('type', '=', 'service')]}" icon="fa-flask">
                         <field string="Bill of Materials" name="bom_count" widget="statinfo" />
                     </button>
-                    <button class="oe_inline oe_stat_button" name="%(act_product_mrp_bom_open)d" type="action" 
-                        groups="mrp.group_mrp_user" attrs="{'invisible':[('type', '=', 'service')]}" icon="fa-flask">
-                        <field string="BoM Structure" name="bom_strct" widget="statinfo" />
-                    </button>
                     <button class="oe_inline oe_stat_button" name="%(act_product_mrp_production)d" type="action" 
                         groups="mrp.group_mrp_user" attrs="{'invisible':[('type', '=', 'service')]}" icon="fa-list-alt">
                         <field string="Manufacturing" name="mo_count" widget="statinfo" />
diff --git a/addons/mrp/product.py b/addons/mrp/product.py
index 90a02ccc4a2..97ef9cf0494 100644
--- a/addons/mrp/product.py
+++ b/addons/mrp/product.py
@@ -31,7 +31,6 @@ class product_template(osv.osv):
             nb = Bom.search_count(cr, uid, [('product_tmpl_id', '=', product_tmpl_id)], context=context)
             res[product_tmpl_id] = {
                 'bom_count': nb,
-                'bom_strct': nb,
             }
         return res
 
@@ -44,7 +43,6 @@ class product_template(osv.osv):
     _columns = {
         "bom_ids": fields.one2many('mrp.bom', 'product_tmpl_id','Bill of Materials'),
         'bom_count': fields.function(_bom_orders_count, string='# Bill of Material', type='integer', multi="_bom_order_count"),
-        'bom_strct': fields.function(_bom_orders_count, string='# Bill of Material Structure', type='integer', multi="_bom_order_count"),
         'mo_count': fields.function(_bom_orders_count_mo, string='# Manufacturing Orders', type='integer'),
     }
     def copy(self, cr, uid, id, default=None, context=None):
diff --git a/addons/product/product.py b/addons/product/product.py
index 58391d886d0..7baadb350f1 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -274,7 +274,7 @@ class product_category(osv.osv):
 
 
     _defaults = {
-        'type' : lambda *a : 'normal',
+        'type' : 'normal',
     }
 
     _parent_name = "parent_id"
@@ -372,7 +372,7 @@ class product_attribute_value(osv.osv):
         ('value_company_uniq', 'unique (name,attribute_id)', 'This attribute value already exists !')
     ]
     _defaults = {
-        'price_extra': lambda *a: 0.0,
+        'price_extra': 0.0,
     }
 
 class product_attribute_price(osv.osv):
@@ -410,6 +410,9 @@ class product_template(osv.osv):
         return self.write(cr, uid, [id], {'image': tools.image_resize_image_big(value)}, context=context)
 
     def _is_product_variant(self, cr, uid, ids, name, arg, context=None):
+        return self.is_product_variant(cr, uid, ids, name, arg, context=context)
+
+    def is_product_variant(self, cr, uid, ids, name, arg, context=None):
         prod = self.pool.get('product.product')
         res = dict.fromkeys(ids, False)
         ctx = dict(context, active_test=True)
@@ -417,6 +420,7 @@ class product_template(osv.osv):
             res[product.id] = prod.search(cr, uid, [('product_tmpl_id','=',product.id)], context=ctx, count=True) == 1
         return res
 
+
     def _product_template_price(self, cr, uid, ids, name, arg, context=None):
         plobj = self.pool.get('product.pricelist')
         res = {}
@@ -713,7 +717,7 @@ class product_template(osv.osv):
         'mes_type': 'fixed',
         'categ_id' : _default_category,
         'type' : 'consu',
-        'active': lambda *a: 1,
+        'active': True,
     }
 
     def _check_uom(self, cursor, user, ids, context=None):
@@ -829,7 +833,7 @@ class product_product(osv.osv):
             res[p.id] = (data['code'] and ('['+data['code']+'] ') or '') + (data['name'] or '')
         return res
 
-    def _is_product_variant(self, cr, uid, ids, name, arg, context=None):
+    def is_product_variant(self, cr, uid, ids, name, arg, context=None):
         return dict.fromkeys(ids, True)
 
     def _get_name_template_ids(self, cr, uid, ids, context=None):
@@ -854,20 +858,8 @@ class product_product(osv.osv):
             product.product_tmpl_id.write({'image': image}, context=context)
         return res
 
-    def _get_price_extra(self, cr, uid, ids, name, args, context=None):
-        result = dict.fromkeys(ids, False)
-        for product in self.browse(cr, uid, ids, context=context):
-            price_extra = 0.0
-            for variant_id in product.variant_ids:
-                for price_id in variant_id.price_ids:
-                    if price_id.product_tmpl_id.id == product.product_tmpl_id.id:
-                        price_extra += price_id.price_extra
-            result[product.id] = price_extra
-        return result
-
     _columns = {
         'price': fields.function(_product_price, type='float', string='Price', digits_compute=dp.get_precision('Product Price')),
-        'price_extra': fields.function(_get_price_extra, type='float', string='Sum of Variant Price Extra'),
         'lst_price': fields.function(_product_lst_price, type='float', string='Public Price', digits_compute=dp.get_precision('Product Price')),
         'code': fields.function(_product_code, type='char', string='Internal Reference'),
         'partner_ref' : fields.function(_product_partner_ref, type='char', string='Customer ref'),
@@ -875,7 +867,6 @@ class product_product(osv.osv):
         'active': fields.boolean('Active', help="If unchecked, it will allow you to hide the product without removing it."),
         'product_tmpl_id': fields.many2one('product.template', 'Product Template', required=True, ondelete="cascade", select=True),
         'ean13': fields.char('EAN13 Barcode', size=13, help="International Article Number used for product identification."),
-        'is_product_variant': fields.function( _is_product_variant, type='boolean', string='Only one product variant'),
         'packaging': fields.one2many('product.packaging', 'product_id', 'Packaging', help="Gives the different ways to package the same product. This has no impact on the picking order and is mainly used if you use the EDI module."),
         'name_template': fields.related('product_tmpl_id', 'name', string="Template Name", type='char', store={
             'product.template': (_get_name_template_ids, ['name'], 10),
@@ -900,7 +891,7 @@ class product_product(osv.osv):
     }
 
     _defaults = {
-        'active': lambda *a: 1,
+        'active': 1,
         'color': 0,
     }
 
@@ -1053,8 +1044,8 @@ class product_product(osv.osv):
     def create(self, cr, uid, vals, context=None):
         if context is None:
             context = {}
-        context.update(create_product_product=True)
-        return super(product_product, self).create(cr, uid, vals, context=context)
+        ctx = dict(context or {}, create_product_product=True)
+        return super(product_product, self).create(cr, uid, vals, context=ctx)
 
 
 class product_packaging(osv.osv):
@@ -1103,8 +1094,8 @@ class product_packaging(osv.osv):
         return (res and res[0]) or False
 
     _defaults = {
-        'rows' : lambda *a : 3,
-        'sequence' : lambda *a : 1,
+        'rows' : 3,
+        'sequence' : 1,
         'ul' : _get_1st_ul,
     }
 
@@ -1144,9 +1135,9 @@ class product_supplierinfo(osv.osv):
         'company_id':fields.many2one('res.company','Company',select=1),
     }
     _defaults = {
-        'qty': lambda *a: 0.0,
-        'sequence': lambda *a: 1,
-        'delay': lambda *a: 1,
+        'qty': 0.0,
+        'sequence': 1,
+        'delay': 1,
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'product.supplierinfo', context=c),
     }
     def price_get(self, cr, uid, supplier_ids, product_id, product_qty=1, context=None):