diff --git a/.github/workflows/build-and-test-LOGGING.yml b/.github/workflows/build-and-test-LOGGING.yml
deleted file mode 100644
index 8c9ce729f..000000000
--- a/.github/workflows/build-and-test-LOGGING.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-# Syntax: https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
-# .NET CLI: https://docs.microsoft.com/dotnet/core/tools/
-# Description: The purpose of this workflow is to compile and run unit tests.
-
-name: Build And Test, LOGGING
-
-on:
-  workflow_dispatch:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-
-jobs:
-  build-test-LOGGING:
-
-    runs-on: ${{ matrix.os }}
-
-    env:
-      SOLUTION: ./LOGGING/Logging.sln
-      TEST_RESULTS_DIRECTORY: ${{ github.workspace }}/TestResults
-
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [windows-latest]
-        framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0, net8.0, net9.0]
-
-    steps:
-    - uses: actions/checkout@v4
-    
-    - name: Setup dotnet
-      uses: actions/setup-dotnet@v4.3.1
-      with:
-        dotnet-version: |
-            3.1.x
-            6.0.x
-            7.0.x
-            8.0.x
-            9.0.x
-
-    - name: Restore
-      run: dotnet restore ${{ env.SOLUTION }} 
-
-    - name: Build
-      run: dotnet build ${{ env.SOLUTION }} --configuration Release --no-restore
-
-    - name: Test
-      id: test1
-      continue-on-error: true
-      run: dotnet test ${{ env.SOLUTION }} --framework ${{ matrix.framework }} --configuration Release --no-build --results-directory ${{ env.TEST_RESULTS_DIRECTORY }} --logger:"console;verbosity=detailed" --logger:"trx;logfileprefix=testResults_"
-
-    - name: Retry tests
-      if: steps.test1.outcome=='failure'
-      run: pwsh -f ./.scripts/build_RetryTests.ps1 -TestResultsDirectory ${{ env.TEST_RESULTS_DIRECTORY }} -WorkingDirectory ${{ github.workspace }}
diff --git a/.github/workflows/build-and-test-NETCORE.yml b/.github/workflows/build-and-test-NETCORE.yml
deleted file mode 100644
index 42ca8a9ab..000000000
--- a/.github/workflows/build-and-test-NETCORE.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-# Syntax: https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
-# .NET CLI: https://docs.microsoft.com/dotnet/core/tools/
-# Description: The purpose of this workflow is to compile and run unit tests.
-
-name: Build And Test, NETCORE
-
-on:
-  workflow_dispatch:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-
-jobs:
-  build-test-NETCORE:
-
-    runs-on: ${{ matrix.os }}
-
-    env:
-      SOLUTION: ./NETCORE/ApplicationInsights.AspNetCore.sln
-      TEST_RESULTS_DIRECTORY: ${{ github.workspace }}/TestResults
-
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, windows-latest]
-        framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0, net8.0, net9.0]
-        include: 
-          - os: ubuntu-latest
-            args: "--filter TestCategory!=WindowsOnly"
-
-    steps:
-    - uses: actions/checkout@v4
-    
-    - name: Setup dotnet
-      uses: actions/setup-dotnet@v4.3.1
-      with:
-        dotnet-version: |
-            3.1.x
-            6.0.x
-            7.0.x
-            8.0.x
-            9.0.x
-
-    - name: Restore
-      run: dotnet restore ${{ env.SOLUTION }}
-
-    - name: Build
-      run: dotnet build ${{ env.SOLUTION }} --configuration Release --no-restore
-
-    - name: Test
-      id: test1
-      continue-on-error: true
-      run: dotnet test ${{ env.SOLUTION }} --framework ${{ matrix.framework }} --configuration Release --no-build --results-directory ${{ env.TEST_RESULTS_DIRECTORY }} --logger:"console;verbosity=detailed" --logger:"trx;logfileprefix=testResults_" ${{ matrix.args }}
-
-    - name: Retry tests
-      if: steps.test1.outcome=='failure'
-      run: pwsh -f ./.scripts/build_RetryTests.ps1 -TestResultsDirectory ${{ env.TEST_RESULTS_DIRECTORY }} -WorkingDirectory ${{ github.workspace }}
diff --git a/.github/workflows/build-and-test-BASE.yml b/.github/workflows/build-and-test-SHIM.yml
similarity index 85%
rename from .github/workflows/build-and-test-BASE.yml
rename to .github/workflows/build-and-test-SHIM.yml
index a4a00ef1f..63f5b82e5 100644
--- a/.github/workflows/build-and-test-BASE.yml
+++ b/.github/workflows/build-and-test-SHIM.yml
@@ -2,29 +2,29 @@
 # .NET CLI: https://docs.microsoft.com/dotnet/core/tools/
 # Description: The purpose of this workflow is to compile and run unit tests.
 
-name: Build And Test, BASE
+name: Build And Test, SHIM
 
 on:
   workflow_dispatch:
   push:
-    branches: [ main ]
+    branches: [ "main", "develop", "master" ]
   pull_request:
-    branches: [ main ]
+    branches: [ "main", "develop", "master" ]
 
 jobs:
-  build-test-BASE:
+  build-test-SHIM:
 
     runs-on: ${{ matrix.os }}
 
     env:
-      SOLUTION: ./BASE/Microsoft.ApplicationInsights.sln
+      SOLUTION: ./SHIM/Microsoft.ApplicationInsights.Shim.sln
       TEST_RESULTS_DIRECTORY: ${{ github.workspace }}/TestResults
 
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
-        framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0, net8.0, net9.0]
+        framework: [net462, net472, net480, net481, net8.0, net9.0]
         include: 
           - os: ubuntu-latest
             args: "--filter TestCategory!=WindowsOnly"
diff --git a/.github/workflows/build-and-test-WEB.yml b/.github/workflows/build-and-test-WEB.yml
deleted file mode 100644
index 351e96bc0..000000000
--- a/.github/workflows/build-and-test-WEB.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-# Syntax: https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
-# .NET CLI: https://docs.microsoft.com/dotnet/core/tools/
-# Description: The purpose of this workflow is to compile and run unit tests.
-
-name: Build And Test, WEB
-
-on:
-  workflow_dispatch:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-
-jobs:
-  build-test-WEB:
-
-    runs-on: ${{ matrix.os }}
-
-    env:
-      SOLUTION: ./WEB/Src/Microsoft.ApplicationInsights.Web.sln
-      TEST_RESULTS_DIRECTORY: ${{ github.workspace }}/TestResults
-
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [windows-latest]
-        framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0, net8.0, net9.0]
-
-    steps:
-    - uses: actions/checkout@v4
-    
-    - name: Setup dotnet
-      uses: actions/setup-dotnet@v4.3.1
-      with:
-        dotnet-version: |
-            3.1.x
-            6.0.x
-            7.0.x
-            8.0.x
-            9.0.x
-
-    - name: Restore
-      run: dotnet restore ${{ env.SOLUTION }}
-
-    - name: Build
-      run: dotnet build ${{ env.SOLUTION }} --configuration Release --no-restore
-
-    - name: Test
-      id: test1
-      continue-on-error: true
-      run: dotnet test ${{ env.SOLUTION }} --framework ${{ matrix.framework }} --configuration Release --no-build --results-directory ${{ env.TEST_RESULTS_DIRECTORY }} --logger:"console;verbosity=detailed" --logger:"trx;logfileprefix=testResults_" ${{ matrix.args }}
-
-    - name: Retry tests
-      if: steps.test1.outcome=='failure'
-      run: pwsh -f ./.scripts/build_RetryTests.ps1 -TestResultsDirectory ${{ env.TEST_RESULTS_DIRECTORY }} -WorkingDirectory ${{ github.workspace }}
diff --git a/.github/workflows/codeql-csharp.yml b/.github/workflows/codeql-csharp.yml
index a3595d257..ff8b94a8b 100644
--- a/.github/workflows/codeql-csharp.yml
+++ b/.github/workflows/codeql-csharp.yml
@@ -45,13 +45,7 @@ jobs:
       fail-fast: false
       matrix:
         solution:
-          - ./NETCORE/ApplicationInsights.AspNetCore.sln
-          - ./Everything.sln
-          - ./ProjectsForSigning.sln
-          - ./examples/Examples.sln
-          - ./LOGGING/Logging.sln
-          - ./BASE/Microsoft.ApplicationInsights.sln
-          - ./WEB/Src/Microsoft.ApplicationInsights.Web.sln
+          - ./SHIM/Microsoft.ApplicationInsights.Shim.sln
         include:
         - language: csharp
           build-mode: manual
@@ -72,9 +66,6 @@ jobs:
       uses: actions/setup-dotnet@v4.3.1
       with:
         dotnet-version: |
-            3.1.x
-            6.0.x
-            7.0.x
             8.0.x
             9.0.x
 
diff --git a/.github/workflows/redfield-sanity-check.yml b/.github/workflows/redfield-sanity-check.yml
deleted file mode 100644
index 9c69e4c4e..000000000
--- a/.github/workflows/redfield-sanity-check.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-# Syntax: https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
-# .NET CLI: https://docs.microsoft.com/dotnet/core/tools/
-# Description: The purpose of this workflow is to compile and run unit tests with redfield flag.
-
-name: Redfield Validation
-
-on:
-  workflow_dispatch:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-
-jobs:
-  build-test-REDFIELD:
-
-    runs-on: ${{ matrix.os }}
-
-    env:
-      SOLUTION: ./BASE/Microsoft.ApplicationInsights.sln
-      TEST_RESULTS_DIRECTORY: ${{ github.workspace }}/TestResults
-
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest]
-        framework: [netcoreapp3.1,net6.0,net7.0,net8.0,net9.0]
-        include: 
-            - os: ubuntu-latest
-              args: "--filter TestCategory!=WindowsOnly"
-
-    steps:
-    - uses: actions/checkout@v4
-    
-    - name: Setup dotnet
-      uses: actions/setup-dotnet@v4.3.1
-      with:
-        dotnet-version: |
-            3.1.x
-            6.0.x
-            7.0.x
-            8.0.x
-            9.0.x
-
-    - name: Restore
-      run: dotnet restore ${{ env.SOLUTION }}
-
-    - name: Build
-      run: dotnet build ${{ env.SOLUTION }} --configuration Release --no-restore -p:Redfield=True
-
-    - name: Test
-      id: test1
-      continue-on-error: true
-      run: dotnet test ${{ env.SOLUTION }} --framework ${{ matrix.framework }} --configuration Release --no-build --results-directory ${{ env.TEST_RESULTS_DIRECTORY }} --logger:"console;verbosity=detailed" --logger:"trx;logfileprefix=testResults_" ${{ matrix.args }}
-
-    - name: Retry tests
-      if: steps.test1.outcome=='failure'
-      run: pwsh -f ./.scripts/build_RetryTests.ps1 -TestResultsDirectory ${{ env.TEST_RESULTS_DIRECTORY }} -WorkingDirectory ${{ github.workspace }}
diff --git a/.github/workflows/sanity.yml b/.github/workflows/sanity.yml
index 1718f9af9..2dfe931fc 100644
--- a/.github/workflows/sanity.yml
+++ b/.github/workflows/sanity.yml
@@ -19,14 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        solution: [
-          ./NETCORE/ApplicationInsights.AspNetCore.sln,
-          ./Everything.sln,
-          ./ProjectsForSigning.sln,
-          ./examples/Examples.sln,
-          ./LOGGING/Logging.sln,
-          ./BASE/Microsoft.ApplicationInsights.sln,
-          ./WEB/Src/Microsoft.ApplicationInsights.Web.sln]
+        solution: [./SHIM/Microsoft.ApplicationInsights.Shim.sln]
 
     steps:
     - uses: actions/checkout@v4
@@ -35,9 +28,6 @@ jobs:
       uses: actions/setup-dotnet@v4.3.1
       with:
         dotnet-version: |
-            3.1.x
-            6.0.x
-            7.0.x
             8.0.x
             9.0.x
 
diff --git a/SHIM/Microsoft.ApplicationInsights.Shim.sln b/SHIM/Microsoft.ApplicationInsights.Shim.sln
index 2f1d16063..3cffbdb77 100644
--- a/SHIM/Microsoft.ApplicationInsights.Shim.sln
+++ b/SHIM/Microsoft.ApplicationInsights.Shim.sln
@@ -25,8 +25,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WorkerService", "..\example
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Web", "..\WEB\Src\Web\Web\Web.csproj", "{6835434F-678C-EAA1-AFBF-3ABDA158022B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassicAspNetWebApp", "..\examples\ClassicAspNetWebApp\ClassicAspNetWebApp.csproj", "{31EB3F86-42C6-4792-8ADA-E9D9AA5F7619}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationTests.WebApp", "..\NETCORE\test\IntegrationTests.WebApp\IntegrationTests.WebApp.csproj", "{0935B859-7B8E-8DFF-B593-F8AADB676DD8}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationTests.Tests", "..\NETCORE\test\IntegrationTests.Tests\IntegrationTests.Tests.csproj", "{5001237F-504A-A179-82C7-DB6F861D57F7}"
@@ -149,18 +147,6 @@ Global
 		{6835434F-678C-EAA1-AFBF-3ABDA158022B}.Release|x64.Build.0 = Release|Any CPU
 		{6835434F-678C-EAA1-AFBF-3ABDA158022B}.Release|x86.ActiveCfg = Release|Any CPU
 		{6835434F-678C-EAA1-AFBF-3ABDA158022B}.Release|x86.Build.0 = Release|Any CPU
-		{31EB3F86-42C6-4792-8ADA-E9D9AA5F7619}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{31EB3F86-42C6-4792-8ADA-E9D9AA5F7619}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{31EB3F86-42C6-4792-8ADA-E9D9AA5F7619}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{31EB3F86-42C6-4792-8ADA-E9D9AA5F7619}.Debug|x64.Build.0 = Debug|Any CPU
-		{31EB3F86-42C6-4792-8ADA-E9D9AA5F7619}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{31EB3F86-42C6-4792-8ADA-E9D9AA5F7619}.Debug|x86.Build.0 = Debug|Any CPU
-		{31EB3F86-42C6-4792-8ADA-E9D9AA5F7619}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{31EB3F86-42C6-4792-8ADA-E9D9AA5F7619}.Release|Any CPU.Build.0 = Release|Any CPU
-		{31EB3F86-42C6-4792-8ADA-E9D9AA5F7619}.Release|x64.ActiveCfg = Release|Any CPU
-		{31EB3F86-42C6-4792-8ADA-E9D9AA5F7619}.Release|x64.Build.0 = Release|Any CPU
-		{31EB3F86-42C6-4792-8ADA-E9D9AA5F7619}.Release|x86.ActiveCfg = Release|Any CPU
-		{31EB3F86-42C6-4792-8ADA-E9D9AA5F7619}.Release|x86.Build.0 = Release|Any CPU
 		{0935B859-7B8E-8DFF-B593-F8AADB676DD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0935B859-7B8E-8DFF-B593-F8AADB676DD8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0935B859-7B8E-8DFF-B593-F8AADB676DD8}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -194,7 +180,6 @@ Global
 		{638BEEB8-40A0-47E0-9410-0B61FB9D6FA5} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
 		{52878653-54FF-8F20-7D86-98CE35C8BBFB} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
 		{FE4868CE-CE53-464D-B676-ED54519A99B3} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
-		{31EB3F86-42C6-4792-8ADA-E9D9AA5F7619} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {1C15D81D-35A4-4FD4-B98C-4A47ED4B98EB}