diff --git a/test/setup/iTopDesignFormat/Convert-samples/1.6_to_1.7_2.expected.xml b/test/setup/iTopDesignFormat/Convert-samples/1.6_to_1.7_2.expected.xml
index 217ab6703..b13de9037 100644
--- a/test/setup/iTopDesignFormat/Convert-samples/1.6_to_1.7_2.expected.xml
+++ b/test/setup/iTopDesignFormat/Convert-samples/1.6_to_1.7_2.expected.xml
@@ -14,24 +14,4 @@
   <constants>
     <constant id="RESPONSE_TICKET_SLT_QUERY" xsi:type="string" _created_in="itop-tickets" _revision_id="19" _delta="redefine"><![CDATA[SELECT slt FROM Organization AS child JOIN Organization AS root ON child.parent_id BELOW root.id JOIN CustomerContract AS cc ON cc.org_id=root.id JOIN lnkCustomerContractToService AS l1 ON l1.customercontract_id=cc.id JOIN SLA AS sla ON l1.sla_id=sla.id JOIN lnkSLAToSLT AS l2 ON l2.sla_id=sla.id JOIN SLT AS slt ON l2.slt_id=slt.id WHERE slt.metric = :metric AND l1.service_id = :this->service_id AND child.id= :this->org_id AND slt.request_type = :request_type AND slt.priority = :this->priority]]></constant>
   </constants>
-  <meta>
-    <previous_versions>
-      <previous_version_1_6>
-        <trashed_nodes>
-          <trashed_node id="XXX" _delta="define">
-            <parent_xpath>/itop_design/constants</parent_xpath>
-            <node_tree>
-              <constant id="PORTAL_SERVICECATEGORY_QUERY" xsi:type="string" _created_in="itop-tickets" _revision_id="19" _disabled_delta="redefine"><![CDATA[SELECT s FROM Organization AS child JOIN Organization AS root ON child.parent_id BELOW root.id JOIN CustomerContract AS cc ON cc.org_id = root.id JOIN lnkCustomerContractToService AS l1 ON l1.customercontract_id=cc.id JOIN Service AS s ON l1.service_id=s.id  WHERE child.id = :org_id AND s.status != 'obsolete' UNION SELECT Service AS s JOIN lnkCustomerContractToService AS l1 ON l1.service_id=s.id JOIN CustomerContract AS cc ON l1.customercontract_id=cc.id WHERE cc.org_id = :org_id AND s.status != 'obsolete']]></constant>
-            </node_tree>
-          </trashed_node>
-          <trashed_node id="XXX" _delta="define">
-            <parent_xpath>/itop_design/constants</parent_xpath>
-            <node_tree>
-              <constant id="PORTAL_VALIDATE_SERVICECATEGORY_QUERY" xsi:type="string" _created_in="itop-tickets" _revision_id="19" _disabled_delta="redefine"><![CDATA[SELECT s FROM Organization AS child JOIN Organization AS root ON child.parent_id BELOW root.id JOIN CustomerContract AS cc ON cc.org_id = root.id JOIN lnkCustomerContractToService AS l1 ON l1.customercontract_id=cc.id JOIN Service AS s ON l1.service_id=s.id  WHERE child.id = :org_id AND s.id = :id AND s.status != 'obsolete' UNION SELECT Service AS s JOIN lnkCustomerContractToService AS l1 ON l1.service_id=s.id JOIN CustomerContract AS cc ON l1.customercontract_id=cc.id WHERE cc.org_id = :org_id AND s.id = :id AND s.status != 'obsolete']]></constant>
-            </node_tree>
-          </trashed_node>
-        </trashed_nodes>
-      </previous_version_1_6>
-    </previous_versions>
-  </meta>
 </itop_design>
diff --git a/test/setup/iTopDesignFormat/Convert-samples/1.7_to_1.6_2.expected.xml b/test/setup/iTopDesignFormat/Convert-samples/1.7_to_1.6_2.expected.xml
index 673f9865b..f283afe4a 100644
--- a/test/setup/iTopDesignFormat/Convert-samples/1.7_to_1.6_2.expected.xml
+++ b/test/setup/iTopDesignFormat/Convert-samples/1.7_to_1.6_2.expected.xml
@@ -13,7 +13,5 @@
   </branding>
   <constants>
     <constant id="RESPONSE_TICKET_SLT_QUERY" xsi:type="string" _created_in="itop-tickets" _revision_id="19" _delta="redefine"><![CDATA[SELECT slt FROM Organization AS child JOIN Organization AS root ON child.parent_id BELOW root.id JOIN CustomerContract AS cc ON cc.org_id=root.id JOIN lnkCustomerContractToService AS l1 ON l1.customercontract_id=cc.id JOIN SLA AS sla ON l1.sla_id=sla.id JOIN lnkSLAToSLT AS l2 ON l2.sla_id=sla.id JOIN SLT AS slt ON l2.slt_id=slt.id WHERE slt.metric = :metric AND l1.service_id = :this->service_id AND child.id= :this->org_id AND slt.request_type = :request_type AND slt.priority = :this->priority]]></constant>
-    <constant id="PORTAL_SERVICECATEGORY_QUERY" xsi:type="string" _created_in="itop-tickets" _revision_id="19" _delta="redefine"><![CDATA[SELECT s FROM Organization AS child JOIN Organization AS root ON child.parent_id BELOW root.id JOIN CustomerContract AS cc ON cc.org_id = root.id JOIN lnkCustomerContractToService AS l1 ON l1.customercontract_id=cc.id JOIN Service AS s ON l1.service_id=s.id  WHERE child.id = :org_id AND s.status != 'obsolete' UNION SELECT Service AS s JOIN lnkCustomerContractToService AS l1 ON l1.service_id=s.id JOIN CustomerContract AS cc ON l1.customercontract_id=cc.id WHERE cc.org_id = :org_id AND s.status != 'obsolete']]></constant>
-    <constant id="PORTAL_VALIDATE_SERVICECATEGORY_QUERY" xsi:type="string" _created_in="itop-tickets" _revision_id="19" _delta="redefine"><![CDATA[SELECT s FROM Organization AS child JOIN Organization AS root ON child.parent_id BELOW root.id JOIN CustomerContract AS cc ON cc.org_id = root.id JOIN lnkCustomerContractToService AS l1 ON l1.customercontract_id=cc.id JOIN Service AS s ON l1.service_id=s.id  WHERE child.id = :org_id AND s.id = :id AND s.status != 'obsolete' UNION SELECT Service AS s JOIN lnkCustomerContractToService AS l1 ON l1.service_id=s.id JOIN CustomerContract AS cc ON l1.customercontract_id=cc.id WHERE cc.org_id = :org_id AND s.id = :id AND s.status != 'obsolete']]></constant>
   </constants>
 </itop_design>
diff --git a/test/setup/iTopDesignFormat/Convert-samples/1.7_to_1.6_2.input.xml b/test/setup/iTopDesignFormat/Convert-samples/1.7_to_1.6_2.input.xml
index 9437b2f80..b13de9037 100644
--- a/test/setup/iTopDesignFormat/Convert-samples/1.7_to_1.6_2.input.xml
+++ b/test/setup/iTopDesignFormat/Convert-samples/1.7_to_1.6_2.input.xml
@@ -14,24 +14,4 @@
   <constants>
     <constant id="RESPONSE_TICKET_SLT_QUERY" xsi:type="string" _created_in="itop-tickets" _revision_id="19" _delta="redefine"><![CDATA[SELECT slt FROM Organization AS child JOIN Organization AS root ON child.parent_id BELOW root.id JOIN CustomerContract AS cc ON cc.org_id=root.id JOIN lnkCustomerContractToService AS l1 ON l1.customercontract_id=cc.id JOIN SLA AS sla ON l1.sla_id=sla.id JOIN lnkSLAToSLT AS l2 ON l2.sla_id=sla.id JOIN SLT AS slt ON l2.slt_id=slt.id WHERE slt.metric = :metric AND l1.service_id = :this->service_id AND child.id= :this->org_id AND slt.request_type = :request_type AND slt.priority = :this->priority]]></constant>
   </constants>
-  <meta>
-    <previous_versions>
-      <previous_version_1_6>
-        <trashed_nodes>
-          <trashed_node id="1">
-            <parent_xpath>/itop_design/constants</parent_xpath>
-            <node_tree>
-              <constant id="PORTAL_SERVICECATEGORY_QUERY" xsi:type="string" _created_in="itop-tickets" _revision_id="19" _disabled_delta="redefine"><![CDATA[SELECT s FROM Organization AS child JOIN Organization AS root ON child.parent_id BELOW root.id JOIN CustomerContract AS cc ON cc.org_id = root.id JOIN lnkCustomerContractToService AS l1 ON l1.customercontract_id=cc.id JOIN Service AS s ON l1.service_id=s.id  WHERE child.id = :org_id AND s.status != 'obsolete' UNION SELECT Service AS s JOIN lnkCustomerContractToService AS l1 ON l1.service_id=s.id JOIN CustomerContract AS cc ON l1.customercontract_id=cc.id WHERE cc.org_id = :org_id AND s.status != 'obsolete']]></constant>
-            </node_tree>
-          </trashed_node>
-          <trashed_node id="2">
-            <parent_xpath>/itop_design/constants</parent_xpath>
-            <node_tree>
-              <constant id="PORTAL_VALIDATE_SERVICECATEGORY_QUERY" xsi:type="string" _created_in="itop-tickets" _revision_id="19" _disabled_delta="redefine"><![CDATA[SELECT s FROM Organization AS child JOIN Organization AS root ON child.parent_id BELOW root.id JOIN CustomerContract AS cc ON cc.org_id = root.id JOIN lnkCustomerContractToService AS l1 ON l1.customercontract_id=cc.id JOIN Service AS s ON l1.service_id=s.id  WHERE child.id = :org_id AND s.id = :id AND s.status != 'obsolete' UNION SELECT Service AS s JOIN lnkCustomerContractToService AS l1 ON l1.service_id=s.id JOIN CustomerContract AS cc ON l1.customercontract_id=cc.id WHERE cc.org_id = :org_id AND s.id = :id AND s.status != 'obsolete']]></constant>
-            </node_tree>
-          </trashed_node>
-        </trashed_nodes>
-      </previous_version_1_6>
-    </previous_versions>
-  </meta>
 </itop_design>
diff --git a/test/setup/iTopDesignFormat/Convert-samples/1.7_to_3.0.expected.xml b/test/setup/iTopDesignFormat/Convert-samples/1.7_to_3.0.expected.xml
index 2cfa47187..b11e6ed7d 100644
--- a/test/setup/iTopDesignFormat/Convert-samples/1.7_to_3.0.expected.xml
+++ b/test/setup/iTopDesignFormat/Convert-samples/1.7_to_3.0.expected.xml
@@ -8,12 +8,23 @@
           <variable id="var1">#C53030</variable>
         </variables>
         <imports>
+          <import id="css-variables" xsi:type="utilities">../css/css-variables.scss</import>
           <import id="scss-variables" xsi:type="utilities">../css/scss-variables.scss</import>
         </imports>
         <stylesheets>
+          <stylesheet id="jqueryui">../css/ui-lightness/jqueryui.scss</stylesheet>
+          <stylesheet id="main">../css/main.scss</stylesheet>
           <stylesheet id="custom">../css/custom.scss</stylesheet>
-          <stylesheet id="environment-banner">../css/backoffice/themes/page-banner.scss</stylesheet>
-          <stylesheet id="fullmoon">../css/backoffice/main.scss</stylesheet>
+        </stylesheets>
+      </theme>
+      <theme id="light-grey">
+        <variables/>
+        <imports>
+          <import id="css-variables" xsi:type="utilities">../css/css-variables.scss</import>
+        </imports>
+        <stylesheets>
+          <stylesheet id="jqueryui">../css/ui-lightness/jqueryui.scss</stylesheet>
+          <stylesheet id="main">../css/light-grey.scss</stylesheet>
         </stylesheets>
       </theme>
     </themes>
@@ -108,45 +119,4 @@
       </fields>
     </class>
   </classes>
-  <meta>
-    <previous_versions>
-      <previous_version_1_7>
-        <trashed_nodes>
-          <trashed_node id="XXX" _delta="define">
-            <parent_xpath>/itop_design/branding/themes</parent_xpath>
-            <node_tree>
-              <theme id="light-grey">
-                <variables/>
-                <imports>
-                  <import id="css-variables">../css/css-variables.scss</import>
-                </imports>
-                <stylesheets>
-                  <stylesheet id="jqueryui">../css/ui-lightness/jqueryui.scss</stylesheet>
-                  <stylesheet id="main">../css/light-grey.scss</stylesheet>
-                </stylesheets>
-              </theme>
-            </node_tree>
-          </trashed_node>
-          <trashed_node id="XXX" _delta="define">
-            <parent_xpath>/itop_design/branding/themes/theme[@id="test-red"]/imports</parent_xpath>
-            <node_tree>
-              <import id="css-variables">../css/css-variables.scss</import>
-            </node_tree>
-          </trashed_node>
-          <trashed_node id="XXX" _delta="define">
-            <parent_xpath>/itop_design/branding/themes/theme[@id="test-red"]/stylesheets</parent_xpath>
-            <node_tree>
-              <stylesheet id="jqueryui">../css/ui-lightness/jqueryui.scss</stylesheet>
-            </node_tree>
-          </trashed_node>
-          <trashed_node id="XXX" _delta="define">
-            <parent_xpath>/itop_design/branding/themes/theme[@id="test-red"]/stylesheets</parent_xpath>
-            <node_tree>
-              <stylesheet id="main">../css/main.scss</stylesheet>
-            </node_tree>
-          </trashed_node>
-        </trashed_nodes>
-      </previous_version_1_7>
-    </previous_versions>
-  </meta>
 </itop_design>
diff --git a/test/setup/iTopDesignFormat/Convert-samples/3.0_to_1.7.expected.xml b/test/setup/iTopDesignFormat/Convert-samples/3.0_to_1.7.expected.xml
index 68499ba8c..06929f52a 100644
--- a/test/setup/iTopDesignFormat/Convert-samples/3.0_to_1.7.expected.xml
+++ b/test/setup/iTopDesignFormat/Convert-samples/3.0_to_1.7.expected.xml
@@ -9,22 +9,9 @@
         </variables>
         <imports>
           <import id="scss-variables">../css/scss-variables.scss</import>
-          <import id="css-variables">../css/css-variables.scss</import>
         </imports>
         <stylesheets>
           <stylesheet id="custom">../css/custom.scss</stylesheet>
-          <stylesheet id="jqueryui">../css/ui-lightness/jqueryui.scss</stylesheet>
-          <stylesheet id="main">../css/main.scss</stylesheet>
-        </stylesheets>
-      </theme>
-      <theme id="light-grey">
-        <variables/>
-        <imports>
-          <import id="css-variables">../css/css-variables.scss</import>
-        </imports>
-        <stylesheets>
-          <stylesheet id="jqueryui">../css/ui-lightness/jqueryui.scss</stylesheet>
-          <stylesheet id="main">../css/light-grey.scss</stylesheet>
         </stylesheets>
       </theme>
     </themes>
@@ -91,4 +78,45 @@
   <branding>
     <main_logo _delta="define">images/itop-logo.png</main_logo>
   </branding>
+  <meta>
+    <previous_versions>
+      <previous_version_1_7>
+        <trashed_nodes>
+          <trashed_node id="XXX">
+            <parent_xpath>/itop_design/branding/themes</parent_xpath>
+            <node_tree>
+              <theme id="light-grey">
+                <variables/>
+                <imports>
+                  <import id="css-variables">../css/css-variables.scss</import>
+                </imports>
+                <stylesheets>
+                  <stylesheet id="jqueryui">../css/ui-lightness/jqueryui.scss</stylesheet>
+                  <stylesheet id="main">../css/light-grey.scss</stylesheet>
+                </stylesheets>
+              </theme>
+            </node_tree>
+          </trashed_node>
+          <trashed_node id="XXX">
+            <parent_xpath>/itop_design/branding/themes/theme[@id="test-red"]/imports</parent_xpath>
+            <node_tree>
+              <import id="css-variables">../css/css-variables.scss</import>
+            </node_tree>
+          </trashed_node>
+          <trashed_node id="XXX">
+            <parent_xpath>/itop_design/branding/themes/theme[@id="test-red"]/stylesheets</parent_xpath>
+            <node_tree>
+              <stylesheet id="jqueryui">../css/ui-lightness/jqueryui.scss</stylesheet>
+            </node_tree>
+          </trashed_node>
+          <trashed_node id="XXX">
+            <parent_xpath>/itop_design/branding/themes/theme[@id="test-red"]/stylesheets</parent_xpath>
+            <node_tree>
+              <stylesheet id="main">../css/main.scss</stylesheet>
+            </node_tree>
+          </trashed_node>
+        </trashed_nodes>
+      </previous_version_1_7>
+    </previous_versions>
+  </meta>
 </itop_design>
diff --git a/test/setup/iTopDesignFormat/Convert-samples/3.0_to_1.7_collision.expected.xml b/test/setup/iTopDesignFormat/Convert-samples/3.0_to_1.7_collision.expected.xml
deleted file mode 100644
index 641be65ab..000000000
--- a/test/setup/iTopDesignFormat/Convert-samples/3.0_to_1.7_collision.expected.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.0">
-  <branding>
-    <themes>
-      <theme id="test-red" _delta="define">
-        <variables>
-          <variable id="backoffice-environment-banner-background-color">#C53030</variable>
-          <variable id="var1">#C53030</variable>
-        </variables>
-        <imports>
-          <import id="scss-variables">../css/scss-variables.scss</import>
-        </imports>
-        <stylesheets>
-          <stylesheet id="custom">../css/custom.scss</stylesheet>
-        </stylesheets>
-      </theme>
-      <theme id="light-grey" _delta="define">
-        <totally_new_format>
-          bla bla bla
-        </totally_new_format>
-      </theme>
-    </themes>
-  </branding>
-  <classes>
-    <class id="ClassWithStateButNoLifecycle">
-      <properties>
-        <icon>images/class-with-lifecycle.png</icon>
-      </properties>
-    </class>
-    <class id="ClassWithStateAndLifecycle">
-      <properties>
-        <icon>images/class-with-lifecycle.png</icon>
-      </properties>
-      <lifecycle>
-        <attribute>foo</attribute>
-      </lifecycle>
-    </class>
-    <class id="ClassWithStateAndImage">
-      <properties>
-        <icon>images/class-with-lifecycle.png</icon>
-      </properties>
-    </class>
-    <class id="ClassWithImageOnly">
-      <properties>
-        <icon>images/class-with-lifecycle.png</icon>
-      </properties>
-    </class>
-    <class id="OtherClass">
-      <properties>
-        <icon revisionid="2" _delta="redefine">
-          <fileref ref="company_0faae3b9d86b7c382b2e4cdae570bc3c" revisionid="62"/>
-        </icon>
-      </properties>
-      <fields>
-        <field id="status" xsi:type="AttributeEnum">
-          <always_load_in_tables>true</always_load_in_tables>
-          <values>
-            <value id="new">new</value>
-            <value id="waiting_for_approval">waiting_for_approval</value>
-          </values>
-        </field>
-        <field id="operational_status" xsi:type="AttributeMetaEnum">
-          <values>
-            <value id="ongoing">ongoing</value>
-            <value id="resolved">resolved</value>
-          </values>
-        </field>
-      </fields>
-    </class>
-  </classes>
-  <menus>
-    <menu id="WelcomeMenuLink1" xsi:type="WebPageMenuNode" _delta="define">
-      <rank>100</rank>
-      <parent>WelcomeMenu</parent>
-      <url>$$http://fr.wikipedia.org/</url>
-      <in_new_window>true</in_new_window>
-    </menu>
-    <menu id="RequestManagement" xsi:type="MenuGroup" _delta="define">
-      <rank>30</rank>
-      <enable_stimulus/>
-    </menu>
-  </menus>
-  <branding>
-    <main_logo _delta="define">images/itop-logo.png</main_logo>
-  </branding>
-  <meta>
-    <previous_versions>
-      <previous_version_1_7>
-        <trashed_nodes>
-          <trashed_node id="XXX">
-            <parent_xpath>/itop_design/branding/themes</parent_xpath>
-            <node_tree>
-              <theme id="light-grey">
-                <variables/>
-                <imports>
-                  <import id="css-variables">../css/css-variables.scss</import>
-                </imports>
-                <stylesheets>
-                  <stylesheet id="jqueryui">../css/ui-lightness/jqueryui.scss</stylesheet>
-                  <stylesheet id="main">../css/light-grey.scss</stylesheet>
-                </stylesheets>
-              </theme>
-            </node_tree>
-          </trashed_node>
-          <trashed_node id="XXX">
-            <parent_xpath>/itop_design/branding/themes/theme[@id="test-red"]/imports</parent_xpath>
-            <node_tree>
-              <import id="css-variables">../css/css-variables.scss</import>
-            </node_tree>
-          </trashed_node>
-          <trashed_node id="XXX">
-            <parent_xpath>/itop_design/branding/themes/theme[@id="test-red"]/stylesheets</parent_xpath>
-            <node_tree>
-              <stylesheet id="jqueryui">../css/ui-lightness/jqueryui.scss</stylesheet>
-            </node_tree>
-          </trashed_node>
-          <trashed_node id="XXX">
-            <parent_xpath>/itop_design/branding/themes/theme[@id="test-red"]/stylesheets</parent_xpath>
-            <node_tree>
-              <stylesheet id="main">../css/main.scss</stylesheet>
-            </node_tree>
-          </trashed_node>
-        </trashed_nodes>
-      </previous_version_1_7>
-    </previous_versions>
-  </meta>
-</itop_design>
diff --git a/test/setup/iTopDesignFormat/Convert-samples/3.0_to_1.7_collision.input.xml b/test/setup/iTopDesignFormat/Convert-samples/3.0_to_1.7_collision.input.xml
deleted file mode 100644
index 1e185acab..000000000
--- a/test/setup/iTopDesignFormat/Convert-samples/3.0_to_1.7_collision.input.xml
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.0">
-  <branding>
-    <themes>
-      <theme id="test-red" _delta="define">
-        <variables>
-          <variable id="ibo-page-banner--background-color">#C53030</variable>
-          <variable id="var1">#C53030</variable>
-        </variables>
-        <imports>
-          <import id="scss-variables" xsi:type="utilities">../css/scss-variables.scss</import>
-        </imports>
-        <stylesheets>
-          <stylesheet id="custom">../css/custom.scss</stylesheet>
-        </stylesheets>
-      </theme>
-      <theme id="light-grey" _delta="define">
-        <totally_new_format>
-          bla bla bla
-        </totally_new_format>
-      </theme>
-    </themes>
-  </branding>
-  <classes>
-    <class id="ClassWithStateButNoLifecycle">
-      <properties>
-        <style>
-          <icon>images/class-with-lifecycle.png</icon>
-        </style>
-        <fields_semantic>
-          <state_attribute>foo</state_attribute>
-        </fields_semantic>
-      </properties>
-    </class>
-    <class id="ClassWithStateAndLifecycle">
-      <properties>
-        <style>
-          <icon>images/class-with-lifecycle.png</icon>
-        </style>
-        <fields_semantic>
-          <state_attribute>foo</state_attribute>
-        </fields_semantic>
-      </properties>
-      <lifecycle/>
-    </class>
-    <class id="ClassWithStateAndImage">
-      <properties>
-        <style>
-          <icon>images/class-with-lifecycle.png</icon>
-        </style>
-        <fields_semantic>
-          <state_attribute>foo</state_attribute>
-          <image_attribute>bar</image_attribute>
-        </fields_semantic>
-      </properties>
-    </class>
-    <class id="ClassWithImageOnly">
-      <properties>
-        <style>
-          <icon>images/class-with-lifecycle.png</icon>
-        </style>
-        <fields_semantic>
-          <image_attribute>bar</image_attribute>
-        </fields_semantic>
-      </properties>
-    </class>
-    <class id="OtherClass">
-      <properties>
-        <style>
-          <icon revisionid="2" _delta="redefine">
-            <fileref ref="company_0faae3b9d86b7c382b2e4cdae570bc3c" revisionid="62"/>
-          </icon>
-          <main_color>#4E79A5</main_color>
-          <complementary_color>white</complementary_color>
-        </style>
-      </properties>
-      <fields>
-        <field id="status" xsi:type="AttributeEnum">
-          <always_load_in_tables>true</always_load_in_tables>
-          <values>
-            <value id="new">
-              <code>new</code>
-              <style>
-                <main_color>#2C5382</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
-            </value>
-            <value id="waiting_for_approval">
-              <code>waiting_for_approval</code>
-            </value>
-          </values>
-          <default_style>
-            <main_color>#2B6CB0</main_color>
-            <complementary_color>#FFFFFF</complementary_color>
-            <decoration_classes/>
-          </default_style>
-        </field>
-        <field id="operational_status" xsi:type="AttributeMetaEnum">
-          <values>
-            <value id="ongoing">
-              <code>ongoing</code>
-              <style>
-                <main_color>#2C5382</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
-            </value>
-            <value id="resolved">
-              <code>resolved</code>
-            </value>
-          </values>
-          <default_style>
-            <main_color>#2B6CB0</main_color>
-            <complementary_color>#FFFFFF</complementary_color>
-            <decoration_classes/>
-          </default_style>
-        </field>
-      </fields>
-    </class>
-  </classes>
-  <menus>
-    <menu id="WelcomeMenuLink1" xsi:type="WebPageMenuNode" _delta="define">
-      <rank>100</rank>
-      <parent>WelcomeMenu</parent>
-      <url>$$http://fr.wikipedia.org/</url>
-      <in_new_window>true</in_new_window>
-    </menu>
-    <menu id="RequestManagement" xsi:type="MenuGroup" _delta="define">
-      <rank>30</rank>
-      <enable_stimulus/>
-      <style>
-        <decoration_classes>fas fa-comment-alt</decoration_classes>
-      </style>
-    </menu>
-  </menus>
-  <branding>
-    <main_logo _delta="define">images/itop-logo.png</main_logo>
-    <main_logo_compact _delta="define">images/itop-logo-square.png</main_logo_compact>
-  </branding>
-  <meta>
-    <previous_versions>
-      <previous_version_1_7>
-        <trashed_nodes>
-          <trashed_node id="1">
-            <parent_xpath>/itop_design/branding/themes</parent_xpath>
-            <node_tree>
-              <theme id="light-grey">
-                <variables/>
-                <imports>
-                  <import id="css-variables">../css/css-variables.scss</import>
-                </imports>
-                <stylesheets>
-                  <stylesheet id="jqueryui">../css/ui-lightness/jqueryui.scss</stylesheet>
-                  <stylesheet id="main">../css/light-grey.scss</stylesheet>
-                </stylesheets>
-              </theme>
-            </node_tree>
-          </trashed_node>
-          <trashed_node id="2">
-            <parent_xpath>/itop_design/branding/themes/theme[@id="test-red"]/imports</parent_xpath>
-            <node_tree>
-              <import id="css-variables">../css/css-variables.scss</import>
-            </node_tree>
-          </trashed_node>
-          <trashed_node id="3">
-            <parent_xpath>/itop_design/branding/themes/theme[@id="test-red"]/stylesheets</parent_xpath>
-            <node_tree>
-              <stylesheet id="jqueryui">../css/ui-lightness/jqueryui.scss</stylesheet>
-            </node_tree>
-          </trashed_node>
-          <trashed_node id="4">
-            <parent_xpath>/itop_design/branding/themes/theme[@id="test-red"]/stylesheets</parent_xpath>
-            <node_tree>
-              <stylesheet id="main">../css/main.scss</stylesheet>
-            </node_tree>
-          </trashed_node>
-        </trashed_nodes>
-      </previous_version_1_7>
-    </previous_versions>
-  </meta>
-</itop_design>
diff --git a/test/setup/iTopDesignFormat/Convert-samples/3.0_to_1.7_no_previous.expected.xml b/test/setup/iTopDesignFormat/Convert-samples/3.0_to_1.7_no_previous.expected.xml
deleted file mode 100644
index 9ced4254b..000000000
--- a/test/setup/iTopDesignFormat/Convert-samples/3.0_to_1.7_no_previous.expected.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.7">
-  <branding>
-    <themes>
-      <theme id="test-red" _delta="define">
-        <variables>
-          <variable id="backoffice-environment-banner-background-color">#C53030</variable>
-          <variable id="var1">#C53030</variable>
-        </variables>
-        <imports>
-          <import id="scss-variables">../css/scss-variables.scss</import>
-        </imports>
-        <stylesheets>
-          <stylesheet id="custom">../css/custom.scss</stylesheet>
-        </stylesheets>
-      </theme>
-    </themes>
-  </branding>
-  <classes>
-    <class id="ClassWithStateButNoLifecycle">
-      <properties>
-        <icon>images/class-with-lifecycle.png</icon>
-      </properties>
-    </class>
-    <class id="ClassWithStateAndLifecycle">
-      <properties>
-        <icon>images/class-with-lifecycle.png</icon>
-      </properties>
-      <lifecycle>
-        <attribute>foo</attribute>
-      </lifecycle>
-    </class>
-    <class id="ClassWithStateAndImage">
-      <properties>
-        <icon>images/class-with-lifecycle.png</icon>
-      </properties>
-    </class>
-    <class id="ClassWithImageOnly">
-      <properties>
-        <icon>images/class-with-lifecycle.png</icon>
-      </properties>
-    </class>
-    <class id="OtherClass">
-      <properties>
-        <icon revisionid="2" _delta="redefine">
-          <fileref ref="company_0faae3b9d86b7c382b2e4cdae570bc3c" revisionid="62"/>
-        </icon>
-      </properties>
-      <fields>
-        <field id="status" xsi:type="AttributeEnum">
-          <always_load_in_tables>true</always_load_in_tables>
-          <values>
-            <value id="new">new</value>
-            <value id="waiting_for_approval">waiting_for_approval</value>
-          </values>
-        </field>
-        <field id="operational_status" xsi:type="AttributeMetaEnum">
-          <values>
-            <value id="ongoing">ongoing</value>
-            <value id="resolved">resolved</value>
-          </values>
-        </field>
-      </fields>
-    </class>
-  </classes>
-  <menus>
-    <menu id="WelcomeMenuLink1" xsi:type="WebPageMenuNode" _delta="define">
-      <rank>100</rank>
-      <parent>WelcomeMenu</parent>
-      <url>$$http://fr.wikipedia.org/</url>
-      <in_new_window>true</in_new_window>
-    </menu>
-    <menu id="RequestManagement" xsi:type="MenuGroup" _delta="define">
-      <rank>30</rank>
-      <enable_stimulus/>
-    </menu>
-  </menus>
-  <branding>
-    <main_logo _delta="define">images/itop-logo.png</main_logo>
-  </branding>
-</itop_design>
diff --git a/test/setup/iTopDesignFormat/Convert-samples/3.0_to_1.7_no_previous.input.xml b/test/setup/iTopDesignFormat/Convert-samples/3.0_to_1.7_no_previous.input.xml
deleted file mode 100644
index 56bc62c19..000000000
--- a/test/setup/iTopDesignFormat/Convert-samples/3.0_to_1.7_no_previous.input.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.0">
-  <branding>
-    <themes>
-      <theme id="test-red" _delta="define">
-        <variables>
-          <variable id="ibo-page-banner--background-color">#C53030</variable>
-          <variable id="var1">#C53030</variable>
-        </variables>
-        <imports>
-          <import id="scss-variables" xsi:type="utilities">../css/scss-variables.scss</import>
-        </imports>
-        <stylesheets>
-          <stylesheet id="custom">../css/custom.scss</stylesheet>
-        </stylesheets>
-      </theme>
-    </themes>
-  </branding>
-  <classes>
-    <class id="ClassWithStateButNoLifecycle">
-      <properties>
-        <style>
-          <icon>images/class-with-lifecycle.png</icon>
-        </style>
-        <fields_semantic>
-          <state_attribute>foo</state_attribute>
-        </fields_semantic>
-      </properties>
-    </class>
-    <class id="ClassWithStateAndLifecycle">
-      <properties>
-        <style>
-          <icon>images/class-with-lifecycle.png</icon>
-        </style>
-        <fields_semantic>
-          <state_attribute>foo</state_attribute>
-        </fields_semantic>
-      </properties>
-      <lifecycle/>
-    </class>
-    <class id="ClassWithStateAndImage">
-      <properties>
-        <style>
-          <icon>images/class-with-lifecycle.png</icon>
-        </style>
-        <fields_semantic>
-          <state_attribute>foo</state_attribute>
-          <image_attribute>bar</image_attribute>
-        </fields_semantic>
-      </properties>
-    </class>
-    <class id="ClassWithImageOnly">
-      <properties>
-        <style>
-          <icon>images/class-with-lifecycle.png</icon>
-        </style>
-        <fields_semantic>
-          <image_attribute>bar</image_attribute>
-        </fields_semantic>
-      </properties>
-    </class>
-    <class id="OtherClass">
-      <properties>
-        <style>
-          <icon revisionid="2" _delta="redefine">
-            <fileref ref="company_0faae3b9d86b7c382b2e4cdae570bc3c" revisionid="62"/>
-          </icon>
-          <main_color>#4E79A5</main_color>
-          <complementary_color>white</complementary_color>
-        </style>
-      </properties>
-      <fields>
-        <field id="status" xsi:type="AttributeEnum">
-          <always_load_in_tables>true</always_load_in_tables>
-          <values>
-            <value id="new">
-              <code>new</code>
-              <style>
-                <main_color>#2C5382</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
-            </value>
-            <value id="waiting_for_approval">
-              <code>waiting_for_approval</code>
-            </value>
-          </values>
-          <default_style>
-            <main_color>#2B6CB0</main_color>
-            <complementary_color>#FFFFFF</complementary_color>
-            <decoration_classes/>
-          </default_style>
-        </field>
-        <field id="operational_status" xsi:type="AttributeMetaEnum">
-          <values>
-            <value id="ongoing">
-              <code>ongoing</code>
-              <style>
-                <main_color>#2C5382</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
-            </value>
-            <value id="resolved">
-              <code>resolved</code>
-            </value>
-          </values>
-          <default_style>
-            <main_color>#2B6CB0</main_color>
-            <complementary_color>#FFFFFF</complementary_color>
-            <decoration_classes/>
-          </default_style>
-        </field>
-      </fields>
-    </class>
-  </classes>
-  <menus>
-    <menu id="WelcomeMenuLink1" xsi:type="WebPageMenuNode" _delta="define">
-      <rank>100</rank>
-      <parent>WelcomeMenu</parent>
-      <url>$$http://fr.wikipedia.org/</url>
-      <in_new_window>true</in_new_window>
-    </menu>
-    <menu id="RequestManagement" xsi:type="MenuGroup" _delta="define">
-      <rank>30</rank>
-      <enable_stimulus/>
-      <style>
-        <decoration_classes>fas fa-comment-alt</decoration_classes>
-      </style>
-    </menu>
-  </menus>
-  <branding>
-    <main_logo _delta="define">images/itop-logo.png</main_logo>
-    <main_logo_compact _delta="define">images/itop-logo-square.png</main_logo_compact>
-  </branding>
-</itop_design>
diff --git a/test/setup/iTopDesignFormat/Convert-samples/Bug_4569.input.xml b/test/setup/iTopDesignFormat/Convert-samples/Bug_4569.input.xml
index 1a756ca73..e968b8677 100644
--- a/test/setup/iTopDesignFormat/Convert-samples/Bug_4569.input.xml
+++ b/test/setup/iTopDesignFormat/Convert-samples/Bug_4569.input.xml
@@ -24,33 +24,6 @@
       </fields>
     </class>
   </classes>
-  <meta>
-    <previous_versions>
-      <previous_version_1_7>
-        <trashed_nodes>
-          <trashed_node id="621c7aee3641d015166131" _delta="define">
-            <parent_xpath>/itop_design/branding/themes</parent_xpath>
-            <node_tree>
-              <theme id="light-grey" _disabled_delta="must_exist">
-                <variables _delta="redefine">
-                  <variable id="brand-primary">#8a765c</variable>
-                  <variable id="frame-background-color">lighten($brand-primary,50%)</variable>
-                  <variable id="main-header-background">$frame-background-color</variable>
-                  <variable id="complement-color">#996633</variable>
-                  <variable id="hyperlink-color">darken($complement-color,15%)</variable>
-                  <variable id="breadcrumb-text-highlight-color">darken($complement-color,15%)</variable>
-                  <variable id="search-criteria-more-less-details-color">darken($complement-color,15%)</variable>
-                  <variable id="complement-light">lighten(#dac292,15%)</variable>
-                  <variable id="hover-background-color">$complement-light</variable>
-                  <variable id="icons-filter">hue-rotate(42deg)</variable>
-                </variables>
-              </theme>
-            </node_tree>
-          </trashed_node>
-        </trashed_nodes>
-      </previous_version_1_7>
-    </previous_versions>
-  </meta>
   <files>
     <file id="vincent5_7a5f8e53c83cd6dabbded618c3d012d9" xsi:type="File" _delta="define_if_not_exists">
       <name>Vincent5.png</name>
@@ -64,5 +37,21 @@
     <main_logo _delta="define">
       <fileref ref="vincent5_7a5f8e53c83cd6dabbded618c3d012d9"/>
     </main_logo>
+    <themes>
+      <theme id="light-grey" _delta="must_exist">
+        <variables _delta="redefine">
+          <variable id="brand-primary">#8a765c</variable>
+          <variable id="frame-background-color">lighten($brand-primary,50%)</variable>
+          <variable id="main-header-background">$frame-background-color</variable>
+          <variable id="complement-color">#996633</variable>
+          <variable id="hyperlink-color">darken($complement-color,15%)</variable>
+          <variable id="breadcrumb-text-highlight-color">darken($complement-color,15%)</variable>
+          <variable id="search-criteria-more-less-details-color">darken($complement-color,15%)</variable>
+          <variable id="complement-light">lighten(#dac292,15%)</variable>
+          <variable id="hover-background-color">$complement-light</variable>
+          <variable id="icons-filter">hue-rotate(42deg)</variable>
+        </variables>
+      </theme>
+    </themes>
   </branding>
 </itop_design>
diff --git a/test/setup/iTopDesignFormat/iTopDesignFormatTest.php b/test/setup/iTopDesignFormat/iTopDesignFormatTest.php
index 7dc53bcb7..d302dd2fd 100644
--- a/test/setup/iTopDesignFormat/iTopDesignFormatTest.php
+++ b/test/setup/iTopDesignFormat/iTopDesignFormatTest.php
@@ -70,8 +70,6 @@ class TestForITopDesignFormatClass extends ItopTestCase
 			'1.7 to 1.6 2' => ['1.6', '1.7_to_1.6_2'],
 			'1.7 to 3.0' => ['3.0', '1.7_to_3.0'],
 			'3.0 to 1.7' => ['1.7', '3.0_to_1.7'],
-			'3.0 to 1.7 no previous' => ['1.7', '3.0_to_1.7_no_previous'],
-			'3.0 to 1.7 collision' => ['1.7', '3.0_to_1.7_collision', 1, 'Trying to restore an existing node /itop_design/branding/themes/theme[@id="light-grey"] from version 1.7'],
 		];
 	}
 
@@ -122,8 +120,6 @@ class TestForITopDesignFormatClass extends ItopTestCase
 	public function ConvertBackAndForthProvider()
 	{
 		return [
-			'1.6 to 1.7' => ['1.7', '1.6_to_1.7_2'],
-			'1.6 to 3.0' => ['3.0', '1.6_to_1.7_2'],
 			'1.7 to 3.0' => ['3.0', '1.7'],
 		];
 	}