diff --git a/.github/workflows/dotnet-format-daily.yml b/.github/workflows/dotnet-format-daily.yml
index 2849d9866..b567df9b2 100644
--- a/.github/workflows/dotnet-format-daily.yml
+++ b/.github/workflows/dotnet-format-daily.yml
@@ -21,7 +21,7 @@ jobs:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           action: "fix"
           #only-changed-files: true # only works for PRs
-          workspace: "Xamarin.Forms.sln"
+          workspace: "Microsoft.Maui.sln"
     
       - name: Commit files
         if: steps.format.outputs.has-changes == 'true'
diff --git a/eng/pipelines/common/build-windows.yml b/eng/pipelines/common/build-windows.yml
index f6b85bf1c..8dcb830b8 100644
--- a/eng/pipelines/common/build-windows.yml
+++ b/eng/pipelines/common/build-windows.yml
@@ -1,5 +1,4 @@
 parameters:
-  slnPath : 'Xamarin.Forms.sln'
   msbuildExtraArguments : ''
   artifactsTargetFolder: '$(build.artifactstagingdirectory)'
   artifactsName: 'win_build'
@@ -28,12 +27,6 @@ steps:
     inputs:
       script: 'nuget install NUnit3TestAdapter'
 
-  - task: NuGetCommand@2
-    displayName: 'NuGet restore ${{ parameters.slnPath }}'
-    inputs:
-      restoreSolution: ${{ parameters.slnPath }}
-      feedsToUse: config
-
   - script: build.cmd -Target BuildForNuget -ScriptArgs '--BUILD_CONFIGURATION="$(BuildConfiguration)"','--Build_ArtifactStagingDirectory="$(Build.ArtifactStagingDirectory)"'
     name: winbuild
     displayName: 'Build Projects For Nuget'
@@ -49,8 +42,6 @@ steps:
       testRunTitle: '$(BuildConfiguration)_UnitTests'
       configuration: '$(BuildConfiguration)'
       diagnosticsEnabled: true
-      # pathtoCustomTestAdapters: ${{ parameters.nunitTestAdapterFolder }}
-      # overrideTestrunParameters: -platform AnyCPU -framework Framework47
 
   - task: DotNetCoreCLI@2
     displayName: 'Unit Tests'
diff --git a/eng/pipelines/common/variables.yml b/eng/pipelines/common/variables.yml
index 96e3570ff..6008d82e3 100644
--- a/eng/pipelines/common/variables.yml
+++ b/eng/pipelines/common/variables.yml
@@ -1,8 +1,4 @@
 variables:
-- name: SolutionFile
-  value: Xamarin.Forms.sln
-- name: ControlGallerySolutionFile
-  value: Xamarin.Forms.ControlGallery.sln
 - name: BuildVersion
   value: $[counter('handler-counter', 1)]
 - name: NUGET_VERSION