Also removed a few unused imports bzr revid: xmo@openerp.com-20110210161042-aq414sd3i4p6abka
bzr revid: xmo@openerp.com-20100928123925-itlf8i4235nwax86