diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0309f623c3..6db1d79547 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,10 @@ The project does _not_ follow Semantic Versioning and the changes are documented
 
 - Variability: The propagation of configuration updates to referencing configurations has been improved. Due to this optimization, it needs much less CPU time now.
 
+### Changed
+
+- Variability: Remove deprecated concepts `VariabilityModelChunk_old`, and some related concepts.
+
 
 ## November 2025
 
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.base/models/org.iets3.variability.base.structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.base/models/org.iets3.variability.base.structure.mps
index dd18d88dc6..7441bcea4e 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.base/models/org.iets3.variability.base.structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.base/models/org.iets3.variability.base.structure.mps
@@ -7,7 +7,6 @@
     <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
-    <import index="s6b7" ref="r:a7e2f963-3e46-49e0-a385-e8c7f33c91b7(org.iets3.variability.featuremodel.base.structure)" />
     <import index="l80j" ref="r:9e71c0de-f9ab-4b67-96cc-7d9c857513f6(org.iets3.analysis.base.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="vs0r" ref="r:f7764ca4-8c75-4049-922b-08516400a727(com.mbeddr.core.base.structure)" />
@@ -73,7 +72,7 @@
     <property role="TrG5h" value="EmptyVariabilityContent" />
     <property role="3GE5qa" value="container" />
     <property role="EcuMT" value="3989254429232912648" />
-    <ref role="1TJDcQ" to="s6b7:3tsFshP5d$8" resolve="EmptyVariabilityContent_old" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="3tsFshP5d$9" role="PzmwI">
       <ref role="PrY4T" node="3tsFshP5cTx" resolve="IVariabilityContent" />
     </node>
@@ -88,24 +87,18 @@
     <node concept="PrWs8" id="22kx7U4Kqjy" role="PrDN$">
       <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
     </node>
-    <node concept="PrWs8" id="51M$6hf3mdw" role="PrDN$">
-      <ref role="PrY4T" to="s6b7:22kx7U49GUn" resolve="IVariabilityContainer_old" />
-    </node>
   </node>
   <node concept="PlHQZ" id="3tsFshP5cTx">
     <property role="TrG5h" value="IVariabilityContent" />
     <property role="3GE5qa" value="container" />
     <property role="EcuMT" value="3989254429232909921" />
-    <node concept="PrWs8" id="51M$6hf3mdH" role="PrDN$">
-      <ref role="PrY4T" to="s6b7:3tsFshP5cTx" resolve="IVariabilityContent_old" />
-    </node>
   </node>
   <node concept="1TIwiD" id="3tsFshP56tQ">
     <property role="TrG5h" value="VariabilityModelChunk" />
     <property role="19KtqR" value="true" />
     <property role="3GE5qa" value="container" />
     <property role="EcuMT" value="3989254429232883574" />
-    <ref role="1TJDcQ" to="s6b7:3tsFshP56tQ" resolve="VariabilityModelChunk_old" />
+    <ref role="1TJDcQ" to="vs0r:6clJcrJYOUA" resolve="Chunk" />
     <node concept="PrWs8" id="22kx7U49GUo" role="PzmwI">
       <ref role="PrY4T" node="22kx7U49GUn" resolve="IVariabilityContainer" />
     </node>
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.base/models/org.iets3.variability.base.typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.base/models/org.iets3.variability.base.typesystem.mps
index 6da9b1c053..365a7fe20d 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.base/models/org.iets3.variability.base.typesystem.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.base/models/org.iets3.variability.base.typesystem.mps
@@ -5,7 +5,425 @@
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
     <devkit ref="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
   </languages>
-  <imports />
-  <registry />
+  <imports>
+    <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" implicit="true" />
+    <import index="rmn3" ref="r:2f587aa6-2d3f-4726-9564-7648183caf97(org.iets3.variability.base.structure)" implicit="true" />
+  </imports>
+  <registry>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
+      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
+      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
+        <child id="1197027771414" name="operand" index="2Oq$k0" />
+        <child id="1197027833540" name="operation" index="2OqNvi" />
+      </concept>
+      <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
+        <child id="1137022507850" name="body" index="2VODD2" />
+      </concept>
+      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
+        <property id="1070475926801" name="value" index="Xl_RC" />
+      </concept>
+      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <child id="1068431790190" name="initializer" index="33vP2m" />
+      </concept>
+      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
+        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
+      </concept>
+      <concept id="1225271283259" name="jetbrains.mps.baseLanguage.structure.NPEEqualsExpression" flags="nn" index="17R0WA" />
+      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
+        <child id="5680397130376446158" name="type" index="1tU5fm" />
+      </concept>
+      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
+        <child id="1068580123156" name="expression" index="3clFbG" />
+      </concept>
+      <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
+        <child id="1068580123160" name="condition" index="3clFbw" />
+        <child id="1068580123161" name="ifTrue" index="3clFbx" />
+      </concept>
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
+        <child id="1068581517665" name="statement" index="3cqZAp" />
+      </concept>
+      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
+        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
+      </concept>
+      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
+        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
+      </concept>
+      <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
+        <child id="1081773367579" name="rightExpression" index="3uHU7w" />
+        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
+      </concept>
+      <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
+        <child id="8356039341262087992" name="line" index="1aUNEU" />
+      </concept>
+    </language>
+    <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
+      <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
+        <child id="1199569906740" name="parameter" index="1bW2Oz" />
+        <child id="1199569916463" name="body" index="1bW5cS" />
+      </concept>
+    </language>
+    <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem">
+      <concept id="1175517767210" name="jetbrains.mps.lang.typesystem.structure.ReportErrorStatement" flags="nn" index="2MkqsV">
+        <child id="1175517851849" name="errorString" index="2MkJ7o" />
+      </concept>
+      <concept id="1216383170661" name="jetbrains.mps.lang.typesystem.structure.TypesystemQuickFix" flags="ng" index="Q5z_Y">
+        <child id="1216383424566" name="executeBlock" index="Q6x$H" />
+        <child id="1216383476350" name="quickFixArgument" index="Q6Id_" />
+        <child id="1216391046856" name="descriptionBlock" index="QzAvj" />
+      </concept>
+      <concept id="1216383287005" name="jetbrains.mps.lang.typesystem.structure.QuickFixExecuteBlock" flags="in" index="Q5ZZ6" />
+      <concept id="1216383482742" name="jetbrains.mps.lang.typesystem.structure.QuickFixArgument" flags="ng" index="Q6JDH">
+        <child id="1216383511839" name="argumentType" index="Q6QK4" />
+      </concept>
+      <concept id="1216390348809" name="jetbrains.mps.lang.typesystem.structure.QuickFixArgumentReference" flags="nn" index="QwW4i">
+        <reference id="1216390348810" name="quickFixArgument" index="QwW4h" />
+      </concept>
+      <concept id="1216390987552" name="jetbrains.mps.lang.typesystem.structure.QuickFixDescriptionBlock" flags="in" index="QznSV" />
+      <concept id="1195213580585" name="jetbrains.mps.lang.typesystem.structure.AbstractCheckingRule" flags="ig" index="18hYwZ">
+        <child id="1195213635060" name="body" index="18ibNy" />
+      </concept>
+      <concept id="1195214364922" name="jetbrains.mps.lang.typesystem.structure.NonTypesystemRule" flags="ig" index="18kY7G" />
+      <concept id="3937244445246642777" name="jetbrains.mps.lang.typesystem.structure.AbstractReportStatement" flags="ng" index="1urrMJ">
+        <child id="3937244445246643221" name="helginsIntention" index="1urrFz" />
+        <child id="3937244445246642781" name="nodeToReport" index="1urrMF" />
+      </concept>
+      <concept id="1210784285454" name="jetbrains.mps.lang.typesystem.structure.TypesystemIntention" flags="ng" index="3Cnw8n">
+        <property id="1216127910019" name="applyImmediately" index="ARO6o" />
+        <reference id="1216388525179" name="quickFix" index="QpYPw" />
+        <child id="1210784493590" name="actualArgument" index="3Coj4f" />
+      </concept>
+      <concept id="1210784384552" name="jetbrains.mps.lang.typesystem.structure.TypesystemIntentionArgument" flags="ng" index="3CnSsL">
+        <reference id="1216386999476" name="quickFixArgument" index="QkamJ" />
+        <child id="1210784642750" name="value" index="3CoRuB" />
+      </concept>
+      <concept id="1174642788531" name="jetbrains.mps.lang.typesystem.structure.ConceptReference" flags="ig" index="1YaCAy">
+        <reference id="1174642800329" name="concept" index="1YaFvo" />
+      </concept>
+      <concept id="1174648085619" name="jetbrains.mps.lang.typesystem.structure.AbstractRule" flags="ng" index="1YuPPy">
+        <child id="1174648101952" name="applicableNode" index="1YuTPh" />
+      </concept>
+      <concept id="1174650418652" name="jetbrains.mps.lang.typesystem.structure.ApplicableNodeReference" flags="nn" index="1YBJjd">
+        <reference id="1174650432090" name="applicableNode" index="1YBMHb" />
+      </concept>
+    </language>
+    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="7504436213544206332" name="jetbrains.mps.lang.smodel.structure.Node_ContainingLinkOperation" flags="nn" index="2NL2c5" />
+      <concept id="1171500988903" name="jetbrains.mps.lang.smodel.structure.Node_GetChildrenOperation" flags="nn" index="32TBzR" />
+      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
+      <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
+        <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
+      </concept>
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+    <language id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text">
+      <concept id="155656958578482948" name="jetbrains.mps.lang.text.structure.Word" flags="nn" index="3oM_SD">
+        <property id="155656958578482949" name="value" index="3oM_SC" />
+      </concept>
+      <concept id="2535923850359271782" name="jetbrains.mps.lang.text.structure.Line" flags="nn" index="1PaTwC">
+        <child id="2535923850359271783" name="elements" index="1PaTwD" />
+      </concept>
+    </language>
+    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
+      <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
+        <child id="1204796294226" name="closure" index="23t8la" />
+      </concept>
+      <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
+      <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
+        <child id="1151689745422" name="elementType" index="A3Ik2" />
+      </concept>
+      <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
+      <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
+    </language>
+  </registry>
+  <node concept="18kY7G" id="7P9C_8wgW0">
+    <property role="TrG5h" value="check_VariabilityModelChunk" />
+    <property role="3GE5qa" value="container" />
+    <node concept="3clFbS" id="7P9C_8wgW1" role="18ibNy">
+      <node concept="3SKdUt" id="3ZwMOJtywfK" role="3cqZAp">
+        <node concept="1PaTwC" id="3ZwMOJtywfL" role="1aUNEU">
+          <node concept="3oM_SD" id="3ZwMOJtywfM" role="1PaTwD">
+            <property role="3oM_SC" value="Because" />
+          </node>
+          <node concept="3oM_SD" id="3ZwMOJtywkT" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="3ZwMOJtywkV" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="3ZwMOJtywxr" role="1PaTwD">
+            <property role="3oM_SC" value="bug" />
+          </node>
+          <node concept="3oM_SD" id="3ZwMOJtywxs" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="3oM_SD" id="3ZwMOJtywxt" role="1PaTwD">
+            <property role="3oM_SC" value="early" />
+          </node>
+          <node concept="3oM_SD" id="3ZwMOJtywxu" role="1PaTwD">
+            <property role="3oM_SC" value="migration" />
+          </node>
+          <node concept="3oM_SD" id="3ZwMOJtywxv" role="1PaTwD">
+            <property role="3oM_SC" value="scripts," />
+          </node>
+          <node concept="3oM_SD" id="3ZwMOJtywxw" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="3ZwMOJtywxx" role="1PaTwD">
+            <property role="3oM_SC" value="child" />
+          </node>
+          <node concept="3oM_SD" id="3ZwMOJtywxy" role="1PaTwD">
+            <property role="3oM_SC" value="&quot;contents_old&quot;" />
+          </node>
+          <node concept="3oM_SD" id="3ZwMOJtywxz" role="1PaTwD">
+            <property role="3oM_SC" value="might" />
+          </node>
+          <node concept="3oM_SD" id="3ZwMOJtywx$" role="1PaTwD">
+            <property role="3oM_SC" value="be" />
+          </node>
+          <node concept="3oM_SD" id="3ZwMOJtywx_" role="1PaTwD">
+            <property role="3oM_SC" value="still" />
+          </node>
+          <node concept="3oM_SD" id="3ZwMOJtywxA" role="1PaTwD">
+            <property role="3oM_SC" value="stored" />
+          </node>
+          <node concept="3oM_SD" id="3ZwMOJtywxB" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="3oM_SD" id="3ZwMOJtywxC" role="1PaTwD">
+            <property role="3oM_SC" value="VariabilityModelChunk" />
+          </node>
+          <node concept="3oM_SD" id="3ZwMOJtywxD" role="1PaTwD">
+            <property role="3oM_SC" value="objects." />
+          </node>
+          <node concept="3oM_SD" id="3ZwMOJtywxE" role="1PaTwD">
+            <property role="3oM_SC" value="After" />
+          </node>
+          <node concept="3oM_SD" id="3ZwMOJtywxF" role="1PaTwD">
+            <property role="3oM_SC" value="removing" />
+          </node>
+          <node concept="3oM_SD" id="3ZwMOJtywxG" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="3ZwMOJtywxJ" role="1PaTwD">
+            <property role="3oM_SC" value="inheritance" />
+          </node>
+          <node concept="3oM_SD" id="3ZwMOJtywxK" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="3ZwMOJtywxL" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="3ZwMOJtywxM" role="1PaTwD">
+            <property role="3oM_SC" value="deprecated" />
+          </node>
+          <node concept="3oM_SD" id="3ZwMOJtywxN" role="1PaTwD">
+            <property role="3oM_SC" value="VariabilityModelChunk_old" />
+          </node>
+          <node concept="3oM_SD" id="3ZwMOJtywxO" role="1PaTwD">
+            <property role="3oM_SC" value="concept," />
+          </node>
+          <node concept="3oM_SD" id="3ZwMOJtywxP" role="1PaTwD">
+            <property role="3oM_SC" value="this" />
+          </node>
+          <node concept="3oM_SD" id="3ZwMOJtywxU" role="1PaTwD">
+            <property role="3oM_SC" value="induces" />
+          </node>
+          <node concept="3oM_SD" id="3ZwMOJtywxV" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="3ZwMOJtywxW" role="1PaTwD">
+            <property role="3oM_SC" value="model" />
+          </node>
+          <node concept="3oM_SD" id="3ZwMOJtywxX" role="1PaTwD">
+            <property role="3oM_SC" value="check" />
+          </node>
+          <node concept="3oM_SD" id="3ZwMOJtywxY" role="1PaTwD">
+            <property role="3oM_SC" value="error." />
+          </node>
+          <node concept="3oM_SD" id="3ZwMOJtywy5" role="1PaTwD">
+            <property role="3oM_SC" value="This" />
+          </node>
+          <node concept="3oM_SD" id="3ZwMOJtywy6" role="1PaTwD">
+            <property role="3oM_SC" value="checking" />
+          </node>
+          <node concept="3oM_SD" id="3ZwMOJtywy7" role="1PaTwD">
+            <property role="3oM_SC" value="rule" />
+          </node>
+          <node concept="3oM_SD" id="3ZwMOJtywy8" role="1PaTwD">
+            <property role="3oM_SC" value="has" />
+          </node>
+          <node concept="3oM_SD" id="3ZwMOJtywy9" role="1PaTwD">
+            <property role="3oM_SC" value="an" />
+          </node>
+          <node concept="3oM_SD" id="3ZwMOJtywya" role="1PaTwD">
+            <property role="3oM_SC" value="automatic" />
+          </node>
+          <node concept="3oM_SD" id="3ZwMOJtywyb" role="1PaTwD">
+            <property role="3oM_SC" value="quickfix" />
+          </node>
+          <node concept="3oM_SD" id="3ZwMOJtywyc" role="1PaTwD">
+            <property role="3oM_SC" value="which" />
+          </node>
+          <node concept="3oM_SD" id="3ZwMOJtywyd" role="1PaTwD">
+            <property role="3oM_SC" value="will" />
+          </node>
+          <node concept="3oM_SD" id="3ZwMOJtywye" role="1PaTwD">
+            <property role="3oM_SC" value="repair" />
+          </node>
+          <node concept="3oM_SD" id="3ZwMOJtywyf" role="1PaTwD">
+            <property role="3oM_SC" value="this." />
+          </node>
+        </node>
+      </node>
+      <node concept="3cpWs8" id="7P9C_8wyHZ" role="3cqZAp">
+        <node concept="3cpWsn" id="7P9C_8wyI0" role="3cpWs9">
+          <property role="TrG5h" value="toBeRemoved" />
+          <node concept="A3Dl8" id="7P9C_8wyGr" role="1tU5fm">
+            <node concept="3Tqbb2" id="7P9C_8wyGu" role="A3Ik2" />
+          </node>
+          <node concept="2OqwBi" id="7P9C_8wyI1" role="33vP2m">
+            <node concept="2OqwBi" id="7P9C_8wyI2" role="2Oq$k0">
+              <node concept="1YBJjd" id="7P9C_8wyI3" role="2Oq$k0">
+                <ref role="1YBMHb" node="7P9C_8wgW3" resolve="vmc" />
+              </node>
+              <node concept="32TBzR" id="7P9C_8wyI4" role="2OqNvi" />
+            </node>
+            <node concept="3zZkjj" id="7P9C_8wyI5" role="2OqNvi">
+              <node concept="1bVj0M" id="7P9C_8wyI6" role="23t8la">
+                <node concept="3clFbS" id="7P9C_8wyI7" role="1bW5cS">
+                  <node concept="3clFbF" id="7P9C_8wyI8" role="3cqZAp">
+                    <node concept="17R0WA" id="7P9C_8wyI9" role="3clFbG">
+                      <node concept="Xl_RD" id="7P9C_8wyIa" role="3uHU7w">
+                        <property role="Xl_RC" value="contents_old" />
+                      </node>
+                      <node concept="2OqwBi" id="7P9C_8wyIb" role="3uHU7B">
+                        <node concept="2OqwBi" id="7P9C_8wyIc" role="2Oq$k0">
+                          <node concept="37vLTw" id="7P9C_8wyId" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7P9C_8wyIg" resolve="it" />
+                          </node>
+                          <node concept="2NL2c5" id="7P9C_8wyIe" role="2OqNvi" />
+                        </node>
+                        <node concept="liA8E" id="7P9C_8wyIf" role="2OqNvi">
+                          <ref role="37wK5l" to="c17a:~SNamedElement.getName()" resolve="getName" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="gl6BB" id="7P9C_8wyIg" role="1bW2Oz">
+                  <property role="TrG5h" value="it" />
+                  <node concept="2jxLKc" id="7P9C_8wyIh" role="1tU5fm" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3clFbJ" id="7P9C_8wz1a" role="3cqZAp">
+        <node concept="3clFbS" id="7P9C_8wz1c" role="3clFbx">
+          <node concept="3clFbF" id="7P9C_8w_5K" role="3cqZAp">
+            <node concept="2OqwBi" id="7P9C_8w_Ci" role="3clFbG">
+              <node concept="37vLTw" id="7P9C_8w_5H" role="2Oq$k0">
+                <ref role="3cqZAo" node="7P9C_8wyI0" resolve="toBeRemoved" />
+              </node>
+              <node concept="2es0OD" id="7P9C_8w_On" role="2OqNvi">
+                <node concept="1bVj0M" id="7P9C_8w_Op" role="23t8la">
+                  <node concept="3clFbS" id="7P9C_8w_Oq" role="1bW5cS">
+                    <node concept="2MkqsV" id="7P9C_8w_PQ" role="3cqZAp">
+                      <node concept="Xl_RD" id="7P9C_8w_Ro" role="2MkJ7o">
+                        <property role="Xl_RC" value="Outdated child, to be removed" />
+                      </node>
+                      <node concept="1YBJjd" id="7P9C_8wAaM" role="1urrMF">
+                        <ref role="1YBMHb" node="7P9C_8wgW3" resolve="vmc" />
+                      </node>
+                      <node concept="3Cnw8n" id="7P9C_8wHjb" role="1urrFz">
+                        <property role="ARO6o" value="true" />
+                        <ref role="QpYPw" node="7P9C_8wHj8" resolve="fix_VariabilityModelChunk" />
+                        <node concept="3CnSsL" id="1gefDcXA_rt" role="3Coj4f">
+                          <ref role="QkamJ" node="7P9C_8wHun" resolve="toBeRemoved" />
+                          <node concept="37vLTw" id="1gefDcXA_ED" role="3CoRuB">
+                            <ref role="3cqZAo" node="7P9C_8wyI0" resolve="toBeRemoved" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="gl6BB" id="7P9C_8w_Or" role="1bW2Oz">
+                    <property role="TrG5h" value="it" />
+                    <node concept="2jxLKc" id="7P9C_8w_Os" role="1tU5fm" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2OqwBi" id="7P9C_8wzHN" role="3clFbw">
+          <node concept="37vLTw" id="7P9C_8wz4o" role="2Oq$k0">
+            <ref role="3cqZAo" node="7P9C_8wyI0" resolve="toBeRemoved" />
+          </node>
+          <node concept="3GX2aA" id="7P9C_8w_5l" role="2OqNvi" />
+        </node>
+      </node>
+    </node>
+    <node concept="1YaCAy" id="7P9C_8wgW3" role="1YuTPh">
+      <property role="TrG5h" value="vmc" />
+      <ref role="1YaFvo" to="rmn3:3tsFshP56tQ" resolve="VariabilityModelChunk" />
+    </node>
+  </node>
+  <node concept="Q5z_Y" id="7P9C_8wHj8">
+    <property role="TrG5h" value="fix_VariabilityModelChunk" />
+    <node concept="Q6JDH" id="7P9C_8wHun" role="Q6Id_">
+      <property role="TrG5h" value="toBeRemoved" />
+      <node concept="A3Dl8" id="7P9C_8wHuo" role="Q6QK4">
+        <node concept="3Tqbb2" id="7P9C_8wHup" role="A3Ik2" />
+      </node>
+    </node>
+    <node concept="Q5ZZ6" id="7P9C_8wHj9" role="Q6x$H">
+      <node concept="3clFbS" id="7P9C_8wHja" role="2VODD2">
+        <node concept="3clFbF" id="7P9C_8wJid" role="3cqZAp">
+          <node concept="2OqwBi" id="7P9C_8wJie" role="3clFbG">
+            <node concept="QwW4i" id="7P9C_8wJif" role="2Oq$k0">
+              <ref role="QwW4h" node="7P9C_8wHun" resolve="toBeRemoved" />
+            </node>
+            <node concept="2es0OD" id="7P9C_8wJig" role="2OqNvi">
+              <node concept="1bVj0M" id="7P9C_8wJih" role="23t8la">
+                <node concept="3clFbS" id="7P9C_8wJii" role="1bW5cS">
+                  <node concept="3clFbF" id="7P9C_8wJij" role="3cqZAp">
+                    <node concept="2OqwBi" id="7P9C_8wJik" role="3clFbG">
+                      <node concept="37vLTw" id="7P9C_8wJil" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7P9C_8wJin" resolve="it" />
+                      </node>
+                      <node concept="3YRAZt" id="7P9C_8wJim" role="2OqNvi" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="gl6BB" id="7P9C_8wJin" role="1bW2Oz">
+                  <property role="TrG5h" value="it" />
+                  <node concept="2jxLKc" id="7P9C_8wJio" role="1tU5fm" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="QznSV" id="7P9C_8wIdJ" role="QzAvj">
+      <node concept="3clFbS" id="7P9C_8wIdK" role="2VODD2">
+        <node concept="3clFbF" id="7P9C_8wItT" role="3cqZAp">
+          <node concept="Xl_RD" id="7P9C_8wItU" role="3clFbG">
+            <property role="Xl_RC" value="Remove legacy 'contents-old' children from VarModelChunk" />
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.base/org.iets3.variability.base.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.variability.base/org.iets3.variability.base.mpl
index 74c45b8c3f..16d707e5e1 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.base/org.iets3.variability.base.mpl
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.base/org.iets3.variability.base.mpl
@@ -14,6 +14,7 @@
   <dependencies>
     <dependency reexport="false">5186c6ce-428c-4f09-a9df-73d9e86c27d3(org.iets3.core.expr.typetags)</dependency>
     <dependency reexport="false">6b277d9a-d52d-416f-a209-1919bd737f50(org.iets3.core.expr.simpleTypes)</dependency>
+    <dependency reexport="false">165f1d05-2506-4544-895e-1424f54166ec(org.iets3.variability.featuremodel.base)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -101,7 +102,8 @@
     <module reference="165f1d05-2506-4544-895e-1424f54166ec(org.iets3.variability.featuremodel.base)" version="36" />
   </dependencyVersions>
   <extendedLanguages>
-    <extendedLanguage>165f1d05-2506-4544-895e-1424f54166ec(org.iets3.variability.featuremodel.base)</extendedLanguage>
+    <extendedLanguage>d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)</extendedLanguage>
+    <extendedLanguage>db8bd035-3f51-41d8-8fed-954c202d18be(org.iets3.analysis.base)</extendedLanguage>
   </extendedLanguages>
 </language>
 
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.behavior.mps
index cb50e6a27d..cee7daaa33 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.behavior.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.behavior.mps
@@ -332,22 +332,6 @@
         <property id="8970989240999019144" name="text" index="1dT_AB" />
       </concept>
     </language>
-    <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
-      <concept id="5455284157994012186" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitLink" flags="ng" index="2pIpSj">
-        <reference id="5455284157994012188" name="link" index="2pIpSl" />
-        <child id="1595412875168045827" name="initValue" index="28nt2d" />
-      </concept>
-      <concept id="5455284157993863837" name="jetbrains.mps.lang.quotation.structure.NodeBuilder" flags="nn" index="2pJPEk">
-        <child id="5455284157993863838" name="quotedNode" index="2pJPEn" />
-      </concept>
-      <concept id="5455284157993863840" name="jetbrains.mps.lang.quotation.structure.NodeBuilderNode" flags="nn" index="2pJPED">
-        <reference id="5455284157993910961" name="concept" index="2pJxaS" />
-        <child id="5455284157993911099" name="values" index="2pJxcM" />
-      </concept>
-      <concept id="8182547171709752110" name="jetbrains.mps.lang.quotation.structure.NodeBuilderExpression" flags="nn" index="36biLy">
-        <child id="8182547171709752112" name="expression" index="36biLW" />
-      </concept>
-    </language>
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
       <concept id="2034914114981261497" name="jetbrains.mps.baseLanguage.logging.structure.LogLowLevelStatement" flags="ng" index="RRSsy">
         <property id="2034914114981261751" name="severity" index="RRSoG" />
@@ -429,7 +413,6 @@
       <concept id="2644386474300074836" name="jetbrains.mps.lang.smodel.structure.ConceptIdRefExpression" flags="nn" index="35c_gC">
         <reference id="2644386474300074837" name="conceptDeclaration" index="35c_gD" />
       </concept>
-      <concept id="6677504323281689838" name="jetbrains.mps.lang.smodel.structure.SConceptType" flags="in" index="3bZ5Sz" />
       <concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
       <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
         <child id="1177027386292" name="conceptArgument" index="cj9EA" />
@@ -573,440 +556,6 @@
       <concept id="1178894719932" name="jetbrains.mps.baseLanguage.collections.structure.DistinctOperation" flags="nn" index="1VAtEI" />
     </language>
   </registry>
-  <node concept="13h7C7" id="3tsFshP56xq">
-    <property role="3GE5qa" value="_deprecated.chunk" />
-    <ref role="13h7C2" to="s6b7:3tsFshP56tQ" resolve="VariabilityModelChunk_old" />
-    <node concept="13hLZK" id="3tsFshP56xr" role="13h7CW">
-      <node concept="3clFbS" id="3tsFshP56xs" role="2VODD2" />
-    </node>
-    <node concept="13i0hz" id="3tsFshP56xt" role="13h7CS">
-      <property role="TrG5h" value="chunkDependencies" />
-      <property role="13i0it" value="false" />
-      <property role="13i0iv" value="false" />
-      <ref role="13i0hy" to="hwgx:6clJcrJYPM5" resolve="dependencies" />
-      <node concept="3Tm1VV" id="3tsFshP56xu" role="1B3o_S" />
-      <node concept="3clFbS" id="3tsFshP56xy" role="3clF47">
-        <node concept="3clFbF" id="6ZY47fvG3qe" role="3cqZAp">
-          <node concept="2OqwBi" id="6ZY47fvG3Jo" role="3clFbG">
-            <node concept="13iPFW" id="6ZY47fvG3qd" role="2Oq$k0" />
-            <node concept="3Tsc0h" id="6ZY47fvG4Yl" role="2OqNvi">
-              <ref role="3TtcxE" to="s6b7:7nsgDAXznlY" resolve="imports_old" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="A3Dl8" id="3tsFshP56xz" role="3clF45">
-        <node concept="3Tqbb2" id="3tsFshP56x$" role="A3Ik2">
-          <ref role="ehGHo" to="vs0r:6clJcrJZLbn" resolve="IChunkDependency" />
-        </node>
-      </node>
-    </node>
-    <node concept="13i0hz" id="22kx7U4IFYl" role="13h7CS">
-      <property role="TrG5h" value="getContents" />
-      <ref role="13i0hy" node="22kx7U4Ix5a" resolve="getContents_old" />
-      <node concept="3Tm1VV" id="22kx7U4IFYm" role="1B3o_S" />
-      <node concept="3clFbS" id="22kx7U4IFYp" role="3clF47">
-        <node concept="3clFbF" id="22kx7U4J5lJ" role="3cqZAp">
-          <node concept="2OqwBi" id="22kx7U4J5Er" role="3clFbG">
-            <node concept="13iPFW" id="22kx7U4J5lI" role="2Oq$k0" />
-            <node concept="3Tsc0h" id="22kx7U4J6ep" role="2OqNvi">
-              <ref role="3TtcxE" to="s6b7:3tsFshP58gT" resolve="contents_old" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2I9FWS" id="22kx7U4IFYq" role="3clF45">
-        <ref role="2I9WkF" to="s6b7:3tsFshP5cTx" resolve="IVariabilityContent_old" />
-      </node>
-    </node>
-    <node concept="13i0hz" id="22kx7U5830a" role="13h7CS">
-      <property role="TrG5h" value="allContainerDependencies" />
-      <ref role="13i0hy" node="6PXN44oCEB8" resolve="allContainerDependencies_old" />
-      <node concept="3Tm1VV" id="6PXN44o2qA_" role="1B3o_S" />
-      <node concept="3clFbS" id="22kx7U5830f" role="3clF47">
-        <node concept="3clFbF" id="22kx7U4b6iJ" role="3cqZAp">
-          <node concept="2OqwBi" id="6PXN44otIfg" role="3clFbG">
-            <node concept="2OqwBi" id="22kx7U4cugB" role="2Oq$k0">
-              <node concept="3$u5V9" id="22kx7U4cvsJ" role="2OqNvi">
-                <node concept="1bVj0M" id="22kx7U4cvsL" role="23t8la">
-                  <node concept="3clFbS" id="22kx7U4cvsM" role="1bW5cS">
-                    <node concept="3clFbF" id="22kx7U4cvHU" role="3cqZAp">
-                      <node concept="2OqwBi" id="22kx7U4cvYc" role="3clFbG">
-                        <node concept="37vLTw" id="22kx7U4cvHT" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6uNkCxNrnAy" resolve="it" />
-                        </node>
-                        <node concept="2qgKlT" id="22kx7U4cwo2" role="2OqNvi">
-                          <ref role="37wK5l" to="hwgx:6clJcrJZN1z" resolve="chunk" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="gl6BB" id="6uNkCxNrnAy" role="1bW2Oz">
-                    <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6uNkCxNrnAz" role="1tU5fm" />
-                  </node>
-                </node>
-              </node>
-              <node concept="2OqwBi" id="22kx7U5845m" role="2Oq$k0">
-                <node concept="13iPFW" id="22kx7U583EH" role="2Oq$k0" />
-                <node concept="3Tsc0h" id="22kx7U584Fs" role="2OqNvi">
-                  <ref role="3TtcxE" to="s6b7:7nsgDAXznlY" resolve="imports_old" />
-                </node>
-              </node>
-            </node>
-            <node concept="ANE8D" id="6PXN44otILO" role="2OqNvi" />
-          </node>
-        </node>
-      </node>
-      <node concept="2I9FWS" id="6PXN44oCIJm" role="3clF45">
-        <ref role="2I9WkF" to="vs0r:6clJcrJXo2z" resolve="IVisibleElementProvider" />
-      </node>
-    </node>
-    <node concept="13i0hz" id="22kx7U4bteI" role="13h7CS">
-      <property role="TrG5h" value="allImportedContainers" />
-      <ref role="13i0hy" node="1KUGD$rV2Pp" resolve="allImportedContainers_old" />
-      <node concept="3Tm1VV" id="22kx7U4bteL" role="1B3o_S" />
-      <node concept="3clFbS" id="22kx7U4bteP" role="3clF47">
-        <node concept="3clFbF" id="22kx7U4btF7" role="3cqZAp">
-          <node concept="2OqwBi" id="22kx7U4bu0y" role="3clFbG">
-            <node concept="13iPFW" id="22kx7U4btF6" role="2Oq$k0" />
-            <node concept="2qgKlT" id="22kx7U4buAw" role="2OqNvi">
-              <ref role="37wK5l" to="hwgx:1KUGD$rV2Pp" resolve="allImportedChunks" />
-              <node concept="37vLTw" id="22kx7U4buJr" role="37wK5m">
-                <ref role="3cqZAo" node="22kx7U4bteQ" resolve="restrictToReexport" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="22kx7U4bteQ" role="3clF46">
-        <property role="TrG5h" value="restrictToReexport" />
-        <node concept="10P_77" id="22kx7U4bteR" role="1tU5fm" />
-      </node>
-      <node concept="A3Dl8" id="22kx7U4bteS" role="3clF45">
-        <node concept="3Tqbb2" id="22kx7U4bteT" role="A3Ik2">
-          <ref role="ehGHo" to="vs0r:6clJcrJXo2z" resolve="IVisibleElementProvider" />
-        </node>
-      </node>
-    </node>
-    <node concept="13i0hz" id="3tsFshP56x_" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="13i0it" value="false" />
-      <property role="TrG5h" value="allReferenceableContentsInChunk" />
-      <ref role="13i0hy" to="hwgx:6clJcrKmVSn" resolve="allReferenceableContentsInChunk" />
-      <node concept="3Tm1VV" id="3tsFshP56xA" role="1B3o_S" />
-      <node concept="3clFbS" id="3tsFshP56xE" role="3clF47">
-        <node concept="3clFbF" id="3tsFshP57CJ" role="3cqZAp">
-          <node concept="2OqwBi" id="3tsFshP58nH" role="3clFbG">
-            <node concept="13iPFW" id="3tsFshP58gY" role="2Oq$k0" />
-            <node concept="3Tsc0h" id="3tsFshP58KC" role="2OqNvi">
-              <ref role="3TtcxE" to="s6b7:3tsFshP58gT" resolve="contents_old" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="A3Dl8" id="3tsFshP56xF" role="3clF45">
-        <node concept="3Tqbb2" id="3tsFshP56xG" role="A3Ik2" />
-      </node>
-    </node>
-    <node concept="13i0hz" id="3tsFshP56xH" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="13i0it" value="false" />
-      <property role="TrG5h" value="externallyReferenceableContentsInChunk" />
-      <ref role="13i0hy" to="hwgx:6clJcrKmX4x" resolve="externallyReferenceableContentsInChunk" />
-      <node concept="3Tm1VV" id="3tsFshP56xI" role="1B3o_S" />
-      <node concept="3clFbS" id="3tsFshP56xM" role="3clF47">
-        <node concept="3clFbF" id="6LfBX8YiJrr" role="3cqZAp">
-          <node concept="BsUDl" id="6LfBX8YiJrq" role="3clFbG">
-            <ref role="37wK5l" to="hwgx:6clJcrKmVSn" resolve="allReferenceableContentsInChunk" />
-          </node>
-        </node>
-      </node>
-      <node concept="A3Dl8" id="3tsFshP56xN" role="3clF45">
-        <node concept="3Tqbb2" id="3tsFshP56xO" role="A3Ik2" />
-      </node>
-    </node>
-    <node concept="13i0hz" id="3tsFshP56xP" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="13i0it" value="false" />
-      <property role="TrG5h" value="addGenericDependecy" />
-      <ref role="13i0hy" to="hwgx:94IdDK$n_l" resolve="addGenericChunkDependency" />
-      <node concept="3Tm1VV" id="3tsFshP56xQ" role="1B3o_S" />
-      <node concept="3clFbS" id="3tsFshP56xV" role="3clF47">
-        <node concept="3clFbF" id="3tsFshP59CD" role="3cqZAp">
-          <node concept="2OqwBi" id="3tsFshP5aJt" role="3clFbG">
-            <node concept="2OqwBi" id="3tsFshP59Hz" role="2Oq$k0">
-              <node concept="13iPFW" id="3tsFshP59CC" role="2Oq$k0" />
-              <node concept="3Tsc0h" id="3tsFshP5a6u" role="2OqNvi">
-                <ref role="3TtcxE" to="s6b7:7nsgDAXznlY" resolve="imports_old" />
-              </node>
-            </node>
-            <node concept="TSZUe" id="3tsFshP5cFb" role="2OqNvi">
-              <node concept="37vLTw" id="3tsFshP5cMz" role="25WWJ7">
-                <ref role="3cqZAo" node="3tsFshP56xW" resolve="dep" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="3tsFshP56xW" role="3clF46">
-        <property role="TrG5h" value="dep" />
-        <node concept="3Tqbb2" id="3tsFshP56xX" role="1tU5fm">
-          <ref role="ehGHo" to="vs0r:DubiFAXpld" resolve="DefaultGenericChunkDependency" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="3tsFshP56xY" role="3clF45" />
-    </node>
-    <node concept="13i0hz" id="22kx7U4aIet" role="13h7CS">
-      <property role="TrG5h" value="addContent" />
-      <ref role="13i0hy" node="22kx7U4aH3P" resolve="addContent_old" />
-      <node concept="3Tm1VV" id="22kx7U4aIeu" role="1B3o_S" />
-      <node concept="3clFbS" id="22kx7U4aIez" role="3clF47">
-        <node concept="3clFbF" id="22kx7U4aJ7p" role="3cqZAp">
-          <node concept="2OqwBi" id="22kx7U4aLKA" role="3clFbG">
-            <node concept="2OqwBi" id="22kx7U4aJp_" role="2Oq$k0">
-              <node concept="13iPFW" id="22kx7U4aJ7o" role="2Oq$k0" />
-              <node concept="3Tsc0h" id="22kx7U4aJZG" role="2OqNvi">
-                <ref role="3TtcxE" to="s6b7:3tsFshP58gT" resolve="contents_old" />
-              </node>
-            </node>
-            <node concept="TSZUe" id="22kx7U4aNoN" role="2OqNvi">
-              <node concept="37vLTw" id="22kx7U4aN_d" role="25WWJ7">
-                <ref role="3cqZAo" node="22kx7U4aIe$" resolve="chunkContent" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="6Gx9iNndu5w" role="3cqZAp">
-          <node concept="BsUDl" id="6Gx9iNndu5v" role="3clFbG">
-            <ref role="37wK5l" node="6Gx9iNndu5r" resolve="importDependencies" />
-            <node concept="37vLTw" id="6Gx9iNndu5u" role="37wK5m">
-              <ref role="3cqZAo" node="22kx7U4aIe$" resolve="chunkContent" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="22kx7U4aIe$" role="3clF46">
-        <property role="TrG5h" value="chunkContent" />
-        <node concept="3Tqbb2" id="22kx7U4aIe_" role="1tU5fm">
-          <ref role="ehGHo" to="s6b7:3tsFshP5cTx" resolve="IVariabilityContent_old" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="22kx7U4aIeA" role="3clF45" />
-    </node>
-    <node concept="13i0hz" id="22kx7U4IFY7" role="13h7CS">
-      <property role="TrG5h" value="addContent" />
-      <ref role="13i0hy" node="22kx7U4IoRa" resolve="addContent_old" />
-      <node concept="3Tm1VV" id="22kx7U4IFY8" role="1B3o_S" />
-      <node concept="3clFbS" id="22kx7U4IFYf" role="3clF47">
-        <node concept="3clFbF" id="22kx7U4IGu_" role="3cqZAp">
-          <node concept="2OqwBi" id="22kx7U4IIqM" role="3clFbG">
-            <node concept="2OqwBi" id="22kx7U4IGJ$" role="2Oq$k0">
-              <node concept="13iPFW" id="22kx7U4IGu$" role="2Oq$k0" />
-              <node concept="3Tsc0h" id="22kx7U4IHjy" role="2OqNvi">
-                <ref role="3TtcxE" to="s6b7:3tsFshP58gT" resolve="contents_old" />
-              </node>
-            </node>
-            <node concept="liA8E" id="22kx7U4J2zU" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~List.add(int,java.lang.Object)" resolve="add" />
-              <node concept="37vLTw" id="22kx7U4J2Dw" role="37wK5m">
-                <ref role="3cqZAo" node="22kx7U4IFYg" resolve="position" />
-              </node>
-              <node concept="37vLTw" id="22kx7U4J59X" role="37wK5m">
-                <ref role="3cqZAo" node="22kx7U4IFYi" resolve="content" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="6Gx9iNndwow" role="3cqZAp">
-          <node concept="BsUDl" id="6Gx9iNndwoy" role="3clFbG">
-            <ref role="37wK5l" node="6Gx9iNndu5r" resolve="importDependencies" />
-            <node concept="37vLTw" id="6Gx9iNndwR8" role="37wK5m">
-              <ref role="3cqZAo" node="22kx7U4IFYi" resolve="content" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="22kx7U4IFYg" role="3clF46">
-        <property role="TrG5h" value="position" />
-        <node concept="10Oyi0" id="22kx7U4IFYh" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="22kx7U4IFYi" role="3clF46">
-        <property role="TrG5h" value="content" />
-        <node concept="3Tqbb2" id="22kx7U4IFYj" role="1tU5fm">
-          <ref role="ehGHo" to="s6b7:3tsFshP5cTx" resolve="IVariabilityContent_old" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="22kx7U4IFYk" role="3clF45" />
-    </node>
-    <node concept="13i0hz" id="6Gx9iNndu5r" role="13h7CS">
-      <property role="TrG5h" value="importDependencies" />
-      <node concept="3Tm6S6" id="6Gx9iNndu5s" role="1B3o_S" />
-      <node concept="3cqZAl" id="6Gx9iNndu5t" role="3clF45" />
-      <node concept="37vLTG" id="6Gx9iNndu5j" role="3clF46">
-        <property role="TrG5h" value="content" />
-        <node concept="3Tqbb2" id="6Gx9iNndu5k" role="1tU5fm">
-          <ref role="ehGHo" to="s6b7:3tsFshP5cTx" resolve="IVariabilityContent_old" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="6Gx9iNndu48" role="3clF47">
-        <node concept="2Gpval" id="6Gx9iNnF$VO" role="3cqZAp">
-          <node concept="2GrKxI" id="6Gx9iNnF$VQ" role="2Gsz3X">
-            <property role="TrG5h" value="dependency" />
-          </node>
-          <node concept="3clFbS" id="6Gx9iNnF$VU" role="2LFqv$">
-            <node concept="3clFbJ" id="6Gx9iNnFGWP" role="3cqZAp">
-              <node concept="3clFbS" id="6Gx9iNnFGWQ" role="3clFbx">
-                <node concept="3clFbF" id="6Gx9iNnFGWR" role="3cqZAp">
-                  <node concept="2OqwBi" id="6Gx9iNnFGWS" role="3clFbG">
-                    <node concept="13iPFW" id="6Gx9iNnFGWT" role="2Oq$k0" />
-                    <node concept="2qgKlT" id="6Gx9iNnFGWU" role="2OqNvi">
-                      <ref role="37wK5l" to="hwgx:94IdDK$n_l" resolve="addGenericChunkDependency" />
-                      <node concept="2pJPEk" id="6Gx9iNnFGWV" role="37wK5m">
-                        <node concept="2pJPED" id="6Gx9iNnFGWW" role="2pJPEn">
-                          <ref role="2pJxaS" to="vs0r:DubiFAXpld" resolve="DefaultGenericChunkDependency" />
-                          <node concept="2pIpSj" id="6Gx9iNnFGWX" role="2pJxcM">
-                            <ref role="2pIpSl" to="vs0r:DubiFAXDKB" resolve="chunk" />
-                            <node concept="36biLy" id="6Gx9iNnFGWY" role="28nt2d">
-                              <node concept="2GrUjf" id="6Gx9iNnFHQp" role="36biLW">
-                                <ref role="2Gs0qQ" node="6Gx9iNnF$VQ" resolve="dependency" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3fqX7Q" id="6Gx9iNnFGX0" role="3clFbw">
-                <node concept="BsUDl" id="6Gx9iNnFGX1" role="3fr31v">
-                  <ref role="37wK5l" node="11fUQrNrJNn" resolve="contains" />
-                  <node concept="2GrUjf" id="6Gx9iNnFHq$" role="37wK5m">
-                    <ref role="2Gs0qQ" node="6Gx9iNnF$VQ" resolve="dependency" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="BsUDl" id="1mONongyzYf" role="2GsD0m">
-            <ref role="37wK5l" node="1mONongyzYa" resolve="contentsDirectDependenciesWithoutSelfReference" />
-            <node concept="37vLTw" id="1mONongyzYe" role="37wK5m">
-              <ref role="3cqZAo" node="6Gx9iNndu5j" resolve="content" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="13i0hz" id="11fUQrNrJNn" role="13h7CS">
-      <property role="TrG5h" value="contains" />
-      <node concept="3Tm6S6" id="11fUQrNrJNo" role="1B3o_S" />
-      <node concept="10P_77" id="11fUQrNrJNp" role="3clF45" />
-      <node concept="37vLTG" id="11fUQrNrJNj" role="3clF46">
-        <property role="TrG5h" value="dependency" />
-        <node concept="3Tqbb2" id="11fUQrNrJNk" role="1tU5fm">
-          <ref role="ehGHo" to="vs0r:6clJcrJYOUA" resolve="Chunk" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="11fUQrNrJN0" role="3clF47">
-        <node concept="3cpWs6" id="11fUQrNrJN1" role="3cqZAp">
-          <node concept="2OqwBi" id="2CgYYdXzwoS" role="3cqZAk">
-            <node concept="2OqwBi" id="11fUQrNrJN3" role="2Oq$k0">
-              <node concept="2OqwBi" id="11fUQrNrJN4" role="2Oq$k0">
-                <node concept="13iPFW" id="11fUQrNrJN5" role="2Oq$k0" />
-                <node concept="3Tsc0h" id="11fUQrNrJN6" role="2OqNvi">
-                  <ref role="3TtcxE" to="s6b7:7nsgDAXznlY" resolve="imports_old" />
-                </node>
-              </node>
-              <node concept="3zZkjj" id="2CgYYdXzFsg" role="2OqNvi">
-                <node concept="1bVj0M" id="2CgYYdXzFsi" role="23t8la">
-                  <node concept="3clFbS" id="2CgYYdXzFsj" role="1bW5cS">
-                    <node concept="3clFbF" id="2CgYYdXzFsk" role="3cqZAp">
-                      <node concept="17R0WA" id="2CgYYdXzFsl" role="3clFbG">
-                        <node concept="37vLTw" id="2CgYYdXzFsm" role="3uHU7w">
-                          <ref role="3cqZAo" node="11fUQrNrJNj" resolve="dependency" />
-                        </node>
-                        <node concept="2OqwBi" id="2CgYYdXzFsn" role="3uHU7B">
-                          <node concept="37vLTw" id="2CgYYdXzFso" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2r1kIC$yAjC" resolve="it" />
-                          </node>
-                          <node concept="3TrEf2" id="2CgYYdXzFsp" role="2OqNvi">
-                            <ref role="3Tt5mk" to="vs0r:DubiFAXDKB" resolve="chunk" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="gl6BB" id="2r1kIC$yAjC" role="1bW2Oz">
-                    <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2r1kIC$yAjD" role="1tU5fm" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3GX2aA" id="2POhTHaDxHn" role="2OqNvi" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="13i0hz" id="1mONongyzYa" role="13h7CS">
-      <property role="TrG5h" value="contentsDirectDependenciesWithoutSelfReference" />
-      <node concept="3Tm6S6" id="1mONongyzYb" role="1B3o_S" />
-      <node concept="A3Dl8" id="1mONongyzYc" role="3clF45">
-        <node concept="3Tqbb2" id="1mONongyzYd" role="A3Ik2">
-          <ref role="ehGHo" to="vs0r:6clJcrJYOUA" resolve="Chunk" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="1mONongyzY5" role="3clF46">
-        <property role="TrG5h" value="content" />
-        <node concept="3Tqbb2" id="1mONongyzY6" role="1tU5fm">
-          <ref role="ehGHo" to="s6b7:3tsFshP5cTx" resolve="IVariabilityContent_old" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="1mONongyzXG" role="3clF47">
-        <node concept="3cpWs6" id="1mONongyzXH" role="3cqZAp">
-          <node concept="2OqwBi" id="1mONongz9gK" role="3cqZAk">
-            <node concept="2OqwBi" id="1mONongyzXI" role="2Oq$k0">
-              <node concept="2OqwBi" id="1mONongyzXJ" role="2Oq$k0">
-                <node concept="2OqwBi" id="1mONongyzXK" role="2Oq$k0">
-                  <node concept="37vLTw" id="1mONongyzY7" role="2Oq$k0">
-                    <ref role="3cqZAo" node="1mONongyzY5" resolve="content" />
-                  </node>
-                  <node concept="2qgKlT" id="1mONongyzXM" role="2OqNvi">
-                    <ref role="37wK5l" node="6Gx9iNnB7_2" resolve="directDependencies_old" />
-                  </node>
-                </node>
-                <node concept="v3k3i" id="6hCkEgf05qr" role="2OqNvi">
-                  <node concept="chp4Y" id="6hCkEgf05Ob" role="v3oSu">
-                    <ref role="cht4Q" to="vs0r:6clJcrJYOUA" resolve="Chunk" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3zZkjj" id="1mONongyzXW" role="2OqNvi">
-                <node concept="1bVj0M" id="1mONongyzXX" role="23t8la">
-                  <node concept="3clFbS" id="1mONongyzXY" role="1bW5cS">
-                    <node concept="3clFbF" id="1mONongyzXZ" role="3cqZAp">
-                      <node concept="17QLQc" id="1mONongyzY0" role="3clFbG">
-                        <node concept="13iPFW" id="1mONongyzY1" role="3uHU7w" />
-                        <node concept="37vLTw" id="1mONongyzY2" role="3uHU7B">
-                          <ref role="3cqZAo" node="2r1kIC$yAjE" resolve="it" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="gl6BB" id="2r1kIC$yAjE" role="1bW2Oz">
-                    <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="2r1kIC$yAjF" role="1tU5fm" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="1KnU$U" id="1mONongzax7" role="2OqNvi" />
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="13h7C7" id="3tsFshP6huW">
     <property role="3GE5qa" value="treenodes" />
     <ref role="13h7C2" to="s6b7:3tsFshP5Ec7" resolve="Feature" />
@@ -14982,192 +14531,6 @@
       <node concept="3clFbS" id="aac2iyAoJi" role="2VODD2" />
     </node>
   </node>
-  <node concept="13h7C7" id="22kx7U4aH3E">
-    <property role="3GE5qa" value="_deprecated.chunk" />
-    <ref role="13h7C2" to="s6b7:22kx7U49GUn" resolve="IVariabilityContainer_old" />
-    <node concept="13i0hz" id="3D4yX3IOARB" role="13h7CS">
-      <property role="13i0it" value="true" />
-      <property role="TrG5h" value="mayAdd_old" />
-      <node concept="3Tm1VV" id="3D4yX3IOARC" role="1B3o_S" />
-      <node concept="10P_77" id="3D4yX3IOARV" role="3clF45" />
-      <node concept="3clFbS" id="3D4yX3IOARE" role="3clF47">
-        <node concept="3clFbF" id="3D4yX3IOU7o" role="3cqZAp">
-          <node concept="3clFbT" id="3D4yX3IOU7n" role="3clFbG">
-            <property role="3clFbU" value="true" />
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="3D4yX3IOASI" role="3clF46">
-        <property role="TrG5h" value="conc" />
-        <node concept="3bZ5Sz" id="3D4yX3IOASH" role="1tU5fm" />
-      </node>
-      <node concept="P$JXv" id="5$FoJzw6hMI" role="lGtFl">
-        <node concept="TZ5HI" id="5$FoJzw6hMJ" role="3nqlJM">
-          <node concept="TZ5HA" id="5$FoJzw6hMK" role="3HnX3l" />
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="5$FoJzw6hML" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
-      </node>
-    </node>
-    <node concept="13i0hz" id="22kx7U4aH3P" role="13h7CS">
-      <property role="13i0it" value="true" />
-      <property role="TrG5h" value="addContent_old" />
-      <node concept="3Tm1VV" id="22kx7U4aH3Q" role="1B3o_S" />
-      <node concept="3cqZAl" id="22kx7U4aHhC" role="3clF45" />
-      <node concept="3clFbS" id="22kx7U4aH3S" role="3clF47" />
-      <node concept="37vLTG" id="22kx7U4aHi4" role="3clF46">
-        <property role="TrG5h" value="content" />
-        <node concept="3Tqbb2" id="22kx7U4aHi3" role="1tU5fm">
-          <ref role="ehGHo" to="s6b7:3tsFshP5cTx" resolve="IVariabilityContent_old" />
-        </node>
-      </node>
-      <node concept="P$JXv" id="5$FoJzw6hLI" role="lGtFl">
-        <node concept="TZ5HI" id="5$FoJzw6hLJ" role="3nqlJM">
-          <node concept="TZ5HA" id="5$FoJzw6hLK" role="3HnX3l" />
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="5$FoJzw6hLL" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
-      </node>
-    </node>
-    <node concept="13i0hz" id="22kx7U4IoRa" role="13h7CS">
-      <property role="13i0it" value="true" />
-      <property role="TrG5h" value="addContent_old" />
-      <node concept="3Tm1VV" id="22kx7U4IoRb" role="1B3o_S" />
-      <node concept="3cqZAl" id="22kx7U4IoRc" role="3clF45" />
-      <node concept="3clFbS" id="22kx7U4IoRd" role="3clF47" />
-      <node concept="37vLTG" id="22kx7U4IuOL" role="3clF46">
-        <property role="TrG5h" value="position" />
-        <node concept="10Oyi0" id="22kx7U4IuP1" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="22kx7U4IoRe" role="3clF46">
-        <property role="TrG5h" value="content" />
-        <node concept="3Tqbb2" id="22kx7U4IoRf" role="1tU5fm">
-          <ref role="ehGHo" to="s6b7:3tsFshP5cTx" resolve="IVariabilityContent_old" />
-        </node>
-      </node>
-      <node concept="P$JXv" id="5$FoJzw6hP6" role="lGtFl">
-        <node concept="TZ5HI" id="5$FoJzw6hP7" role="3nqlJM">
-          <node concept="TZ5HA" id="5$FoJzw6hP8" role="3HnX3l" />
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="5$FoJzw6hP9" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
-      </node>
-    </node>
-    <node concept="13i0hz" id="22kx7U4Ix5a" role="13h7CS">
-      <property role="13i0it" value="true" />
-      <property role="TrG5h" value="getContents_old" />
-      <node concept="3Tm1VV" id="22kx7U4Ix5b" role="1B3o_S" />
-      <node concept="2I9FWS" id="22kx7U4IEvL" role="3clF45">
-        <ref role="2I9WkF" to="s6b7:3tsFshP5cTx" resolve="IVariabilityContent_old" />
-      </node>
-      <node concept="3clFbS" id="22kx7U4Ix5d" role="3clF47">
-        <node concept="3clFbF" id="5$FoJzw6hTC" role="3cqZAp">
-          <node concept="2ShNRf" id="5$FoJzw6hTA" role="3clFbG">
-            <node concept="2T8Vx0" id="5$FoJzw6kho" role="2ShVmc">
-              <node concept="2I9FWS" id="5$FoJzw6khq" role="2T96Bj">
-                <ref role="2I9WkF" to="s6b7:3tsFshP5cTx" resolve="IVariabilityContent_old" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="P$JXv" id="5$FoJzw6hRd" role="lGtFl">
-        <node concept="TZ5HI" id="5$FoJzw6hRe" role="3nqlJM">
-          <node concept="TZ5HA" id="5$FoJzw6hRf" role="3HnX3l" />
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="5$FoJzw6hRg" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
-      </node>
-    </node>
-    <node concept="13i0hz" id="3D4yX3Jvijy" role="13h7CS">
-      <property role="13i0it" value="true" />
-      <property role="TrG5h" value="getOtherContents" />
-      <node concept="3Tm1VV" id="3D4yX3Jvijz" role="1B3o_S" />
-      <node concept="A3Dl8" id="3D4yX3Jvila" role="3clF45">
-        <node concept="3Tqbb2" id="3D4yX3Jvilt" role="A3Ik2" />
-      </node>
-      <node concept="3clFbS" id="3D4yX3Jvij_" role="3clF47">
-        <node concept="3clFbF" id="3D4yX3Jvimj" role="3cqZAp">
-          <node concept="2ShNRf" id="3D4yX3Jvimh" role="3clFbG">
-            <node concept="kMnCb" id="3D4yX3JvQdu" role="2ShVmc">
-              <node concept="3Tqbb2" id="3D4yX3JvQdY" role="kMuH3" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="P$JXv" id="5$FoJzw6k$X" role="lGtFl">
-        <node concept="TZ5HI" id="5$FoJzw6k$Y" role="3nqlJM">
-          <node concept="TZ5HA" id="5$FoJzw6k$Z" role="3HnX3l" />
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="5$FoJzw6k_0" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
-      </node>
-    </node>
-    <node concept="13i0hz" id="6PXN44oCEB8" role="13h7CS">
-      <property role="13i0it" value="true" />
-      <property role="TrG5h" value="allContainerDependencies_old" />
-      <node concept="3Tm1VV" id="6PXN44oCEB9" role="1B3o_S" />
-      <node concept="2I9FWS" id="6PXN44oCEDq" role="3clF45">
-        <ref role="2I9WkF" to="vs0r:6clJcrJXo2z" resolve="IVisibleElementProvider" />
-      </node>
-      <node concept="3clFbS" id="6PXN44oCEBb" role="3clF47">
-        <node concept="3clFbF" id="5$FoJzw6kCT" role="3cqZAp">
-          <node concept="2ShNRf" id="5$FoJzw6kCR" role="3clFbG">
-            <node concept="2T8Vx0" id="5$FoJzw6n_Y" role="2ShVmc">
-              <node concept="2I9FWS" id="5$FoJzw6nA0" role="2T96Bj">
-                <ref role="2I9WkF" to="vs0r:6clJcrJXo2z" resolve="IVisibleElementProvider" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="P$JXv" id="5$FoJzw6nSi" role="lGtFl">
-        <node concept="TZ5HI" id="5$FoJzw6nSj" role="3nqlJM">
-          <node concept="TZ5HA" id="5$FoJzw6nSk" role="3HnX3l" />
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="5$FoJzw6nSl" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
-      </node>
-    </node>
-    <node concept="13i0hz" id="1KUGD$rV2Pp" role="13h7CS">
-      <property role="TrG5h" value="allImportedContainers_old" />
-      <property role="13i0it" value="true" />
-      <node concept="37vLTG" id="1KUGD$rVshY" role="3clF46">
-        <property role="TrG5h" value="restrictToReexport" />
-        <node concept="10P_77" id="1KUGD$rVsm4" role="1tU5fm" />
-      </node>
-      <node concept="3Tm1VV" id="1KUGD$rV2Pq" role="1B3o_S" />
-      <node concept="A3Dl8" id="1KUGD$rVrYv" role="3clF45">
-        <node concept="3Tqbb2" id="1KUGD$rVsa1" role="A3Ik2">
-          <ref role="ehGHo" to="vs0r:6clJcrJXo2z" resolve="IVisibleElementProvider" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="1KUGD$rV2Ps" role="3clF47">
-        <node concept="3clFbF" id="5$FoJzw6nZX" role="3cqZAp">
-          <node concept="2ShNRf" id="5$FoJzw6nZV" role="3clFbG">
-            <node concept="kMnCb" id="5$FoJzw6qot" role="2ShVmc" />
-          </node>
-        </node>
-      </node>
-      <node concept="P$JXv" id="5$FoJzw6nW2" role="lGtFl">
-        <node concept="TZ5HI" id="5$FoJzw6nW3" role="3nqlJM">
-          <node concept="TZ5HA" id="5$FoJzw6nW4" role="3HnX3l" />
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="5$FoJzw6nW5" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
-      </node>
-    </node>
-    <node concept="13hLZK" id="22kx7U4aH3F" role="13h7CW">
-      <node concept="3clFbS" id="22kx7U4aH3G" role="2VODD2" />
-    </node>
-  </node>
   <node concept="13h7C7" id="6OwVbfnpWza">
     <property role="3GE5qa" value="constraints" />
     <ref role="13h7C2" to="s6b7:6OwVbfncRr8" resolve="RootConstraintGrouping" />
@@ -15424,87 +14787,6 @@
       </node>
     </node>
   </node>
-  <node concept="13h7C7" id="6Gx9iNnB7zb">
-    <property role="3GE5qa" value="_deprecated.chunk" />
-    <ref role="13h7C2" to="s6b7:3tsFshP5cTx" resolve="IVariabilityContent_old" />
-    <node concept="13hLZK" id="6Gx9iNnB7zc" role="13h7CW">
-      <node concept="3clFbS" id="6Gx9iNnB7zd" role="2VODD2" />
-    </node>
-    <node concept="13i0hz" id="3D4yX3IUbRd" role="13h7CS">
-      <property role="TrG5h" value="container_old" />
-      <node concept="3Tm1VV" id="3D4yX3IUbRe" role="1B3o_S" />
-      <node concept="3Tqbb2" id="3D4yX3IUbRx" role="3clF45">
-        <ref role="ehGHo" to="s6b7:22kx7U49GUn" resolve="IVariabilityContainer_old" />
-      </node>
-      <node concept="3clFbS" id="3D4yX3IUbRg" role="3clF47">
-        <node concept="3clFbF" id="3D4yX3IUbTc" role="3cqZAp">
-          <node concept="2OqwBi" id="3D4yX3IUc4L" role="3clFbG">
-            <node concept="13iPFW" id="3D4yX3IUbTb" role="2Oq$k0" />
-            <node concept="2Xjw5R" id="3D4yX3IUcjQ" role="2OqNvi">
-              <node concept="1xMEDy" id="3D4yX3IUcjS" role="1xVPHs">
-                <node concept="chp4Y" id="3D4yX3IUcme" role="ri$Ld">
-                  <ref role="cht4Q" to="s6b7:22kx7U49GUn" resolve="IVariabilityContainer_old" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="P$JXv" id="5$FoJzw9w7V" role="lGtFl">
-        <node concept="TZ5HI" id="5$FoJzw9w7W" role="3nqlJM">
-          <node concept="TZ5HA" id="5$FoJzw9w7X" role="3HnX3l" />
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="5$FoJzw9w7Y" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
-      </node>
-    </node>
-    <node concept="13i0hz" id="6Gx9iNnB7_2" role="13h7CS">
-      <property role="TrG5h" value="directDependencies_old" />
-      <property role="13i0it" value="true" />
-      <node concept="3Tm1VV" id="6Gx9iNnB7_3" role="1B3o_S" />
-      <node concept="3clFbS" id="6Gx9iNnB7_7" role="3clF47">
-        <node concept="3clFbF" id="5$FoJzvsI7i" role="3cqZAp">
-          <node concept="2ShNRf" id="5$FoJzvsI7g" role="3clFbG">
-            <node concept="kMnCb" id="5$FoJzvsKvM" role="2ShVmc" />
-          </node>
-        </node>
-      </node>
-      <node concept="A3Dl8" id="6Gx9iNnB7_8" role="3clF45">
-        <node concept="3Tqbb2" id="6Gx9iNnB7_9" role="A3Ik2">
-          <ref role="ehGHo" to="s6b7:22kx7U49GUn" resolve="IVariabilityContainer_old" />
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="13h7C7" id="40ahzp2RO_n">
-    <property role="3GE5qa" value="_deprecated.chunk" />
-    <ref role="13h7C2" to="s6b7:3tsFshP5d$8" resolve="EmptyVariabilityContent_old" />
-    <node concept="13hLZK" id="40ahzp2RO_o" role="13h7CW">
-      <node concept="3clFbS" id="40ahzp2RO_p" role="2VODD2" />
-    </node>
-    <node concept="13i0hz" id="40ahzp2RO_y" role="13h7CS">
-      <property role="TrG5h" value="directDependencies" />
-      <ref role="13i0hy" node="6Gx9iNnB7_2" resolve="directDependencies_old" />
-      <node concept="3Tm1VV" id="40ahzp2RO_z" role="1B3o_S" />
-      <node concept="3clFbS" id="40ahzp2RO_B" role="3clF47">
-        <node concept="3clFbF" id="40ahzp2ROAt" role="3cqZAp">
-          <node concept="2ShNRf" id="40ahzp2ROAr" role="3clFbG">
-            <node concept="kMnCb" id="40ahzp2SbqA" role="2ShVmc">
-              <node concept="3Tqbb2" id="40ahzp2SbqZ" role="kMuH3">
-                <ref role="ehGHo" to="s6b7:22kx7U49GUn" resolve="IVariabilityContainer_old" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="A3Dl8" id="40ahzp2RO_C" role="3clF45">
-        <node concept="3Tqbb2" id="40ahzp2RO_D" role="A3Ik2">
-          <ref role="ehGHo" to="s6b7:22kx7U49GUn" resolve="IVariabilityContainer_old" />
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="13h7C7" id="7PHwTKCe4M8">
     <property role="3GE5qa" value="using" />
     <ref role="13h7C2" to="s6b7:7PHwTKCdZ7k" resolve="UsingParamRefExpr" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.editor.mps
index 13837062dc..01d467ffd0 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.editor.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.editor.mps
@@ -102,9 +102,6 @@
         <child id="1140524464360" name="cellLayout" index="2czzBx" />
         <child id="1140524464359" name="emptyCellModel" index="2czzBI" />
       </concept>
-      <concept id="1078308402140" name="jetbrains.mps.lang.editor.structure.CellModel_Custom" flags="sg" stub="8104358048506730068" index="gc7cB">
-        <child id="1176795024817" name="cellProvider" index="3YsKMw" />
-      </concept>
       <concept id="1196434649611" name="jetbrains.mps.lang.editor.structure.SubstituteMenu_SimpleString" flags="ng" index="2h3Zct">
         <property id="1196434851095" name="text" index="2h4Kg1" />
       </concept>
@@ -354,7 +351,6 @@
       </concept>
       <concept id="1176717841777" name="jetbrains.mps.lang.editor.structure.QueryFunction_ModelAccess_Getter" flags="in" index="3TQlhw" />
       <concept id="2722384699544370949" name="jetbrains.mps.lang.editor.structure.SubstituteMenuPart_Placeholder" flags="ng" index="3VyMlK" />
-      <concept id="1176749715029" name="jetbrains.mps.lang.editor.structure.QueryFunction_CellProvider" flags="in" index="3VJUX4" />
       <concept id="4307758654696938365" name="jetbrains.mps.lang.editor.structure.QueryFunction_SubstituteMenu_RefPresentation" flags="ig" index="1WAQ3h" />
       <concept id="4307758654696952957" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_SubstituteMenu_ReferencedNode" flags="ng" index="1WAUZh" />
       <concept id="1950447826681509042" name="jetbrains.mps.lang.editor.structure.ApplyStyleClass" flags="lg" index="3Xmtl4">
@@ -625,7 +621,7 @@
     </language>
     <language id="52733268-be24-4f5f-ab84-a73b7c0c03b0" name="de.slisson.mps.richtext.customcell">
       <concept id="1161622981231" name="de.slisson.mps.richtext.customcell.structure.ConceptFunctionParameter_cell" flags="nn" index="1Q80Hy" />
-      <concept id="1176749715029" name="de.slisson.mps.richtext.customcell.structure.QueryFunction_Cell" flags="in" index="3VJUX5" />
+      <concept id="1176749715029" name="de.slisson.mps.richtext.customcell.structure.QueryFunction_Cell" flags="in" index="3VJUX4" />
       <concept id="2490242408670732052" name="de.slisson.mps.richtext.customcell.structure.CellModel_CustomFactory" flags="ng" index="3ZSo5i">
         <child id="1073389446424" name="childCellModel" index="3EZMny" />
         <child id="2490242408670937967" name="factoryMethod" index="3ZZHOD" />
@@ -950,104 +946,6 @@
       </concept>
     </language>
   </registry>
-  <node concept="24kQdi" id="3tsFshP5cTU">
-    <property role="3GE5qa" value="_deprecated.chunk" />
-    <ref role="1XX52x" to="s6b7:3tsFshP56tQ" resolve="VariabilityModelChunk_old" />
-    <node concept="3EZMnI" id="4tXyFaWwywa" role="2wV5jI">
-      <node concept="3EZMnI" id="7nsgDAXznLJ" role="3EZMnx">
-        <node concept="2iRfu4" id="7nsgDAXznLK" role="2iSdaV" />
-        <node concept="3EZMnI" id="4tXyFaWwywk" role="3EZMnx">
-          <node concept="l2Vlx" id="4tXyFaWwywl" role="2iSdaV" />
-          <node concept="3F0ifn" id="4tXyFaWwywh" role="3EZMnx">
-            <property role="3F0ifm" value="variability" />
-            <ref role="1k5W1q" to="s7nz:16fFHQCfB3d" resolve="VariabilityHeader" />
-          </node>
-          <node concept="3F0A7n" id="4tXyFaWwywt" role="3EZMnx">
-            <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
-            <ref role="1k5W1q" to="s7nz:16fFHQCfB3d" resolve="VariabilityHeader" />
-          </node>
-        </node>
-        <node concept="3XFhqQ" id="7nsgDAXznVR" role="3EZMnx" />
-        <node concept="3XFhqQ" id="7nsgDAXznWo" role="3EZMnx" />
-        <node concept="3XFhqQ" id="7nsgDAXznWT" role="3EZMnx" />
-        <node concept="3XFhqQ" id="7nsgDAXznXr" role="3EZMnx" />
-        <node concept="3XFhqQ" id="7nsgDAXznXY" role="3EZMnx" />
-        <node concept="3XFhqQ" id="7nsgDAX$QF1" role="3EZMnx" />
-        <node concept="3XFhqQ" id="7nsgDAX$QFF" role="3EZMnx" />
-        <node concept="3XFhqQ" id="7nsgDAX$QGm" role="3EZMnx" />
-        <node concept="3EZMnI" id="7nsgDAX$QE7" role="3EZMnx">
-          <node concept="2iRfu4" id="7nsgDAX$QE8" role="2iSdaV" />
-          <node concept="3F0ifn" id="7nsgDAX$QEW" role="3EZMnx">
-            <property role="3F0ifm" value="imports" />
-          </node>
-          <node concept="3F2HdR" id="7nsgDAXznZ7" role="3EZMnx">
-            <ref role="1NtTu8" to="s6b7:7nsgDAXznlY" resolve="imports_old" />
-            <node concept="2iRkQZ" id="7nsgDAXznZJ" role="2czzBx" />
-          </node>
-        </node>
-      </node>
-      <node concept="2iRkQZ" id="4tXyFaWwywd" role="2iSdaV" />
-      <node concept="gc7cB" id="4tXyFaWwywB" role="3EZMnx">
-        <node concept="3VJUX4" id="4tXyFaWwywD" role="3YsKMw">
-          <node concept="3clFbS" id="4tXyFaWwywF" role="2VODD2">
-            <node concept="3clFbF" id="4tXyFaWwyxe" role="3cqZAp">
-              <node concept="2ShNRf" id="4tXyFaWwyxc" role="3clFbG">
-                <node concept="1pGfFk" id="4tXyFaWwzSe" role="2ShVmc">
-                  <ref role="37wK5l" to="r4b4:5gTlpakvelx" resolve="HorizLineCell" />
-                  <node concept="pncrf" id="4tXyFaWwzSS" role="37wK5m" />
-                  <node concept="10M0yZ" id="4tXyFaWw$6n" role="37wK5m">
-                    <ref role="3cqZAo" to="lzb2:~JBColor.BLACK" resolve="BLACK" />
-                    <ref role="1PxDUh" to="lzb2:~JBColor" resolve="JBColor" />
-                  </node>
-                  <node concept="3cmrfG" id="4tXyFaWw$bx" role="37wK5m">
-                    <property role="3cmrfH" value="2" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3F0ifn" id="4tXyFaWwBfP" role="3EZMnx">
-        <node concept="VPM3Z" id="4tXyFaWwBiM" role="3F10Kt">
-          <property role="VOm3f" value="false" />
-        </node>
-      </node>
-      <node concept="3F2HdR" id="4tXyFaWwBeE" role="3EZMnx">
-        <ref role="1NtTu8" to="s6b7:3tsFshP58gT" resolve="contents_old" />
-        <node concept="2iRkQZ" id="4tXyFaWwBeG" role="2czzBx" />
-        <node concept="4$FPG" id="6LfBX8YivEt" role="4_6I_">
-          <node concept="3clFbS" id="6LfBX8YivEu" role="2VODD2">
-            <node concept="3clFbF" id="6LfBX8YivF8" role="3cqZAp">
-              <node concept="2ShNRf" id="6LfBX8YivF6" role="3clFbG">
-                <node concept="3zrR0B" id="6LfBX8YiFHF" role="2ShVmc">
-                  <node concept="3Tqbb2" id="6LfBX8YiFHH" role="3zrR0E">
-                    <ref role="ehGHo" to="s6b7:3tsFshP5d$8" resolve="EmptyVariabilityContent_old" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3F0ifn" id="6LfBX8YiNlo" role="2czzBI">
-          <property role="3F0ifm" value="" />
-          <node concept="VPxyj" id="6LfBX8YiNn4" role="3F10Kt">
-            <property role="VOm3f" value="true" />
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="24kQdi" id="3tsFshP5e60">
-    <property role="3GE5qa" value="_deprecated.chunk" />
-    <ref role="1XX52x" to="s6b7:3tsFshP5d$8" resolve="EmptyVariabilityContent_old" />
-    <node concept="3F0ifn" id="3tsFshP5e62" role="2wV5jI">
-      <property role="3F0ifm" value="" />
-      <node concept="VPxyj" id="3tsFshP5e7H" role="3F10Kt">
-        <property role="VOm3f" value="true" />
-      </node>
-    </node>
-  </node>
   <node concept="24kQdi" id="3tsFshP5EcA">
     <property role="3GE5qa" value="treenodes" />
     <ref role="1XX52x" to="s6b7:3tsFshP5E8h" resolve="FeatureModel" />
@@ -8341,12 +8239,6 @@
     </node>
     <node concept="382kZG" id="7cBI1LfYpEY" role="lGtFl" />
   </node>
-  <node concept="22mcaB" id="cEt5uj8NHA">
-    <property role="3GE5qa" value="_deprecated.chunk" />
-    <ref role="aqKnT" to="s6b7:3tsFshP5d$8" resolve="EmptyVariabilityContent_old" />
-    <node concept="22hDWj" id="24LQtH$d1Vk" role="22hAXT" />
-    <node concept="2VfDsV" id="51M$6hf3mdh" role="3ft7WO" />
-  </node>
   <node concept="22mcaB" id="7cBI1LfYpEZ">
     <ref role="aqKnT" to="s6b7:5NPKd17BG$l" resolve="FeatureModelConfiguration_old" />
     <node concept="22hDWj" id="24LQtH$d1Vl" role="22hAXT" />
@@ -9036,7 +8928,7 @@
           </node>
         </node>
       </node>
-      <node concept="3VJUX5" id="zMzE_uJNI3" role="3ZZHOD">
+      <node concept="3VJUX4" id="zMzE_uJNI3" role="3ZZHOD">
         <node concept="3clFbS" id="zMzE_uJNI4" role="2VODD2">
           <node concept="3cpWs8" id="zMzE_uJNI5" role="3cqZAp">
             <node concept="3cpWsn" id="zMzE_uJNI6" role="3cpWs9">
@@ -12801,24 +12693,6 @@
       </node>
     </node>
   </node>
-  <node concept="22mcaB" id="51M$6hf3mdt">
-    <property role="3GE5qa" value="_deprecated.chunk" />
-    <ref role="aqKnT" to="s6b7:22kx7U49GUn" resolve="IVariabilityContainer_old" />
-    <node concept="22hDWj" id="51M$6hf3mdu" role="22hAXT" />
-    <node concept="2VfDsV" id="51M$6hf3mdv" role="3ft7WO" />
-  </node>
-  <node concept="22mcaB" id="51M$6hf3mdE">
-    <property role="3GE5qa" value="_deprecated.chunk" />
-    <ref role="aqKnT" to="s6b7:3tsFshP5cTx" resolve="IVariabilityContent_old" />
-    <node concept="22hDWj" id="51M$6hf3mdF" role="22hAXT" />
-    <node concept="2VfDsV" id="51M$6hf3mdG" role="3ft7WO" />
-  </node>
-  <node concept="22mcaB" id="51M$6hf3mdR">
-    <property role="3GE5qa" value="_deprecated.chunk" />
-    <ref role="aqKnT" to="s6b7:3tsFshP56tQ" resolve="VariabilityModelChunk_old" />
-    <node concept="22hDWj" id="51M$6hf3mdS" role="22hAXT" />
-    <node concept="2VfDsV" id="51M$6hf3mdT" role="3ft7WO" />
-  </node>
   <node concept="22mcaB" id="367j$Y_CgaN">
     <ref role="aqKnT" to="s6b7:30ECcbtES_0" resolve="AbstractFeatureConfiguration_old" />
     <node concept="22hDWj" id="367j$Y_CgaO" role="22hAXT" />
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.structure.mps b/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.structure.mps
index 8c42a58c7a..a046469c99 100644
--- a/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.structure.mps
+++ b/code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.structure.mps
@@ -19,24 +19,6 @@
     <import index="4ndm" ref="r:a9fe59d7-0b4f-42b0-925a-71cc04f93df1(org.iets3.variability.configuration.base.structure)" />
   </imports>
   <registry>
-    <language id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources">
-      <concept id="2756621024541681841" name="jetbrains.mps.lang.resources.structure.Primitive" flags="ng" index="1irPi6">
-        <child id="1860120738943552529" name="fillColor" index="3PKjn_" />
-        <child id="1860120738943552531" name="borderColor" index="3PKjnB" />
-      </concept>
-      <concept id="2756621024541681849" name="jetbrains.mps.lang.resources.structure.Text" flags="ng" index="1irPie">
-        <property id="2756621024541681854" name="text" index="1irPi9" />
-        <child id="1860120738943552534" name="color" index="3PKjny" />
-      </concept>
-      <concept id="2756621024541674821" name="jetbrains.mps.lang.resources.structure.TextIcon" flags="ng" index="1irR5M">
-        <property id="1358878980655415353" name="iconId" index="2$rrk2" />
-        <child id="2756621024541675110" name="layers" index="1irR9h" />
-      </concept>
-      <concept id="2756621024541675104" name="jetbrains.mps.lang.resources.structure.Circle" flags="ng" index="1irR9n" />
-      <concept id="1860120738943552477" name="jetbrains.mps.lang.resources.structure.ColorLiteral" flags="ng" index="3PKj8D">
-        <property id="1860120738943552481" name="val" index="3PKj8l" />
-      </concept>
-    </language>
     <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
       <concept id="3348158742936976480" name="jetbrains.mps.lang.structure.structure.EnumerationMemberDeclaration" flags="ng" index="25R33">
         <property id="1421157252384165432" name="memberId" index="3tVfz5" />
@@ -73,16 +55,12 @@
         <child id="1071489727083" name="linkDeclaration" index="1TKVEi" />
         <child id="1071489727084" name="propertyDeclaration" index="1TKVEl" />
       </concept>
-      <concept id="1169125989551" name="jetbrains.mps.lang.structure.structure.InterfaceConceptDeclaration" flags="ig" index="PlHQZ">
-        <child id="1169127546356" name="extends" index="PrDN$" />
-      </concept>
+      <concept id="1169125989551" name="jetbrains.mps.lang.structure.structure.InterfaceConceptDeclaration" flags="ig" index="PlHQZ" />
       <concept id="1169127622168" name="jetbrains.mps.lang.structure.structure.InterfaceConceptReference" flags="ig" index="PrWs8">
         <reference id="1169127628841" name="intfc" index="PrY4T" />
       </concept>
       <concept id="1071489090640" name="jetbrains.mps.lang.structure.structure.ConceptDeclaration" flags="ig" index="1TIwiD">
-        <property id="1096454100552" name="rootable" index="19KtqR" />
         <reference id="1071489389519" name="extends" index="1TJDcQ" />
-        <child id="6327362524875300597" name="icon" index="rwd14" />
         <child id="1169129564478" name="implements" index="PzmwI" />
       </concept>
       <concept id="1071489288299" name="jetbrains.mps.lang.structure.structure.PropertyDeclaration" flags="ig" index="1TJgyi">
@@ -107,76 +85,6 @@
       </concept>
     </language>
   </registry>
-  <node concept="1TIwiD" id="3tsFshP56tQ">
-    <property role="TrG5h" value="VariabilityModelChunk_old" />
-    <property role="19KtqR" value="true" />
-    <property role="3GE5qa" value="_deprecated.chunk" />
-    <property role="EcuMT" value="3989254429232883574" />
-    <ref role="1TJDcQ" to="vs0r:6clJcrJYOUA" resolve="Chunk" />
-    <node concept="PrWs8" id="22kx7U49GUo" role="PzmwI">
-      <ref role="PrY4T" node="22kx7U49GUn" resolve="IVariabilityContainer_old" />
-    </node>
-    <node concept="1TJgyj" id="3tsFshP58gT" role="1TKVEi">
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="contents_old" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
-      <property role="IQ2ns" value="3989254429232890937" />
-      <ref role="20lvS9" node="3tsFshP5cTx" resolve="IVariabilityContent_old" />
-      <node concept="asaX9" id="51M$6hf3me2" role="lGtFl">
-        <property role="YLQ7P" value="The link was moved to concept &quot;org.iets3.variability.base.structure.VariabilityModelChunk&quot;" />
-      </node>
-    </node>
-    <node concept="1TJgyj" id="7nsgDAXznlY" role="1TKVEi">
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="imports_old" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
-      <property role="IQ2ns" value="8492736225391506814" />
-      <ref role="20lvS9" to="vs0r:DubiFAXpld" resolve="DefaultGenericChunkDependency" />
-      <node concept="asaX9" id="51M$6hf3med" role="lGtFl">
-        <property role="YLQ7P" value="The link was moved to concept &quot;org.iets3.variability.base.structure.VariabilityModelChunk&quot;" />
-      </node>
-    </node>
-    <node concept="1irR5M" id="3nzq23wvR45" role="rwd14">
-      <property role="2$rrk2" value="6" />
-      <node concept="1irR9n" id="3nzq23wwXTK" role="1irR9h">
-        <node concept="3PKj8D" id="3nzq23wwXTU" role="3PKjn_">
-          <property role="3PKj8l" value="209090" />
-        </node>
-        <node concept="3PKj8D" id="3nzq23wwXTX" role="3PKjnB">
-          <property role="3PKj8l" value="209020" />
-        </node>
-      </node>
-      <node concept="1irPie" id="3nzq23wvUeW" role="1irR9h">
-        <property role="1irPi9" value="V" />
-        <node concept="3PKj8D" id="3nzq23wvUf4" role="3PKjny">
-          <property role="3PKj8l" value="F8F8F8" />
-        </node>
-      </node>
-    </node>
-    <node concept="asaX9" id="51M$6hf3mdQ" role="lGtFl">
-      <property role="YLQ7P" value="The concept was moved to language &quot;org.iets3.variability.base&quot;" />
-    </node>
-  </node>
-  <node concept="PlHQZ" id="3tsFshP5cTx">
-    <property role="TrG5h" value="IVariabilityContent_old" />
-    <property role="3GE5qa" value="_deprecated.chunk" />
-    <property role="EcuMT" value="3989254429232909921" />
-    <node concept="asaX9" id="51M$6hf3mdD" role="lGtFl">
-      <property role="YLQ7P" value="The concept was moved to language &quot;org.iets3.variability.base&quot;" />
-    </node>
-  </node>
-  <node concept="1TIwiD" id="3tsFshP5d$8">
-    <property role="TrG5h" value="EmptyVariabilityContent_old" />
-    <property role="3GE5qa" value="_deprecated.chunk" />
-    <property role="EcuMT" value="3989254429232912648" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="PrWs8" id="3tsFshP5d$9" role="PzmwI">
-      <ref role="PrY4T" node="3tsFshP5cTx" resolve="IVariabilityContent_old" />
-    </node>
-    <node concept="asaX9" id="51M$6hf3mdg" role="lGtFl">
-      <property role="YLQ7P" value="The concept was moved to language &quot;org.iets3.variability.base&quot;" />
-    </node>
-  </node>
   <node concept="1TIwiD" id="3tsFshP5E8h">
     <property role="TrG5h" value="FeatureModel" />
     <property role="EcuMT" value="3989254429233029649" />
@@ -1056,20 +964,6 @@
       <ref role="PrY4T" to="l80j:4OgAv3N4pT3" resolve="ICanBeMappedToSolver" />
     </node>
   </node>
-  <node concept="PlHQZ" id="22kx7U49GUn">
-    <property role="EcuMT" value="2347646984684752535" />
-    <property role="3GE5qa" value="_deprecated.chunk" />
-    <property role="TrG5h" value="IVariabilityContainer_old" />
-    <node concept="PrWs8" id="22kx7U4bXc_" role="PrDN$">
-      <ref role="PrY4T" to="l80j:7QsdZDAwecO" resolve="IUseSolver" />
-    </node>
-    <node concept="PrWs8" id="22kx7U4Kqjy" role="PrDN$">
-      <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
-    </node>
-    <node concept="asaX9" id="51M$6hf3mds" role="lGtFl">
-      <property role="YLQ7P" value="The concept was moved to language &quot;org.iets3.variability.base&quot;" />
-    </node>
-  </node>
   <node concept="1TIwiD" id="6OwVbfnk$1s">
     <property role="EcuMT" value="7863545206544679004" />
     <property role="3GE5qa" value="constraints" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
index 49016f8c2d..8b0463eb05 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
@@ -1875,11 +1875,6 @@
             <ref role="3bR37D" node="JUiQTzdslj" resolve="org.iets3.core.expr.typetags" />
           </node>
         </node>
-        <node concept="1SiIV0" id="7yHH$DDpEMm" role="3bR37C">
-          <node concept="1Busua" id="7yHH$DDpEMn" role="1SiIV1">
-            <ref role="1Busuk" node="7yHH$DDpBOh" resolve="org.iets3.variability.featuremodel.base" />
-          </node>
-        </node>
         <node concept="3rtmxn" id="7yHH$DDpKD_" role="3bR31x">
           <node concept="3LXTmp" id="7yHH$DDpKDA" role="3rtmxm">
             <node concept="398BVA" id="7yHH$DDpKDB" role="3LXTmr">
@@ -1896,6 +1891,21 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="3ZwMOJttUKF" role="3bR37C">
+          <node concept="3bR9La" id="3ZwMOJttUKG" role="1SiIV1">
+            <ref role="3bR37D" node="7yHH$DDpBOh" resolve="org.iets3.variability.featuremodel.base" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="3ZwMOJttUKS" role="3bR37C">
+          <node concept="1Busua" id="3ZwMOJttUKT" role="1SiIV1">
+            <ref role="1Busuk" to="al5i:$bJ0jguQfr" resolve="com.mbeddr.core.base" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="3ZwMOJttUKU" role="3bR37C">
+          <node concept="1Busua" id="3ZwMOJttUKV" role="1SiIV1">
+            <ref role="1Busuk" node="49WTic8jAaa" resolve="org.iets3.analysis.base" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="7yHH$DDpG7t" role="2G$12L">
         <property role="BnDLt" value="true" />
diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.variability.os.sandbox/models/org.iets3.variability.os.sandbox.homeNetwork.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.variability.os.sandbox/models/org.iets3.variability.os.sandbox.homeNetwork.mps
index 5036615888..5eb1bdca8d 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.variability.os.sandbox/models/org.iets3.variability.os.sandbox.homeNetwork.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.variability.os.sandbox/models/org.iets3.variability.os.sandbox.homeNetwork.mps
@@ -100,9 +100,6 @@
       <concept id="3414566187106618468" name="org.iets3.variability.featuremodel.base.structure.ICalculateHashForUpdateWarning" flags="ngI" index="bVzmZ">
         <property id="3414566187106619445" name="__updateHash" index="bVyBI" />
       </concept>
-      <concept id="3989254429232883574" name="org.iets3.variability.featuremodel.base.structure.VariabilityModelChunk_old" flags="ng" index="12icEN">
-        <child id="3989254429232890937" name="contents_old" index="12i2BY" />
-      </concept>
       <concept id="3989254429233029895" name="org.iets3.variability.featuremodel.base.structure.Feature" flags="ng" index="12iwV3">
         <property id="3989254429233130872" name="subFeatureRelationship" index="12h82W" />
         <child id="8997672845436698678" name="attributes" index="21GevL" />
@@ -128,7 +125,6 @@
   </registry>
   <node concept="12icEM" id="7oSKjSJ25cu">
     <property role="TrG5h" value="HomeNetworkFeatures" />
-    <node concept="12i7jc" id="7oSKjSJ25cv" role="12i2BY" />
     <node concept="12iwZl" id="19VDUSODbI5" role="12i2BX">
       <property role="bVyBI" value="-2114197766" />
       <property role="0Rz4W" value="881601232" />
@@ -270,7 +266,6 @@
   </node>
   <node concept="12icEM" id="7oSKjSJ2nP$">
     <property role="TrG5h" value="Configurations" />
-    <node concept="12i7jc" id="7oSKjSJ2nP_" role="12i2BY" />
     <node concept="rqKB5" id="7oSKjSJ2z24" role="12i2BX">
       <property role="26YOJW" value="" />
       <property role="bVyBI" value="-141850337" />
diff --git a/code/languages/org.iets3.opensource/tests/test.org.iets3.variability.configuration.base/models/test.org.iets3.variability.configuration.base.solver_base@tests.mps b/code/languages/org.iets3.opensource/tests/test.org.iets3.variability.configuration.base/models/test.org.iets3.variability.configuration.base.solver_base@tests.mps
index 7b54f8c08b..9a649a3958 100644
--- a/code/languages/org.iets3.opensource/tests/test.org.iets3.variability.configuration.base/models/test.org.iets3.variability.configuration.base.solver_base@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.org.iets3.variability.configuration.base/models/test.org.iets3.variability.configuration.base.solver_base@tests.mps
@@ -168,9 +168,6 @@
       <concept id="3414566187106618468" name="org.iets3.variability.featuremodel.base.structure.ICalculateHashForUpdateWarning" flags="ngI" index="bVzmZ">
         <property id="3414566187106619445" name="__updateHash" index="bVyBI" />
       </concept>
-      <concept id="3989254429232883574" name="org.iets3.variability.featuremodel.base.structure.VariabilityModelChunk_old" flags="ng" index="12icEN">
-        <child id="3989254429232890937" name="contents_old" index="12i2BY" />
-      </concept>
       <concept id="3989254429233029895" name="org.iets3.variability.featuremodel.base.structure.Feature" flags="ng" index="12iwV3">
         <property id="3989254429233130872" name="subFeatureRelationship" index="12h82W" />
         <child id="3989254429233029898" name="subFeatures" index="12iwVe" />
@@ -521,7 +518,6 @@
     <node concept="1qefOq" id="4XfgEhEe6vc" role="1SKRRt">
       <node concept="12icEM" id="4XfgEhEe6ve" role="1qenE9">
         <property role="TrG5h" value="V" />
-        <node concept="12i7jc" id="4XfgEhEe6vf" role="12i2BY" />
         <node concept="12iwZl" id="4XfgEhEe6vh" role="12i2BX">
           <property role="bVyBI" value="112496978" />
           <node concept="12iwV3" id="4XfgEhEe6vi" role="12iwV8">
@@ -612,7 +608,6 @@
     <node concept="1qefOq" id="7_IBAC_WHbY" role="1SKRRt">
       <node concept="12icEM" id="7_IBAC_WHc0" role="1qenE9">
         <property role="TrG5h" value="V" />
-        <node concept="12i7jc" id="7_IBAC_WHc1" role="12i2BY" />
         <node concept="12i7jc" id="3scZu9zdPJM" role="12i2BX" />
         <node concept="12iwZl" id="7_IBAC_WHc3" role="12i2BX">
           <node concept="12iwV3" id="7_IBAC_WHc4" role="12iwV8">
diff --git a/code/languages/org.iets3.opensource/tests/test.org.iets3.variability.featuremodel.base/models/test.org.iets3.variability.featuremodel.base.solver_gen@tests.mps b/code/languages/org.iets3.opensource/tests/test.org.iets3.variability.featuremodel.base/models/test.org.iets3.variability.featuremodel.base.solver_gen@tests.mps
index 27fee59662..ccfaf545da 100644
--- a/code/languages/org.iets3.opensource/tests/test.org.iets3.variability.featuremodel.base/models/test.org.iets3.variability.featuremodel.base.solver_gen@tests.mps
+++ b/code/languages/org.iets3.opensource/tests/test.org.iets3.variability.featuremodel.base/models/test.org.iets3.variability.featuremodel.base.solver_gen@tests.mps
@@ -122,9 +122,6 @@
       </concept>
     </language>
     <language id="165f1d05-2506-4544-895e-1424f54166ec" name="org.iets3.variability.featuremodel.base">
-      <concept id="3989254429232883574" name="org.iets3.variability.featuremodel.base.structure.VariabilityModelChunk_old" flags="ng" index="12icEN">
-        <child id="3989254429232890937" name="contents_old" index="12i2BY" />
-      </concept>
       <concept id="3989254429233029895" name="org.iets3.variability.featuremodel.base.structure.Feature" flags="ng" index="12iwV3" />
       <concept id="3989254429233029649" name="org.iets3.variability.featuremodel.base.structure.FeatureModel" flags="ng" index="12iwZl">
         <child id="3989254429233029900" name="root" index="12iwV8" />
@@ -203,7 +200,6 @@
     <node concept="1qefOq" id="7_IBAC_WHbY" role="1SKRRt">
       <node concept="12icEM" id="7_IBAC_WHc0" role="1qenE9">
         <property role="TrG5h" value="V" />
-        <node concept="12i7jc" id="7_IBAC_WHc1" role="12i2BY" />
         <node concept="12i7jc" id="3scZu9zdPJM" role="12i2BX" />
         <node concept="12iwZl" id="7_IBAC_WHc3" role="12i2BX">
           <node concept="12iwV3" id="7_IBAC_WHc4" role="12iwV8">