diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
index 3742349425c..a33c3569e8e 100644
--- a/addons/stock/wizard/stock_fill_inventory.py
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@ -20,14 +20,7 @@
 ##############################################################################
 
 from osv import fields, osv
-from service import web_services
-from tools.misc import UpdateableStr, UpdateableDict
 from tools.translate import _
-import netsvc
-import pooler
-import time
-import wizard
-
 
 class stock_fill_inventory(osv.osv_memory):
     _name = "stock.fill.inventory"
diff --git a/addons/stock/wizard/stock_inventory_line_split.py b/addons/stock/wizard/stock_inventory_line_split.py
index 5c4e8f708d2..86a42d6da04 100644
--- a/addons/stock/wizard/stock_inventory_line_split.py
+++ b/addons/stock/wizard/stock_inventory_line_split.py
@@ -20,13 +20,9 @@
 ##############################################################################
 
 from osv import fields, osv
-from service import web_services
-from tools.misc import UpdateableStr, UpdateableDict
+
 from tools.translate import _
-import netsvc
-import pooler
 import time
-import wizard
 
 class stock_inventory_line_split(osv.osv_memory):
     _inherit = "stock.move.split"
@@ -105,7 +101,6 @@ class stock_inventory_line_split(osv.osv_memory):
                     if quantity_rest > 0:                        
                         update_val['product_qty'] = quantity_rest                                            
                         line_obj.write(cr, uid, [inv_line.id], update_val)
-
                     
         return new_line
 stock_inventory_line_split()
diff --git a/addons/stock/wizard/stock_inventory_set_stock_zero.py b/addons/stock/wizard/stock_inventory_set_stock_zero.py
index f72e4f088b0..93d79f24991 100644
--- a/addons/stock/wizard/stock_inventory_set_stock_zero.py
+++ b/addons/stock/wizard/stock_inventory_set_stock_zero.py
@@ -20,14 +20,7 @@
 ##############################################################################
 
 from osv import fields, osv
-from service import web_services
-from tools.misc import UpdateableStr, UpdateableDict
 from tools.translate import _
-import netsvc
-import pooler
-import time
-import wizard
-
 
 class inventory_set_stock_zero(osv.osv_memory):
     _name = "stock.inventory.set.stock.zero"
@@ -46,9 +39,9 @@ class inventory_set_stock_zero(osv.osv_memory):
         @param context: A standard dictionary 
         @return:  
         """            
-        invent_obj = pooler.get_pool(cr.dbname).get('stock.inventory')
-        invent_line_obj = pooler.get_pool(cr.dbname).get('stock.inventory.line')
-        prod_obj =  pooler.get_pool(cr.dbname).get('product.product')
+        invent_obj = self.pool.get('stock.inventory')
+        invent_line_obj = self.pool.get('stock.inventory.line')
+        prod_obj =  self.pool.get('product.product')
     
         if len(context['active_ids']) <> 1:
             raise osv.except_osv(_('Warning'), 
diff --git a/addons/stock/wizard/stock_invoice_onshipping.py b/addons/stock/wizard/stock_invoice_onshipping.py
index 377a40f3cb9..e1063e7d992 100644
--- a/addons/stock/wizard/stock_invoice_onshipping.py
+++ b/addons/stock/wizard/stock_invoice_onshipping.py
@@ -20,13 +20,8 @@
 ##############################################################################
 
 from osv import fields, osv
-from service import web_services
-from tools.misc import UpdateableStr, UpdateableDict
+
 from tools.translate import _
-import netsvc
-import pooler
-import time
-import wizard
 
 class stock_invoice_onshipping(osv.osv_memory):
     _name = "stock.invoice.onshipping"
diff --git a/addons/stock/wizard/stock_partial_move.py b/addons/stock/wizard/stock_partial_move.py
index 044dc131df0..01e8a712dca 100644
--- a/addons/stock/wizard/stock_partial_move.py
+++ b/addons/stock/wizard/stock_partial_move.py
@@ -20,10 +20,7 @@
 ##############################################################################
 
 from osv import fields, osv
-from service import web_services
 from tools.translate import _
-import netsvc
-import pooler
 import time
 
 class stock_partial_move(osv.osv_memory):
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index 009ef9323cf..ae5fd396d3e 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -18,11 +18,9 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 from osv import fields, osv
-from service import web_services
 from tools.translate import _
-import netsvc
-import pooler
 import time
 
 class stock_partial_picking(osv.osv_memory):
@@ -230,15 +228,5 @@ class stock_partial_picking(osv.osv_memory):
 stock_partial_picking()
 
 
-
-#_moves_arch_end = '''<?xml version="1.0"?>
-#<form string="Picking result">
-#    <label string="The picking has been successfully made !" colspan="4"/>
-#    <field name="back_order_notification" colspan="4" nolabel="1"/>
-#</form>'''
-
-#_moves_fields_end = {
-#    'back_order_notification': {'string':'Back Order' ,'type':'text', 'readonly':True}
-#                     }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/stock/wizard/stock_replacement.py b/addons/stock/wizard/stock_replacement.py
index 8b6c36f0f21..f1a1caced62 100644
--- a/addons/stock/wizard/stock_replacement.py
+++ b/addons/stock/wizard/stock_replacement.py
@@ -20,12 +20,8 @@
 ##############################################################################
 
 from osv import fields, osv
-from service import web_services
 from tools.translate import _
-import netsvc
-import pooler
 import time
-import wizard
 
 class stock_replacement(osv.osv_memory):
     """
diff --git a/addons/stock/wizard/stock_traceability.py b/addons/stock/wizard/stock_traceability.py
index d2fadb1d89c..b77b798a55a 100644
--- a/addons/stock/wizard/stock_traceability.py
+++ b/addons/stock/wizard/stock_traceability.py
@@ -19,11 +19,7 @@
 #
 ##############################################################################
 
-import wizard
-import netsvc
-import time
-import pooler
-from osv import osv
+from osv import fields, osv
 
 class action_traceability(osv.osv_memory):
     """ 
diff --git a/addons/stock/wizard/stock_ups.py b/addons/stock/wizard/stock_ups.py
index aeefcd0d106..8e182bb600c 100644
--- a/addons/stock/wizard/stock_ups.py
+++ b/addons/stock/wizard/stock_ups.py
@@ -18,13 +18,9 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
+
 from osv import fields, osv
-from service import web_services
 from tools.translate import _
-import netsvc
-import pooler
-import time
-import wizard
 
 class stock_ups(osv.osv_memory):
     _name = "stock.ups"
@@ -87,7 +83,6 @@ class stock_ups_upload(osv.osv_memory):
         """
         report = netsvc._group['report']['report.stock.move.lot.ups_xml']
         data['report_type'] = 'raw'
-#FIXME: this seems unfinished   
         fp = file('/tmp/test.xml', 'w').write(report.create(uid, context['active_id'], ids, {}))
         return {}