diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 3bc8ff14ff6..68091a24df9 100755
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -89,13 +89,14 @@
                             <newline/>
                             <field name="mail_auto_registr"/>
                             <separator string="Registration Email" colspan="2"/>
-                            <field name="mail_registr" colspan="2" nolabel="1"/>
+                            <newline/>
+                            <field name="mail_registr" colspan="2"  nolabel="1"/>
                         </group>
                         <group col="2" colspan="2">
                             <separator string="Auto Confirmation Email" colspan="2"/>
                             <field name="mail_auto_confirm"/>
                             <newline/>
-                            <separator string="Confirmation Email" colspan="2"/>
+                            <separator string="Confirmation Email" colspan="4"/>
                             <field name="mail_confirm" colspan="2" nolabel="1"/>
                         </group>
                     </page>
diff --git a/addons/event/wizard/event_registration.py b/addons/event/wizard/event_registration.py
deleted file mode 100755
index 7640f040a99..00000000000
--- a/addons/event/wizard/event_registration.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero 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 Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import fields, osv
-
-class event_registration_list(osv.osv_memory):
-    """ List Event Registration """
-    
-    _name = "event.registration.list"
-    _description = "List Event Registrations"
-
-    def open_registration(self, cr, uid, ids, context={}):
-        """
-        Open Event Registration form
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of Event registration list's IDs
-        @param context: A standard dictionary for contextual values
-        @return: Dictionary value which open Event registration form.
-        """
-
-        if not context.get('active_id', None):
-            return {
-            'name': 'Event Registrations',
-            'view_type': 'form',
-            'view_mode': 'tree,form',
-            'res_model': 'event.registration',
-            'type': 'ir.actions.act_window'
-            }
-
-        return {
-            'domain': [('event_id', '=', context['active_id'])],
-            'name': 'Event Registrations',
-            'view_type': 'form',
-            'view_mode': 'tree,form',
-            'res_model': 'event.registration',
-            'type': 'ir.actions.act_window'
-        }
-
-event_registration_list()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/event/wizard/event_registration_view.xml b/addons/event/wizard/event_registration_view.xml
deleted file mode 100755
index 75d90d9991e..00000000000
--- a/addons/event/wizard/event_registration_view.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="view_event_registration" model="ir.ui.view">
-            <field name="name">List Event Registrations</field>
-            <field name="model">event.registration.list</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-              <form string="Event Registrations">
-                <group colspan="4" col="2">
-                    <separator string="List Event Registrations" colspan="4"/>
-
-                      <button special="cancel" string="Close" icon="gtk-close"/>
-                    <button name="open_registration" string="Open Registrations" type="object" icon="gtk-open"/>
-                </group>
-            </form>
-            </field>
-        </record>
-
-        <record id="action_event_registration" model="ir.actions.act_window">
-            <field name="name">Registrations</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">event.registration.list</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="view_event_registration"/>
-            <field name="context">{'record_id' : active_id}</field>
-            <field name="target">new</field>
-        </record>
-
-        <record model="ir.values" id="event_registration_values">
-            <field name="model_id" ref="event.model_event_event" />
-            <field name="object" eval="1" />
-            <field name="name">Event Registrations</field>
-            <field name="key2">client_action_multi</field>
-            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_event_registration'))" />
-            <field name="key">action</field>
-            <field name="model">event.event</field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/sale_crm/wizard/crm_make_sale_view.xml.moved b/addons/sale_crm/wizard/crm_make_sale_view.xml.moved
deleted file mode 100644
index 64b0585fb25..00000000000
--- a/addons/sale_crm/wizard/crm_make_sale_view.xml.moved
+++ /dev/null
@@ -1,43 +0,0 @@
-<openerp>
-   <data>
-
-        <!-- crm make sale's view -->
-
-       <record id="view_crm_make_sale" model="ir.ui.view">
-          <field name="name">crm.make.sale.form</field>
-          <field name="model">crm.make.sale</field>
-          <field name="type">form</field>
-          <field name="arch" type="xml">
-              <form string="Create a Sale Order" >
-                	<group colspan="4">
-	                	<field name="partner_id"/>
-	                	<field name="shop_id"/>
-	                	<field name="analytic_account"/>
-	                	<field name="picking_policy"/>
-	                	<field name="close"/>
-	                </group>
-	                <separator string="Products" colspan="4"/>
-	                <field name="product_ids" colspan="4" nolabel="1"/>
-                <separator colspan="4"/>
-                <group col="4" colspan="4">
-                    <label string="" colspan="2"/>
-                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                    <button name="makeOrder" string="Create" type="object" icon='gtk-go-forward'/>
-                </group>
-            </form>
-          </field>
-       </record>
-       
-       <!-- crm make sale's  action -->
-       
-       <record id="action_crm_make_sale" model="ir.actions.act_window">
-          <field name="name">Make Quotation</field>
-          <field name="type">ir.actions.act_window</field>
-          <field name="res_model">crm.make.sale</field>
-          <field name="view_type">form</field>
-          <field name="view_mode">form</field>
-          <field name="target">new</field>
-       </record>
-       
-   </data>
-</openerp>