diff --git a/addons/mrp/stock.py b/addons/mrp/stock.py
index 1738ffe1065..476d8d00410 100644
--- a/addons/mrp/stock.py
+++ b/addons/mrp/stock.py
@@ -129,7 +129,6 @@ class StockMove(osv.osv):
         for move in self.browse(cr, uid, ids, context=context):
             new_moves = super(StockMove, self).action_scrap(cr, uid, [move.id], product_qty, location_id, context=context)
             #If we are not scrapping our whole move, tracking and lot references must not be removed
-            #self.write(cr, uid, [move.id], {'prodlot_id': False, 'tracking_id': False})
             production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])])
             for prod_id in production_ids:
                 production_obj.signal_button_produce(cr, uid, [prod_id])
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 6e8a56ad7f0..fbfcac36c32 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -513,7 +513,6 @@ class mrp_repair(osv.osv):
                     'partner_id': repair.address_id and repair.address_id.id or False,
                     'location_id': move.location_id.id,
                     'location_dest_id': move.location_dest_id.id,
-                    'tracking_id': False,
                     'state': 'done',
                 })
                 repair_line_obj.write(cr, uid, [move.id], {'move_id': move_id, 'state': 'done'}, context=context)
@@ -537,7 +536,6 @@ class mrp_repair(osv.osv):
                     'partner_id': repair.address_id and repair.address_id.id or False,
                     'location_id': repair.location_id.id,
                     'location_dest_id': repair.location_dest_id.id,
-                    'tracking_id': False,
                     'state': 'assigned',
                 })
                 pick_obj.signal_button_confirm(cr, uid, [picking])
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 91a56e329ef..2782f822149 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -724,7 +724,6 @@ class pos_order(osv.osv):
                     'product_id': line.product_id.id,
                     'product_uos_qty': abs(line.qty),
                     'product_uom_qty': abs(line.qty),
-                    'tracking_id': False,
                     'state': 'draft',
                     'location_id': location_id,
                     'location_dest_id': output_id,
diff --git a/addons/stock/report/lot_move_label.xml b/addons/stock/report/lot_move_label.xml
index cad14e70f68..028e244b894 100644
--- a/addons/stock/report/lot_move_label.xml
+++ b/addons/stock/report/lot_move_label.xml
@@ -6,7 +6,5 @@
         <variant type="field" name="product_id.variants"/>
         <uom type="field" name="product_uom.name"/>
         <quantity type="field" name="product_uom_qty"/>
-        <tracking type="field" name="tracking_id.name"/>
-        <serial type="field" name="tracking_id.serial"/>
     </lot-line>
 </lots>
diff --git a/addons/stock/report/lot_move_label.xsl b/addons/stock/report/lot_move_label.xsl
index 57b29e69405..73f99558932 100644
--- a/addons/stock/report/lot_move_label.xsl
+++ b/addons/stock/report/lot_move_label.xsl
@@ -54,10 +54,6 @@
 	<xsl:template match="lot-line" mode="story">
 		<para style="nospace"><xsl:value-of select="code"/><xsl:text>, </xsl:text><xsl:value-of select="quantity"/><xsl:text> </xsl:text><xsl:value-of select="uom"/></para>
 		<para style="nospace"><xsl:value-of select="product"/><xsl:text> </xsl:text><xsl:value-of select="variant"/></para>
-		<para style="nospace">Serial: <xsl:value-of select="serial"/></para>
-		<para style="nospace">Tracking: <xsl:value-of select="serial"/></para>
-		<spacer length="0.3cm"/>
-		<barCode><xsl:value-of select="tracking"/></barCode>
 		<nextFrame/>
 	</xsl:template>
 </xsl:stylesheet>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 7369d723ed1..b379b290ec3 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1401,8 +1401,8 @@ class stock_move(osv.osv):
                 'state': move.state,
                 'scrapped': True,
                 'location_dest_id': location_id,
-                'tracking_id': move.tracking_id.id,
-                'lot_id': move.lot_id.id,
+                #TODO lot_id is now on quant and not on move, need to do something for this
+                #'lot_id': move.lot_id.id,
             }
             new_move = self.copy(cr, uid, move.id, default_val)