diff --git a/datamodels/2.x/combodo-data-feature-removal/src/Controller/DataFeatureRemovalController.php b/datamodels/2.x/combodo-data-feature-removal/src/Controller/DataFeatureRemovalController.php
index 395f3c8b31..d43775713f 100644
--- a/datamodels/2.x/combodo-data-feature-removal/src/Controller/DataFeatureRemovalController.php
+++ b/datamodels/2.x/combodo-data-feature-removal/src/Controller/DataFeatureRemovalController.php
@@ -108,7 +108,7 @@ class DataFeatureRemovalController extends Controller
 			SetupUtils::EraseSetupToken();
 		} else {
 			//from same module
-			//$this->ValidateTransactionId();
+			$this->ValidateTransactionId();
 		}
 
 		// Display changed extensions
@@ -233,40 +233,6 @@ class DataFeatureRemovalController extends Controller
 		return [$this->GetTableData($sName, $aColumns, $aRows), $iQueryCount, !$bHasIssues];
 	}
 
-	public function OperationDeletionPlan(): void
-	{
-		$aParams = [];
-		$this->ValidateTransactionId();
-
-		$aClasses = utils::ReadPostedParam('classes', null, utils::ENUM_SANITIZATION_FILTER_CLASS);
-
-		$oDataCleanupService = new DataCleanupService();
-		$aDeletionPlanSummaryEntities = $oDataCleanupService->GetCleanupSummary($aClasses);
-		$aColumns = ['Class', 'DeleteCount' , 'UpdateCount', 'IssueCount'];
-		$aRows = [];
-		$iQueryCount = 0;
-		$bHasIssues = false;
-		foreach ($aDeletionPlanSummaryEntities as $oDeletionPlanSummaryEntity) {
-			$aRows[] = [
-				$oDeletionPlanSummaryEntity->sClass,
-				$oDeletionPlanSummaryEntity->iDeleteCount,
-				$oDeletionPlanSummaryEntity->iUpdateCount,
-				$oDeletionPlanSummaryEntity->iIssueCount,
-			];
-			$bHasIssues |= ($oDeletionPlanSummaryEntity->iIssueCount !== 0);
-			$iQueryCount += $oDeletionPlanSummaryEntity->iDeleteCount;
-			$iQueryCount += $oDeletionPlanSummaryEntity->iUpdateCount;
-		}
-
-		$aParams['sTransactionId'] = utils::GetNewTransactionId();
-		$aParams['aDeletionPlanSummary'] = $this->GetTableData('Extensions', $aColumns, $aRows);
-		$aParams['aClasses'] = $aClasses;
-		$aParams['iQueryCount'] = $iQueryCount;
-		$aParams['bDeletionPossible'] = !$bHasIssues;
-
-		$this->DisplayPage($aParams);
-	}
-
 	public function OperationDoDeletion(): void
 	{
 		$this->ValidateTransactionId();
diff --git a/datamodels/2.x/combodo-data-feature-removal/templates/AnalysisResult.html.twig b/datamodels/2.x/combodo-data-feature-removal/templates/AnalysisResult.html.twig
index 66871f0ce5..e585003983 100644
--- a/datamodels/2.x/combodo-data-feature-removal/templates/AnalysisResult.html.twig
+++ b/datamodels/2.x/combodo-data-feature-removal/templates/AnalysisResult.html.twig
@@ -26,6 +26,9 @@
                 {% for sCode, sLabel in aRemovedExtensions %}
                     {% UIInput ForHidden { sName:"aRemovedExtensions[" ~ sCode ~ "]", sValue:sLabel } %}
                 {% endfor %}
+                {% for sInputName, sValue in aHiddenInputs %}
+                    {% UIInput ForHidden { sName:sInputName, sValue:sValue } %}
+                {% endfor %}
                 {% UIToolbar ForButton {} %}
                     {% UIButton ForPrimaryAction {sLabel:'UI:Button:DoDeletion'|dict_s, sName:'btn_deletion', sId:'btn_deletion', bIsSubmit:true} %}
                 {% EndUIToolbar %}