diff --git a/source/Calamari.Common/FeatureToggles/FeatureToggle.cs b/source/Calamari.Common/FeatureToggles/FeatureToggle.cs
index 84d24f5499..ef8cad3872 100644
--- a/source/Calamari.Common/FeatureToggles/FeatureToggle.cs
+++ b/source/Calamari.Common/FeatureToggles/FeatureToggle.cs
@@ -7,9 +7,7 @@
     /// </summary>
     public enum FeatureToggle {
         SkunkworksFeatureToggle,
-        OidcAccountsFeatureToggle,
         KubernetesAuthAwsCliWithExecFeatureToggle,
-        ForceUtf8ZipFileDecodingFeatureToggle,
         BashParametersArrayFeatureToggle
     }
 }
\ No newline at end of file
diff --git a/source/Calamari.Common/Features/Packages/CombinedPackageExtractor.cs b/source/Calamari.Common/Features/Packages/CombinedPackageExtractor.cs
index fa2cb434ad..e27183c6aa 100644
--- a/source/Calamari.Common/Features/Packages/CombinedPackageExtractor.cs
+++ b/source/Calamari.Common/Features/Packages/CombinedPackageExtractor.cs
@@ -29,7 +29,7 @@ public CombinedPackageExtractor(ILog log, ICalamariFileSystem calamariFileSystem
                 new NupkgExtractor(log),
                 new TarGzipPackageExtractor(log),
                 new TarBzipPackageExtractor(log),
-                new ZipPackageExtractor(log, FeatureToggle.ForceUtf8ZipFileDecodingFeatureToggle.IsEnabled(variables)),
+                new ZipPackageExtractor(log),
                 new TarPackageExtractor(log),
                 new JarPackageExtractor(new JarTool(commandLineRunner, log, calamariFileSystem, variables))
             }.Select(e => e.WithExtractionLimits(log, variables)).ToArray();
diff --git a/source/Calamari.Common/Features/Packages/ZipPackageExtractor.cs b/source/Calamari.Common/Features/Packages/ZipPackageExtractor.cs
index 04064c2461..62e604240f 100644
--- a/source/Calamari.Common/Features/Packages/ZipPackageExtractor.cs
+++ b/source/Calamari.Common/Features/Packages/ZipPackageExtractor.cs
@@ -9,22 +9,9 @@
 
 namespace Calamari.Common.Features.Packages
 {
-    public class ZipPackageExtractor : IPackageEntryExtractor
+    public class ZipPackageExtractor(ILog log) : IPackageEntryExtractor
     {
-        readonly ILog log;
-        readonly bool forceUtf8ZipFiles; //to be removed once transitioned to netcore
-        
-        //used by extractor tests.
-        public ZipPackageExtractor(ILog log): this(log, true) {
-        }
-        
-        public ZipPackageExtractor(ILog log, bool forceUtf8ZipFiles)
-        {
-            this.log = log;
-            this.forceUtf8ZipFiles = forceUtf8ZipFiles;
-        }
-
-        public string[] Extensions => new[] { ".zip", ".whl" };
+        public string[] Extensions => [".zip", ".whl"];
 
         public int Extract(string packageFile, string directory)
         {
diff --git a/source/Calamari.Tests/Fixtures/Integration/Packages/PackageExtractorFixture.cs b/source/Calamari.Tests/Fixtures/Integration/Packages/PackageExtractorFixture.cs
index 17486788d0..99fcd0ffb7 100644
--- a/source/Calamari.Tests/Fixtures/Integration/Packages/PackageExtractorFixture.cs
+++ b/source/Calamari.Tests/Fixtures/Integration/Packages/PackageExtractorFixture.cs
@@ -56,7 +56,7 @@ public void CanExtractZipFileContainingSpecialCharacters(string filename)
         {
             var fileName = GetFixtureResource("Samples", string.Format(filename));
 
-            var extractor = new ZipPackageExtractor(ConsoleLog.Instance, true);
+            var extractor = new ZipPackageExtractor(ConsoleLog.Instance);
             var targetDir = GetTargetDir(extractor.GetType(), fileName);
 
             var filesExtracted = extractor.Extract(fileName, targetDir);