diff --git a/addons/l10n_multilang/__openerp__.py b/addons/l10n_multilang/__openerp__.py
index e32c70d91be..197a416cc44 100644
--- a/addons/l10n_multilang/__openerp__.py
+++ b/addons/l10n_multilang/__openerp__.py
@@ -29,13 +29,11 @@
         Analytic Chart of Accounts and Analytic Journals.
     * Setup wizard changes
         - Copy translations for COA, Tax, Tax Code and Fiscal Position from templates to target objects.
-        - Add option to install languages during the setup.
     """,
     'website': 'http://www.openerp.com',
     'init_xml': [],
     "depends" : ['account_accountant'],
     'update_xml': [
-            'l10n_multilang_demo.xml' 
                 ],
     'demo_xml': [
                 ],
diff --git a/addons/l10n_multilang/l10n_multilang_demo.xml b/addons/l10n_multilang/l10n_multilang_demo.xml
deleted file mode 100644
index a173cca6a2f..00000000000
--- a/addons/l10n_multilang/l10n_multilang_demo.xml
+++ /dev/null
@@ -1,357 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-  <data>
-
-        <!-- Account Types -->
-
-        <record model="account.account.type" id="account_type_receivable" >
-          <field name="name">Receivable</field>
-          <field name="code">receivable</field>
-          <field name="report_type">income</field>
-          <field name="close_method">unreconciled</field>
-        </record>
-
-        <record model="account.account.type" id="account_type_payable" >
-          <field name="name">Payable</field>
-          <field name="code">payable</field>
-          <field name="report_type">expense</field>
-          <field name="close_method">unreconciled</field>
-        </record>
-
-	    <record model="account.account.type" id="acct_type_asset_view">
-	        <field name="name">Asset View</field>
-	        <field name="code">asset</field>
-	        <field name="report_type">asset</field>
-	    </record>
-
-        <record model="account.account.type" id="account_type_view">
-          <field name="name">View</field>
-          <field name="code">view</field>
-          <field name="close_method">none</field>
-        </record>
-	    
-	    <record model="account.account.type" id="acct_type_liability_view">
-	        <field name="name">Liability View</field>
-	        <field name="code">liability</field>
-	        <field name="report_type">liability</field>
-	    </record>
-
-	    <record model="account.account.type" id="acct_type_asset_view">
-	        <field name="name">Asset View</field>
-	        <field name="code">asset</field>
-	        <field name="report_type">asset</field>
-	    </record>
-
-        <!-- Chart template (will be completed later) -->
-        <record id="account_chart_template_a" model="account.chart.template">
-            <field name="name">Demo Chart A</field>
-        </record>
-
-        <record id="account_chart_template_b" model="account.chart.template">
-            <field name="name">Demo Chart B</field>
-        </record>
-
-        <record id="account_chart_template_c" model="account.chart.template">
-            <field name="name">Demo Chart C</field>
-        </record>
-
-        <!-- Account Templates for A -->
-
-        <record model="account.account.template" id="chart_a_root">
-            <field name="name">Chart of Account A</field>
-            <field name="code">0</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="account_type_view"/>
-            <field name="reconcile" eval="False"/>
-            <field name="chart_template_id" ref="account_chart_template_a"/>
-        </record>
-
-        <record model="account.account.template" id="chart_a0">
-            <field name="name">Balance Sheet</field>
-            <field name="code">A00</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="account_type_view"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="chart_a_root"/>
-            <field name="chart_template_id" ref="account_chart_template_a"/>
-        </record>
-
-        <record model="account.account.template" id="chart_a1">
-            <field name="name">Profit and Loss</field>
-            <field name="code">A01</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="account_type_view"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="chart_a_root"/>
-            <field name="chart_template_id" ref="account_chart_template_a"/>
-        </record>
-
-        <record id="chart_a2" model="account.account.template">
-            <field name="code">A0011</field>
-            <field name="name">Bank Account A</field>
-            <field ref="chart_a0" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="account_type_view"/>
-            <field name="chart_template_id" ref="account_chart_template_a"/>
-        </record>
-        <record model="account.account.template" id="chart_a_receivable">
-            <field name="name">Debtors A</field>
-            <field name="code">A00025</field>
-            <field name="type">receivable</field>
-            <field name="user_type" ref="account_type_receivable"/>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="chart_a1"/>
-            <field name="chart_template_id" ref="account_chart_template_a"/>
-        </record>
-        <record model="account.account.template" id="chart_a_payable">
-            <field name="name">Creditors A</field>
-            <field name="code">A00026</field>
-            <field name="type">payable</field>
-            <field name="user_type" ref="account_type_payable"/>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="chart_a1"/>
-            <field name="chart_template_id" ref="account_chart_template_a"/>
-        </record>
-
-        <!-- Tax Code template for A-->
-        <record id="atax0" model="account.tax.code.template">
-            <field name="name">Tax Template Root A</field>
-        </record>
-
-        <record id="atax1" model="account.tax.code.template">
-            <field name="name">Base - 001 A</field>
-            <field name="parent_id" ref="atax0"/>
-        </record>
-
-        <record id="atax2" model="account.tax.code.template">
-            <field name="name">Tax - 002 A</field>
-            <field name="parent_id" ref="atax0"/>
-        </record>
-
-
-        <!-- Account Templates for B -->
-
-        <record model="account.account.template" id="chart_b1">
-            <field name="name">Assets B</field>
-            <field name="code">B00012</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="acct_type_asset_view"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="chart_a0"/>
-            <field name="chart_template_id" ref="account_chart_template_b"/>
-        </record>
-
-        <record model="account.account.template" id="chart_b2">
-            <field name="name">Liabilities B</field>
-            <field name="code">B00014</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="acct_type_liability_view"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="chart_a0"/>
-            <field name="chart_template_id" ref="account_chart_template_b"/>
-        </record>
-
-        <record model="account.account.template" id="chart_b3">
-            <field name="name">Income B</field>
-            <field name="code">B00021</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="account_type_receivable"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="chart_a1"/>
-            <field name="chart_template_id" ref="account_chart_template_b"/>
-        </record>
-
-        <record model="account.account.template" id="chart_b4">
-            <field name="name">Expense B</field>
-            <field name="code">B00024</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="account_type_payable"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="chart_a1"/>
-            <field name="chart_template_id" ref="account_chart_template_b"/>
-        </record>
-
-        <record model="account.account.template" id="chart_b5">
-            <field name="name">Creditors B</field>
-            <field name="code">B00025</field>
-            <field name="type">payable</field>
-            <field name="user_type" ref="account_type_payable"/>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="chart_a1"/>
-            <field name="chart_template_id" ref="account_chart_template_b"/>
-        </record>
-
-        <record id="chart_b6" model="account.account.template">
-            <field name="code">B0031</field>
-            <field name="name">Bank Account B</field>
-            <field ref="chart_b3" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="account_type_view"/>
-            <field name="chart_template_id" ref="account_chart_template_b"/>
-        </record>
-
-        <!-- Account Templates for C -->
-        <record model="account.account.template" id="chart_c_root">
-            <field name="name">Chart of Account C</field>
-            <field name="code">c0</field>
-            <field name="type">view</field>
-            <field ref="chart_a_root" name="parent_id"/>
-            <field name="user_type" ref="account_type_view"/>
-            <field name="reconcile" eval="False"/>
-            <field name="chart_template_id" ref="account_chart_template_c"/>
-        </record>
-
-        <record model="account.account.template" id="chart_c1">
-            <field name="name">Assets C</field>
-            <field name="code">C00012</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="acct_type_asset_view"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="chart_a1"/>
-            <field name="chart_template_id" ref="account_chart_template_c"/>
-        </record>
-
-        <record model="account.account.template" id="chart_c2">
-            <field name="name">Liabilities C</field>
-            <field name="code">C00014</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="acct_type_liability_view"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="chart_a1"/>
-            <field name="chart_template_id" ref="account_chart_template_c"/>
-        </record>
-
-        <record model="account.account.template" id="chart_c3">
-            <field name="name">Income C</field>
-            <field name="code">C00021</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="account_type_receivable"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="chart_a1"/> <!-- conflict: should we use the parent_id or the chart_templat_id? to find all the accounts to install?? -->
-            <field name="chart_template_id" ref="account_chart_template_c"/>
-        </record>
-
-        <record model="account.account.template" id="chart_c4">
-            <field name="name">Expense C</field>
-            <field name="code">C00024</field>
-            <field name="type">other</field>
-            <field name="user_type" ref="account_type_payable"/>
-            <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="chart_a1"/>
-            <field name="chart_template_id" ref="account_chart_template_c"/>
-        </record>
-
-        <record id="chart_c5" model="account.account.template">
-            <field name="code">C0026</field>
-            <field name="name">Bank Account C</field>
-            <field ref="chart_c3" name="parent_id"/>
-            <field name="type">view</field>
-            <field name="user_type" ref="account_type_view"/>
-            <field name="chart_template_id" ref="account_chart_template_c"/>
-        </record>
-
-        <!-- Chart template -->
-        <record id="account_chart_template_a" model="account.chart.template">
-            <field name="name">Demo Chart A</field>
-            <field name="account_root_id" ref="chart_a_root"/>
-            <field name="tax_code_root_id" ref="atax0"/>
-            <field name="bank_account_view_id" ref="chart_a2"/>
-            <field name="property_account_receivable" ref="chart_a_receivable"/>
-            <field name="property_account_payable" ref="chart_a_payable"/>
-        </record>
-
-        <record id="account_chart_template_b" model="account.chart.template">
-            <field name="name">Demo Chart B</field>
-            <field name="account_root_id" ref="chart_a_root"/>
-            <field name="tax_code_root_id" ref="atax0"/>
-            <field name="bank_account_view_id" ref="chart_b6"/>
-            <field name="parent_id" ref="account_chart_template_a"/>
-            <field name="property_account_payable" ref="chart_b5"/>
-        </record>
-
-        <record id="account_chart_template_c" model="account.chart.template">
-            <field name="name">Demo Chart C</field>
-            <field name="account_root_id" ref="chart_c_root"/>
-            <field name="tax_code_root_id" ref="atax0"/>
-            <field name="bank_account_view_id" ref="chart_c5"/>
-            <field name="parent_id" ref="account_chart_template_a"/>
-            <field name="property_account_expense" ref="chart_c4"/>
-        </record>
-
-        <!-- Tax for template A-->
-        <record id="tax_temp_21" model="account.tax.template">
-            <field name="sequence">10</field>
-            <field name="description">Tax 21%</field>
-            <field name="name">Tax 21%</field>
-            <field name="amount">0.21</field>
-            <field name="type">percent</field>
-            <field name="chart_template_id" ref="account_chart_template_a"/>
-            <field name="base_code_id" ref="atax1"/>
-            <field name="tax_code_id" ref="atax2"/>
-        </record>
-
-        <record id="tax_temp_6" model="account.tax.template">
-            <field name="sequence">15</field>
-            <field name="description">VAT 6%</field>
-            <field name="name">VAT 6%</field>
-            <field name="amount">0.6</field>
-            <field name="type">percent</field>
-            <field name="chart_template_id" ref="account_chart_template_a"/>
-            <field name="base_code_id" ref="atax1"/>
-            <field name="tax_code_id" ref="atax2"/>
-            <field name="ref_base_code_id" ref="atax1"/>
-            <field name="ref_tax_code_id" ref="atax2"/>
-        </record>
-
-
-        <!-- Tax for template B-->
-        <record id="tax_temp_4" model="account.tax.template">
-            <field name="sequence">12</field>
-            <field name="description">VAT 4%</field>
-            <field name="name">VAT 4%</field>
-            <field name="amount">0.4</field>
-            <field name="type">percent</field>
-            <field name="chart_template_id" ref="account_chart_template_b"/>
-            <field name="base_code_id" ref="atax1"/>
-            <field name="tax_code_id" ref="atax2"/>
-            <field name="ref_base_code_id" ref="atax1"/>
-            <field name="ref_tax_code_id" ref="atax2"/>
-        </record>
-
-        <record id="tax_temp_12" model="account.tax.template">
-            <field name="sequence">12</field>
-            <field name="description">Tax 12%</field>
-            <field name="name">Tax 12%</field>
-            <field name="amount">0.12</field>
-            <field name="type">percent</field>
-            <field name="chart_template_id" ref="account_chart_template_b"/>
-            <field name="base_code_id" ref="atax1"/>
-            <field name="tax_code_id" ref="atax2"/>
-        </record>
-
-        <!-- account.fiscal.position.template -->
-        <record id="acc_fisc_pos_temp_a" model="account.fiscal.position.template">
-            <field name="name">Fiscal Position Template A</field>
-            <field name="chart_template_id" ref="account_chart_template_a"/>
-        </record>
- 
-        <record id="acc_fisc_pos_temp_b" model="account.fiscal.position.template">
-            <field name="name">Fiscal Position Template B</field>
-            <field name="chart_template_id" ref="account_chart_template_b"/>
-        </record>
-
-        <record id="acc_fisc_pos_tax_temp_a" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="acc_fisc_pos_temp_a"/>
-            <field name="tax_src_id" ref="tax_temp_6"/>
-            <field name="tax_dest_id" ref="tax_temp_21"/>
-        </record>
-
-        <record id="acc_fisc_pos_acc_temp_b" model="account.fiscal.position.account.template">
-            <field name="position_id" ref="acc_fisc_pos_temp_b" />
-            <field name="account_src_id" ref="chart_b4" />
-            <field name="account_dest_id" ref="chart_b5" />
-        </record>
-
-  </data>
-</openerp>
-