diff --git a/account_banking_uk_hsbc/__init__.py b/account_banking_uk_hsbc/__init__.py
index 4dd116675..b9c3e7a5e 100644
--- a/account_banking_uk_hsbc/__init__.py
+++ b/account_banking_uk_hsbc/__init__.py
@@ -22,5 +22,4 @@
 import account_banking_uk_hsbc
 import wizard
 import hsbc_mt940
-import payment_order_v5_fixes
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/account_banking_uk_hsbc/data/banking_export_hsbc.xml b/account_banking_uk_hsbc/data/banking_export_hsbc.xml
index 2db3483ac..e7614ebbf 100644
--- a/account_banking_uk_hsbc/data/banking_export_hsbc.xml
+++ b/account_banking_uk_hsbc/data/banking_export_hsbc.xml
@@ -6,18 +6,27 @@
             <field name="code">UKACH</field>
             <field name="suitable_bank_types"
                 eval="[(6,0,[ref('base_iban.bank_iban'),ref('base.bank_normal'),])]" />
+            <field name="ir_model_id"
+                ref="account_banking_uk_hsbc.model_banking_export_hsbc_wizard"/>
         </record>
         <record model="payment.type" id="export_faster_payment">
             <field name="name">Faster Payment</field>
             <field name="code">UKFP</field>
             <field name="suitable_bank_types"
                 eval="[(6,0,[ref('base.bank_normal'),])]" />
+            <field name="ir_model_id"
+                ref="account_banking_uk_hsbc.model_banking_export_hsbc_wizard"/>
         </record>
         <record model="payment.type" id="export_priority_payment">
             <field name="name">Priority Payment</field>
             <field name="code">UKPP</field>
             <field name="suitable_bank_types"
                 eval="[(6,0,[ref('base_iban.bank_iban'),ref('base.bank_normal'),])]" />
+            <field name="ir_model_id"
+                ref="account_banking_uk_hsbc.model_banking_export_hsbc_wizard"/>
         </record>
     </data>
 </openerp>
+
+
+
diff --git a/account_banking_uk_hsbc/payment_order_v5_fixes.py b/account_banking_uk_hsbc/payment_order_v5_fixes.py
deleted file mode 100644
index 042043e21..000000000
--- a/account_banking_uk_hsbc/payment_order_v5_fixes.py
+++ /dev/null
@@ -1,37 +0,0 @@
-##############################################################################
-#
-#    Copyright (C) 2009 EduSense BV (<http://www.edusense.nl>).
-#    Copyright (C) 2012 credativ, Ltd (<http://www.credativ.co.uk>).
-#    All Rights Reserved
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import osv, fields
-from datetime import date
-from tools.translate import _
-
-class payment_order(osv.osv):
-    '''
-    Attach export_clieop wizard to payment order and allow traceability
-    '''
-    _inherit = 'payment.order'
-    def get_wizard(self, type):
-        if type in ['UKACH', 'UKFP', 'UKPP']:
-            return self._module, 'model_banking_export_hsbc_wizard'
-        return super(payment_order, self).get_wizard(type)
-payment_order()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: