diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XamlFileGenerator.cs b/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XamlFileGenerator.cs
index e15715b60e8d..79f1d3f52b84 100644
--- a/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XamlFileGenerator.cs
+++ b/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XamlFileGenerator.cs
@@ -1,7 +1,4 @@
 #nullable enable
-#if false // fixme@xy: to remove the constant; temporarily added to test backward compat
-#define USE_NEW_TP_CODEGEN
-#endif
 
 using System;
 using System.Collections.Generic;
diff --git a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_FrameworkTemplatePool.cs b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_FrameworkTemplatePool.cs
index dd10db08439e..0a4cacb251c2 100644
--- a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_FrameworkTemplatePool.cs
+++ b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_FrameworkTemplatePool.cs
@@ -36,8 +36,7 @@ public class Given_FrameworkTemplatePool
 	//#if __ANDROID__
 	//[Ignore("https://github.com/unoplatform/uno/issues/13969")]
 	//#endif
-	// todo@xy: create new issue and link it here
-	[Ignore("Template pooling is globally disabled on all-platforms for #13969. With TemplatedParent rework, the recycling part was not re-introduced/updated.")]
+	[Ignore("#18317 With TemplatedParent rework, the recycling part was not re-introduced/updated.")]
 	public async Task When_Recycle()
 	{
 		using (FeatureConfigurationHelper.UseTemplatePooling())
diff --git a/src/Uno.UI/Controls/CommandBar/NativeCommandBarPresenter.iOS.cs b/src/Uno.UI/Controls/CommandBar/NativeCommandBarPresenter.iOS.cs
index cf8d5f6dd2d7..b5ef269069f3 100644
--- a/src/Uno.UI/Controls/CommandBar/NativeCommandBarPresenter.iOS.cs
+++ b/src/Uno.UI/Controls/CommandBar/NativeCommandBarPresenter.iOS.cs
@@ -37,7 +37,7 @@ private protected override void OnLoaded()
 
 			if (_commandBar == null)
 			{
-				commandBar = GetTemplatedParent() as CommandBar; // todo@xy: validate
+				commandBar = GetTemplatedParent() as CommandBar;
 				_commandBar = new WeakReference<CommandBar?>(commandBar);
 			}
 
diff --git a/src/Uno.UI/Controls/NativeFramePresenter.iOS.cs b/src/Uno.UI/Controls/NativeFramePresenter.iOS.cs
index 46e617dadebb..acf1b430333d 100644
--- a/src/Uno.UI/Controls/NativeFramePresenter.iOS.cs
+++ b/src/Uno.UI/Controls/NativeFramePresenter.iOS.cs
@@ -96,7 +96,6 @@ protected override Size ArrangeOverride(Size finalSize)
 
 		private protected override void SetTemplatedParentImpl(DependencyObject parent)
 		{
-			// todo@xy: review if this makes sense?
 			base.SetTemplatedParentImpl(parent);
 
 			InitializeController(parent as Frame);