diff --git a/src/MatroskaBatchFlow.Core/Services/LanguageProvider.Logging.cs b/src/MatroskaBatchFlow.Core/Services/LanguageProvider.Logging.cs
index e38abb9..dadb15b 100644
--- a/src/MatroskaBatchFlow.Core/Services/LanguageProvider.Logging.cs
+++ b/src/MatroskaBatchFlow.Core/Services/LanguageProvider.Logging.cs
@@ -1,4 +1,3 @@
-using MatroskaBatchFlow.Core.Logging;
 using Microsoft.Extensions.Logging;
 
 namespace MatroskaBatchFlow.Core.Services;
diff --git a/src/MatroskaBatchFlow.Core/Services/Processing/MkvPropeditExecutor.Logging.cs b/src/MatroskaBatchFlow.Core/Services/Processing/MkvPropeditExecutor.Logging.cs
index 75e5b6e..f8f5d90 100644
--- a/src/MatroskaBatchFlow.Core/Services/Processing/MkvPropeditExecutor.Logging.cs
+++ b/src/MatroskaBatchFlow.Core/Services/Processing/MkvPropeditExecutor.Logging.cs
@@ -1,4 +1,3 @@
-using MatroskaBatchFlow.Core.Logging;
 using Microsoft.Extensions.Logging;
 
 namespace MatroskaBatchFlow.Core.Services.Processing;
diff --git a/src/MatroskaBatchFlow.Uno/Contracts/Services/IBatchOperationOrchestrator.cs b/src/MatroskaBatchFlow.Uno/Contracts/Services/IBatchOperationOrchestrator.cs
index ab446e4..9c6d602 100644
--- a/src/MatroskaBatchFlow.Uno/Contracts/Services/IBatchOperationOrchestrator.cs
+++ b/src/MatroskaBatchFlow.Uno/Contracts/Services/IBatchOperationOrchestrator.cs
@@ -1,5 +1,3 @@
-using MatroskaBatchFlow.Core.Models;
-
 namespace MatroskaBatchFlow.Uno.Contracts.Services;
 
 /// <summary>
diff --git a/src/MatroskaBatchFlow.Uno/Services/Pipeline/FilterDuplicateFilesStage.cs b/src/MatroskaBatchFlow.Uno/Services/Pipeline/FilterDuplicateFilesStage.cs
index cd6c763..daf1d53 100644
--- a/src/MatroskaBatchFlow.Uno/Services/Pipeline/FilterDuplicateFilesStage.cs
+++ b/src/MatroskaBatchFlow.Uno/Services/Pipeline/FilterDuplicateFilesStage.cs
@@ -1,6 +1,6 @@
 using CommunityToolkit.Mvvm.Messaging;
-using MatroskaBatchFlow.Core.Services.Pipeline;
 using MatroskaBatchFlow.Core.Services;
+using MatroskaBatchFlow.Core.Services.Pipeline;
 using MatroskaBatchFlow.Uno.Messages;
 
 namespace MatroskaBatchFlow.Uno.Services.Pipeline;
diff --git a/src/MatroskaBatchFlow.Uno/Services/WritableJsonSettings.Logging.cs b/src/MatroskaBatchFlow.Uno/Services/WritableJsonSettings.Logging.cs
index d57b985..204187c 100644
--- a/src/MatroskaBatchFlow.Uno/Services/WritableJsonSettings.Logging.cs
+++ b/src/MatroskaBatchFlow.Uno/Services/WritableJsonSettings.Logging.cs
@@ -1,5 +1,3 @@
-using MatroskaBatchFlow.Uno.Logging;
-
 namespace MatroskaBatchFlow.Uno.Services;
 
 /// <summary>
diff --git a/tests/MatroskaBatchFlow.Core.UnitTests/Services/BatchConfigurationTests.cs b/tests/MatroskaBatchFlow.Core.UnitTests/Services/BatchConfigurationTests.cs
index 381eda5..164376a 100644
--- a/tests/MatroskaBatchFlow.Core.UnitTests/Services/BatchConfigurationTests.cs
+++ b/tests/MatroskaBatchFlow.Core.UnitTests/Services/BatchConfigurationTests.cs
@@ -2,10 +2,8 @@
 using MatroskaBatchFlow.Core.Models;
 using MatroskaBatchFlow.Core.Services;
 using MatroskaBatchFlow.Core.UnitTests.Builders;
-using MatroskaBatchFlow.Core.Utilities;
 using Microsoft.Extensions.Logging;
 using NSubstitute;
-using static MatroskaBatchFlow.Core.Models.MediaInfoResult.MediaInfo;
 
 namespace MatroskaBatchFlow.Core.UnitTests.Services;
 
diff --git a/tests/MatroskaBatchFlow.Core.UnitTests/Services/Processing/InMemoryBatchReportStoreTests.cs b/tests/MatroskaBatchFlow.Core.UnitTests/Services/Processing/InMemoryBatchReportStoreTests.cs
index be1458f..08141f5 100644
--- a/tests/MatroskaBatchFlow.Core.UnitTests/Services/Processing/InMemoryBatchReportStoreTests.cs
+++ b/tests/MatroskaBatchFlow.Core.UnitTests/Services/Processing/InMemoryBatchReportStoreTests.cs
@@ -1,4 +1,3 @@
-using MatroskaBatchFlow.Core.Enums;
 using MatroskaBatchFlow.Core.Models;
 using MatroskaBatchFlow.Core.Services.Processing;
 using MatroskaBatchFlow.Core.UnitTests.Builders;
diff --git a/tests/MatroskaBatchFlow.Uno.UnitTests/Presentation/AudioViewModelTests.cs b/tests/MatroskaBatchFlow.Uno.UnitTests/Presentation/AudioViewModelTests.cs
index 4087a2e..2b20719 100644
--- a/tests/MatroskaBatchFlow.Uno.UnitTests/Presentation/AudioViewModelTests.cs
+++ b/tests/MatroskaBatchFlow.Uno.UnitTests/Presentation/AudioViewModelTests.cs
@@ -1,5 +1,4 @@
 using System.Collections.ObjectModel;
-using System.Collections.Specialized;
 using System.ComponentModel;
 using MatroskaBatchFlow.Core.Enums;
 using MatroskaBatchFlow.Core.Models;
diff --git a/tests/MatroskaBatchFlow.Uno.UnitTests/Presentation/GeneralViewModelTests.cs b/tests/MatroskaBatchFlow.Uno.UnitTests/Presentation/GeneralViewModelTests.cs
index 4ecef14..5d4f3df 100644
--- a/tests/MatroskaBatchFlow.Uno.UnitTests/Presentation/GeneralViewModelTests.cs
+++ b/tests/MatroskaBatchFlow.Uno.UnitTests/Presentation/GeneralViewModelTests.cs
@@ -1,4 +1,3 @@
-using System.Collections.Specialized;
 using System.ComponentModel;
 using MatroskaBatchFlow.Core.Enums;
 using MatroskaBatchFlow.Core.Models;
diff --git a/tests/MatroskaBatchFlow.Uno.UnitTests/Presentation/SubtitleViewModelTests.cs b/tests/MatroskaBatchFlow.Uno.UnitTests/Presentation/SubtitleViewModelTests.cs
index 64c9b76..54b0273 100644
--- a/tests/MatroskaBatchFlow.Uno.UnitTests/Presentation/SubtitleViewModelTests.cs
+++ b/tests/MatroskaBatchFlow.Uno.UnitTests/Presentation/SubtitleViewModelTests.cs
@@ -1,5 +1,4 @@
 using System.Collections.ObjectModel;
-using System.Collections.Specialized;
 using System.ComponentModel;
 using MatroskaBatchFlow.Core.Enums;
 using MatroskaBatchFlow.Core.Models;
diff --git a/tests/MatroskaBatchFlow.Uno.UnitTests/Presentation/VideoViewModelTests.cs b/tests/MatroskaBatchFlow.Uno.UnitTests/Presentation/VideoViewModelTests.cs
index f8bb0f4..9042330 100644
--- a/tests/MatroskaBatchFlow.Uno.UnitTests/Presentation/VideoViewModelTests.cs
+++ b/tests/MatroskaBatchFlow.Uno.UnitTests/Presentation/VideoViewModelTests.cs
@@ -1,5 +1,4 @@
 using System.Collections.ObjectModel;
-using System.Collections.Specialized;
 using System.ComponentModel;
 using MatroskaBatchFlow.Core.Enums;
 using MatroskaBatchFlow.Core.Models;
diff --git a/tests/MatroskaBatchFlow.Uno.UnitTests/Services/PageServiceTests.cs b/tests/MatroskaBatchFlow.Uno.UnitTests/Services/PageServiceTests.cs
index 7e0fb7b..64bb386 100644
--- a/tests/MatroskaBatchFlow.Uno.UnitTests/Services/PageServiceTests.cs
+++ b/tests/MatroskaBatchFlow.Uno.UnitTests/Services/PageServiceTests.cs
@@ -1,6 +1,5 @@
 using MatroskaBatchFlow.Uno.Presentation;
 using MatroskaBatchFlow.Uno.Services;
-using Microsoft.UI.Xaml.Controls;
 
 namespace MatroskaBatchFlow.Uno.UnitTests.Services;
 
diff --git a/tests/MatroskaBatchFlow.Uno.UnitTests/Services/Pipeline/FilterDuplicateFilesStageTests.cs b/tests/MatroskaBatchFlow.Uno.UnitTests/Services/Pipeline/FilterDuplicateFilesStageTests.cs
index ac48c6a..abda8d7 100644
--- a/tests/MatroskaBatchFlow.Uno.UnitTests/Services/Pipeline/FilterDuplicateFilesStageTests.cs
+++ b/tests/MatroskaBatchFlow.Uno.UnitTests/Services/Pipeline/FilterDuplicateFilesStageTests.cs
@@ -1,6 +1,6 @@
-using MatroskaBatchFlow.Core.Services.Pipeline;
 using MatroskaBatchFlow.Core.Models;
 using MatroskaBatchFlow.Core.Services;
+using MatroskaBatchFlow.Core.Services.Pipeline;
 using MatroskaBatchFlow.Uno.Services.Pipeline;
 using Microsoft.Extensions.Logging;
 using NSubstitute;