diff --git a/build/RepositoryBuild.targets b/build/RepositoryBuild.targets
index f13bb407af..957d9630d9 100644
--- a/build/RepositoryBuild.targets
+++ b/build/RepositoryBuild.targets
@@ -48,7 +48,7 @@
       <RepositoryBuildArguments>$(RepositoryBuildArguments) /p:IsFinalBuild=$(IsFinalBuild)</RepositoryBuildArguments>
       <RepositoryBuildArguments>$(RepositoryBuildArguments) /noconsolelogger '/l:RepoTasks.FlowLogger,$(MSBuildThisFileDirectory)tasks\bin\publish\RepoTasks.dll;Summary;FlowId=$(RepositoryToBuild)'</RepositoryBuildArguments>
 
-      <BuildArguments>$(_RepositoryBuildTargets) $(RepositoryBuildArguments)</BuildArguments>
+      <BuildArguments>/t:CleanArtifacts $(_RepositoryBuildTargets) $(RepositoryBuildArguments)</BuildArguments>
       <RepositoryArtifactsRoot>$(BuildRepositoryRoot)artifacts</RepositoryArtifactsRoot>
       <RepositoryArtifactsBuildDirectory>$(RepositoryArtifactsRoot)\build\</RepositoryArtifactsBuildDirectory>
       <RepositoryArtifactsMSBuildDirectory>$(RepositoryArtifactsRoot)\msbuild\</RepositoryArtifactsMSBuildDirectory>
diff --git a/build/tasks/Utilities/ArtifactInfo.cs b/build/tasks/Utilities/ArtifactInfo.cs
index c03cdacefb..7116daae48 100644
--- a/build/tasks/Utilities/ArtifactInfo.cs
+++ b/build/tasks/Utilities/ArtifactInfo.cs
@@ -26,11 +26,8 @@ namespace RepoTasks.Utilities
                 case "nugetsymbolspackage":
                     info = new Package { PackageInfo = GetPackageInfo(item), IsSymbolsArtifact = true };
                     break;
-                case "vsixpackage":
-                    info = new Vsix { Name = Path.GetFileNameWithoutExtension(item.ItemSpec) };
-                    break;
                 default:
-                    throw new InvalidDataException($"Unrecognized artifact type: {item.GetMetadata("ArtifactType")} for artifact {item.ItemSpec}");
+                    return UnknownType.Singleton;
             }
 
             info.RepositoryRoot = item.GetMetadata("RepositoryRoot")?.TrimEnd(new [] { '\\', '/' });
@@ -46,9 +43,10 @@ namespace RepoTasks.Utilities
         public string RepositoryRoot { get; private set; }
         public string RepoName { get; private set; }
 
-        public class Vsix : ArtifactInfo
+        public class UnknownType : ArtifactInfo
         {
-            public string Name { get; set; }
+           private UnknownType() { }
+           public static UnknownType Singleton { get; } = new UnknownType();
         }
 
         public class Package : ArtifactInfo