Also, use local imports of itools where this is still necessary,  and remove all mention of itools from ERP5 code.