diff --git a/build-tools/xaprepare/xaprepare/Resources/JdkInfo.Windows.props.in b/build-tools/xaprepare/xaprepare/Resources/JdkInfo.Windows.props.in
deleted file mode 100644
index c864935858e..00000000000
--- a/build-tools/xaprepare/xaprepare/Resources/JdkInfo.Windows.props.in
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Choose>
-    <When Condition=" '$(JdkJvmPath)' == '' ">
-      <PropertyGroup>
-        <JdkJvmPath>@JdkJvmPath@</JdkJvmPath>
-      </PropertyGroup>
-      <ItemGroup>
-        <JdkIncludePath Include="@JdkIncludePathShared@" />
-        <JdkIncludePath Include="@JdkIncludePathOS@" />
-      </ItemGroup>
-    </When>
-  </Choose>
-  <PropertyGroup>
-    <JavaPath Condition=" '$(JavaPath)' == '' ">@java@</JavaPath>
-    <JavaCPath Condition=" '$(JavaCPath)' == '' ">@javac@</JavaCPath>
-    <JarPath Condition=" '$(JarPath)' == '' ">@jar@</JarPath>
-    <JavaSdkDirectory Condition=" '$(JavaSdkDirectory)' == '' ">@javahome@</JavaSdkDirectory>
-    <DotnetToolPath Condition=" '$(DotnetToolPath)' == '' ">@dotnet@</DotnetToolPath>
-  </PropertyGroup>
-</Project>
diff --git a/build-tools/xaprepare/xaprepare/Scenarios/Scenario_Standard.cs b/build-tools/xaprepare/xaprepare/Scenarios/Scenario_Standard.cs
index 782419551de..69277c926ac 100644
--- a/build-tools/xaprepare/xaprepare/Scenarios/Scenario_Standard.cs
+++ b/build-tools/xaprepare/xaprepare/Scenarios/Scenario_Standard.cs
@@ -19,11 +19,5 @@ protected override void AddSteps (Context context)
 
 			Steps.Add (new Step_GenerateFiles (atBuildStart: true));
 		}
-
-		protected override void AddEndSteps (Context context)
-		{
-			Steps.Add (new Step_GenerateFiles (atBuildStart: false));
-		}
-
 	}
 }
diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_GenerateFiles.Windows.cs b/build-tools/xaprepare/xaprepare/Steps/Step_GenerateFiles.Windows.cs
deleted file mode 100644
index 79b7fd10db0..00000000000
--- a/build-tools/xaprepare/xaprepare/Steps/Step_GenerateFiles.Windows.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-
-namespace Xamarin.Android.Prepare
-{
-	partial class Step_GenerateFiles
-	{
-		partial void AddOSSpecificSteps (Context context, List<GeneratedFile> steps)
-		{
-			string? javaSdkDirectory = context.Properties.GetValue ("JavaSdkDirectory");
-			if (String.IsNullOrEmpty (javaSdkDirectory))
-				javaSdkDirectory = context.OS.JavaHome;
-
-			string jdkJvmPath = Path.Combine (javaSdkDirectory, "jre", "bin", "server", "jvm.dll");
-			string jdkIncludePathShared = Path.Combine (javaSdkDirectory, "include");
-			string jdkIncludePathOS = Path.Combine (jdkIncludePathShared, "win32");
-
-			var replacements = new Dictionary<string, string> (StringComparer.Ordinal) {
-				{ "@JdkJvmPath@",           jdkJvmPath },
-				{ "@JdkIncludePathShared@", jdkIncludePathShared },
-				{ "@JdkIncludePathOS@",     jdkIncludePathOS },
-				{ "@javac@",                context.OS.JavaCPath },
-				{ "@java@",                 context.OS.JavaPath },
-				{ "@jar@",                  context.OS.JarPath },
-				{ "@javahome@",             context.OS.JavaHome },
-				{ "@dotnet@",               Configurables.Paths.DotNetPreviewTool },
-			};
-
-			var step = new GeneratedPlaceholdersFile (
-				replacements,
-				Path.Combine (Configurables.Paths.BootstrapResourcesDir, "JdkInfo.Windows.props.in"),
-				Path.Combine (Configurables.Paths.ExternalJavaInteropDir, "bin", $"Build{context.Configuration}", "JdkInfo.props")
-			);
-
-			steps.Add (step);
-		}
-	}
-}
diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_GenerateFiles.cs b/build-tools/xaprepare/xaprepare/Steps/Step_GenerateFiles.cs
index 5d555fdf24d..3de2ab6a911 100644
--- a/build-tools/xaprepare/xaprepare/Steps/Step_GenerateFiles.cs
+++ b/build-tools/xaprepare/xaprepare/Steps/Step_GenerateFiles.cs
@@ -41,28 +41,17 @@ protected override Task<bool> Execute (Context context)
 
 		List<GeneratedFile>? GetFilesToGenerate (Context context)
 		{
-			if (atBuildStart) {
-				if (onlyRequired) {
-					return null;
-				} else {
-					return new List <GeneratedFile> {
-						Get_Configuration_OperatingSystem_props (context),
-					};
-				}
-			}
+			if (!atBuildStart)
+				return null;
 
 			if (onlyRequired)
 				return null;
 
-			var steps = new List <GeneratedFile> ();
-
-			AddOSSpecificSteps (context, steps);
-
-			return steps;
+			return new List <GeneratedFile> {
+				Get_Configuration_OperatingSystem_props (context),
+			};
 		}
 
-		partial void AddOSSpecificSteps (Context context, List<GeneratedFile> steps);
-
 		GeneratedFile Get_Configuration_OperatingSystem_props (Context context)
 		{
 			const string OutputFileName = "Configuration.OperatingSystem.props";