diff --git a/org.fortiss.tooling.ext.variability/src/org/fortiss/tooling/ext/variability/analysis/.ratings b/org.fortiss.tooling.ext.variability/src/org/fortiss/tooling/ext/variability/analysis/.ratings
index fa79ffebe73db90bbeb8b8b8733717fe70e45717..01d423cf551df4904b00bb5069c1b14bdbd7fe2a 100644
--- a/org.fortiss.tooling.ext.variability/src/org/fortiss/tooling/ext/variability/analysis/.ratings
+++ b/org.fortiss.tooling.ext.variability/src/org/fortiss/tooling/ext/variability/analysis/.ratings
@@ -1,4 +1,4 @@
 OptimizedProductLineAnalysisBase.java 94cb2d0d254f3e50f21ca039b6784e1a26c4d91c YELLOW
 OptimizedProductLineTranslation.java ad12974d9e19fc88e3240d6a4c2306004d0a3b39 YELLOW
-ProductLineAnalysisBase.java fe879e17745c45ed471b9131c9a6731e646150bb RED
-ProductLineTranslationBase.java 3da2e75a30ecf0929bf5c81294abf0bbe171ffb4 RED
+ProductLineAnalysisBase.java 891235573a2102279256585f8dc31934240b8dc1 GREEN
+ProductLineTranslationBase.java f24fb9343003c025bc4d2292d15bca543a548749 GREEN
diff --git a/org.fortiss.tooling.ext.variability/src/org/fortiss/tooling/ext/variability/analysis/ProductLineAnalysisBase.java b/org.fortiss.tooling.ext.variability/src/org/fortiss/tooling/ext/variability/analysis/ProductLineAnalysisBase.java
index fe879e17745c45ed471b9131c9a6731e646150bb..891235573a2102279256585f8dc31934240b8dc1 100644
--- a/org.fortiss.tooling.ext.variability/src/org/fortiss/tooling/ext/variability/analysis/ProductLineAnalysisBase.java
+++ b/org.fortiss.tooling.ext.variability/src/org/fortiss/tooling/ext/variability/analysis/ProductLineAnalysisBase.java
@@ -35,6 +35,8 @@ import org.fortiss.variability.analysis.ProductLineConstraintViolation;
  * 
  * @deprecated
  * 
+ * TODO: To be removed completely #4328 (https://git.fortiss.org/af3/af3/-/issues/4328)
+ * 
  * @author bayha
  */
 public abstract class ProductLineAnalysisBase extends GenericProductLineAnalysis {
diff --git a/org.fortiss.tooling.ext.variability/src/org/fortiss/tooling/ext/variability/analysis/ProductLineTranslationBase.java b/org.fortiss.tooling.ext.variability/src/org/fortiss/tooling/ext/variability/analysis/ProductLineTranslationBase.java
index 3da2e75a30ecf0929bf5c81294abf0bbe171ffb4..f24fb9343003c025bc4d2292d15bca543a548749 100644
--- a/org.fortiss.tooling.ext.variability/src/org/fortiss/tooling/ext/variability/analysis/ProductLineTranslationBase.java
+++ b/org.fortiss.tooling.ext.variability/src/org/fortiss/tooling/ext/variability/analysis/ProductLineTranslationBase.java
@@ -28,6 +28,8 @@ import org.fortiss.variability.model.presence.PresenceConditionTerm;
  * 
  * @deprecated
  * 
+ * TODO: To be removed completely #4328 (https://git.fortiss.org/af3/af3/-/issues/4328)
+ * 
  * @author bayha
  */
 public class ProductLineTranslationBase extends GenericProductLineTranslation {
diff --git a/org.fortiss.variability/src/org/fortiss/variability/analysis/.ratings b/org.fortiss.variability/src/org/fortiss/variability/analysis/.ratings
index d969de51672fc0496d5ec851595044648317a002..6994b88d1978367f19c83dad7809343be076004b 100644
--- a/org.fortiss.variability/src/org/fortiss/variability/analysis/.ratings
+++ b/org.fortiss.variability/src/org/fortiss/variability/analysis/.ratings
@@ -2,7 +2,7 @@ BucketSetMap.java 665a28c80a9693b9b9e31b7ebe59f2de4195d56c YELLOW
 DualKeyMap.java 75fbe85a54e5a655aaf67108ae004f98ed2879d8 YELLOW
 EMFProductLineTranslation.java a62c588bd806fdf98d1e2fb4138c359528edcaad YELLOW
 GenericProductLineAnalysis.java 314f4de5be3ac7f6589192e7b41540153e032199 YELLOW
-GenericProductLineTranslation.java e00248a4b17430f58afc2a60aa51f340eca77db3 RED
+GenericProductLineTranslation.java 2df1a1c1363cb93b6f498308e575833cf705e2fd GREEN
 IProductLineConstraint.java 1b0e1231cc578a6e7e544441ac33533b4feafeb1 YELLOW
 IProductLineTranslation.java 733dae03e2baae237b6f0b33f0dd618a4f47cf73 YELLOW
 ProductLineConstraintBase.java 04097c7c31367fdd11a054ba2b259a0535a313f4 YELLOW
diff --git a/org.fortiss.variability/src/org/fortiss/variability/analysis/GenericProductLineTranslation.java b/org.fortiss.variability/src/org/fortiss/variability/analysis/GenericProductLineTranslation.java
index e00248a4b17430f58afc2a60aa51f340eca77db3..2df1a1c1363cb93b6f498308e575833cf705e2fd 100644
--- a/org.fortiss.variability/src/org/fortiss/variability/analysis/GenericProductLineTranslation.java
+++ b/org.fortiss.variability/src/org/fortiss/variability/analysis/GenericProductLineTranslation.java
@@ -57,6 +57,8 @@ import com.microsoft.z3.Symbol;
  * 
  * @deprecated
  * 
+ * TODO: To be removed completely #4328 (https://git.fortiss.org/af3/af3/-/issues/4328)
+ * 
  * @author bayha
  */
 public class GenericProductLineTranslation implements IProductLineTranslation {