diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index dab16c7232..97b155b158 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "dotnet-t4": {
-      "version": "2.0.5",
+      "version": "2.2.0",
       "commands": [
         "t4"
       ]
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 700fbc5764..695c95c89d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,18 +23,6 @@ jobs:
       with:
         submodules: true
 
-    # needed for dotnet-t4
-    - name: Setup .NET Core 2.1.x
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: "2.1.x"
-
-    # Can't use .NET 5 with msbuild until VS is updated to 16.8 in GitHub Actions
-    - name: Setup .NET Core 3.1.x
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: "3.1.x"
-
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
diff --git a/src/Addins/global.json b/src/Addins/global.json
deleted file mode 100644
index 7ad5eda687..0000000000
--- a/src/Addins/global.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-   "sdk": { "version": "3.1.302", "rollForward": "latestFeature" }
-}