diff --git a/datamodels/2.x/itop-config-mgmt/data.sample.applicationsolutionci.xml b/datamodels/2.x/itop-config-mgmt/data.sample.applicationsolutionci.xml
index fb101b4b2..ceec05be4 100755
--- a/datamodels/2.x/itop-config-mgmt/data.sample.applicationsolutionci.xml
+++ b/datamodels/2.x/itop-config-mgmt/data.sample.applicationsolutionci.xml
@@ -1,33 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Set>
-<lnkApplicationSolutionToFunctionalCI alias="lnkApplicationSolutionToFunctionalCI" id="4">
-<applicationsolution_id>27</applicationsolution_id>
-<functionalci_id>21</functionalci_id>
-</lnkApplicationSolutionToFunctionalCI>
-<lnkApplicationSolutionToFunctionalCI alias="lnkApplicationSolutionToFunctionalCI" id="3">
-<applicationsolution_id>27</applicationsolution_id>
-<functionalci_id>26</functionalci_id>
-</lnkApplicationSolutionToFunctionalCI>
 <lnkApplicationSolutionToFunctionalCI alias="lnkApplicationSolutionToFunctionalCI" id="6">
 <applicationsolution_id>28</applicationsolution_id>
 <functionalci_id>20</functionalci_id>
 </lnkApplicationSolutionToFunctionalCI>
-<lnkApplicationSolutionToFunctionalCI alias="lnkApplicationSolutionToFunctionalCI" id="5">
-<applicationsolution_id>28</applicationsolution_id>
-<functionalci_id>25</functionalci_id>
-</lnkApplicationSolutionToFunctionalCI>
-<lnkApplicationSolutionToFunctionalCI alias="lnkApplicationSolutionToFunctionalCI" id="1">
-<applicationsolution_id>29</applicationsolution_id>
-<functionalci_id>19</functionalci_id>
-</lnkApplicationSolutionToFunctionalCI>
 <lnkApplicationSolutionToFunctionalCI alias="lnkApplicationSolutionToFunctionalCI" id="2">
 <applicationsolution_id>29</applicationsolution_id>
 <functionalci_id>22</functionalci_id>
 </lnkApplicationSolutionToFunctionalCI>
-<lnkApplicationSolutionToFunctionalCI alias="lnkApplicationSolutionToFunctionalCI" id="9">
-<applicationsolution_id>30</applicationsolution_id>
-<functionalci_id>24</functionalci_id>
-</lnkApplicationSolutionToFunctionalCI>
 <lnkApplicationSolutionToFunctionalCI alias="lnkApplicationSolutionToFunctionalCI" id="7">
 <applicationsolution_id>30</applicationsolution_id>
 <functionalci_id>27</functionalci_id>
diff --git a/datamodels/2.x/itop-config-mgmt/data.sample.dbschema.xml b/datamodels/2.x/itop-config-mgmt/data.sample.dbschema.xml
index 40516ce43..1ab626c77 100755
--- a/datamodels/2.x/itop-config-mgmt/data.sample.dbschema.xml
+++ b/datamodels/2.x/itop-config-mgmt/data.sample.dbschema.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Set>
-<DatabaseSchema alias="DatabaseSchema" id="19">
-<name>itop-demo</name>
-<description></description>
-<org_id>2</org_id>
-<business_criticity>low</business_criticity>
-<move2production></move2production>
-<dbserver_id>16</dbserver_id>
-</DatabaseSchema>
 <DatabaseSchema alias="DatabaseSchema" id="20">
 <name>openerpprod</name>
 <description></description>
@@ -16,12 +8,4 @@
 <move2production></move2production>
 <dbserver_id>17</dbserver_id>
 </DatabaseSchema>
-<DatabaseSchema alias="DatabaseSchema" id="21">
-<name>sugarcrmprod</name>
-<description></description>
-<org_id>2</org_id>
-<business_criticity>low</business_criticity>
-<move2production></move2production>
-<dbserver_id>18</dbserver_id>
-</DatabaseSchema>
 </Set>
diff --git a/datamodels/2.x/itop-config-mgmt/data.sample.dbserver.xml b/datamodels/2.x/itop-config-mgmt/data.sample.dbserver.xml
index a5ee16cfe..5496f8aaa 100755
--- a/datamodels/2.x/itop-config-mgmt/data.sample.dbserver.xml
+++ b/datamodels/2.x/itop-config-mgmt/data.sample.dbserver.xml
@@ -1,17 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Set>
-<DBserver alias="DBserver" id="16">
-<name>MySQL</name>
-<description></description>
-<org_id>2</org_id>
-<business_criticity>low</business_criticity>
-<move2production></move2production>
-<system_id>13</system_id>
-<software_id>1</software_id>
-<softwarelicence_id>0</softwarelicence_id>
-<path></path>
-<status></status>
-</DBserver>
 <DBserver alias="DBserver" id="17">
 <name>Oracle</name>
 <description></description>
@@ -24,16 +12,4 @@
 <path></path>
 <status></status>
 </DBserver>
-<DBserver alias="DBserver" id="18">
-<name>Oracle</name>
-<description></description>
-<org_id>2</org_id>
-<business_criticity>low</business_criticity>
-<move2production></move2production>
-<system_id>14</system_id>
-<software_id>2</software_id>
-<softwarelicence_id>0</softwarelicence_id>
-<path></path>
-<status></status>
-</DBserver>
 </Set>
diff --git a/datamodels/2.x/itop-config-mgmt/data.sample.organizations.xml b/datamodels/2.x/itop-config-mgmt/data.sample.organizations.xml
index 8d2bcc077..c7712a9b7 100755
--- a/datamodels/2.x/itop-config-mgmt/data.sample.organizations.xml
+++ b/datamodels/2.x/itop-config-mgmt/data.sample.organizations.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Set>
-<Organization alias="Organization" id="2">
-<name>Demo</name>
-<code></code>
-<status>active</status>
-<parent_id>0</parent_id>
-<deliverymodel_id></deliverymodel_id>
-</Organization>
 <Organization alias="Organization" id="3">
 <name>IT Department</name>
 <code>IT</code>
@@ -14,4 +7,16 @@
 <parent_id>0</parent_id>
 <deliverymodel_id></deliverymodel_id>
 </Organization>
+<DeliveryModel alias="DeliveryModel" id="2">
+<name>Standard support</name>
+<description></description>
+<org_id>3</org_id>
+</DeliveryModel>
+<Organization alias="Organization" id="2">
+<name>Demo</name>
+<code></code>
+<status>active</status>
+<parent_id>0</parent_id>
+<deliverymodel_id>2</deliverymodel_id>
+</Organization>
 </Set>
diff --git a/datamodels/2.x/itop-config-mgmt/data.sample.webapp.xml b/datamodels/2.x/itop-config-mgmt/data.sample.webapp.xml
index 391364e51..d487e75e6 100755
--- a/datamodels/2.x/itop-config-mgmt/data.sample.webapp.xml
+++ b/datamodels/2.x/itop-config-mgmt/data.sample.webapp.xml
@@ -9,22 +9,4 @@
 <webserver_id>23</webserver_id>
 <url></url>
 </WebApplication>
-<WebApplication alias="WebApplication" id="25">
-<name>Open ERP</name>
-<description></description>
-<org_id>2</org_id>
-<business_criticity>low</business_criticity>
-<move2production></move2production>
-<webserver_id>22</webserver_id>
-<url></url>
-</WebApplication>
-<WebApplication alias="WebApplication" id="26">
-<name>Sugar CRM</name>
-<description></description>
-<org_id>2</org_id>
-<business_criticity>high</business_criticity>
-<move2production></move2production>
-<webserver_id>22</webserver_id>
-<url></url>
-</WebApplication>
 </Set>
diff --git a/datamodels/2.x/itop-config-mgmt/data.sample.webserver.xml b/datamodels/2.x/itop-config-mgmt/data.sample.webserver.xml
index 207b9caa8..b8978cc10 100755
--- a/datamodels/2.x/itop-config-mgmt/data.sample.webserver.xml
+++ b/datamodels/2.x/itop-config-mgmt/data.sample.webserver.xml
@@ -1,17 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Set>
-<Webserver alias="Webserver" id="22">
-<name>Apache</name>
-<description></description>
-<org_id>2</org_id>
-<business_criticity>low</business_criticity>
-<move2production></move2production>
-<system_id>12</system_id>
-<software_id>0</software_id>
-<softwarelicence_id>0</softwarelicence_id>
-<path></path>
-<status></status>
-</Webserver>
 <Webserver alias="Webserver" id="23">
 <name>IIS</name>
 <description></description>