diff --git a/app/MindWork AI Studio/Assistants/Agenda/AssistantAgenda.razor.cs b/app/MindWork AI Studio/Assistants/Agenda/AssistantAgenda.razor.cs
index 7153efe9..6e1c4d52 100644
--- a/app/MindWork AI Studio/Assistants/Agenda/AssistantAgenda.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/Agenda/AssistantAgenda.razor.cs	
@@ -1,7 +1,6 @@
 using System.Text;
 
 using AIStudio.Chat;
-using AIStudio.Components.Settings;
 using AIStudio.Dialogs.Settings;
 
 namespace AIStudio.Assistants.Agenda;
diff --git a/app/MindWork AI Studio/Assistants/AssistantBase.razor.cs b/app/MindWork AI Studio/Assistants/AssistantBase.razor.cs
index 0b3986f2..7c42e0a8 100644
--- a/app/MindWork AI Studio/Assistants/AssistantBase.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/AssistantBase.razor.cs	
@@ -1,6 +1,4 @@
 using AIStudio.Chat;
-using AIStudio.Components.Settings;
-using AIStudio.Dialogs.Settings;
 using AIStudio.Provider;
 using AIStudio.Settings;
 using AIStudio.Tools.Services;
@@ -35,9 +33,6 @@ public abstract partial class AssistantBase<TSettings> : AssistantLowerBase, IMe
     [Inject]
     protected RustService RustService { get; init; } = null!;
     
-    [Inject]
-    protected DataSourceService DataSourceService { get; init; } = null!;
-    
     [Inject]
     protected NavigationManager NavigationManager { get; init; } = null!;
     
diff --git a/app/MindWork AI Studio/Assistants/BiasDay/BiasOfTheDayAssistant.razor.cs b/app/MindWork AI Studio/Assistants/BiasDay/BiasOfTheDayAssistant.razor.cs
index c83b5096..94356393 100644
--- a/app/MindWork AI Studio/Assistants/BiasDay/BiasOfTheDayAssistant.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/BiasDay/BiasOfTheDayAssistant.razor.cs	
@@ -1,7 +1,6 @@
 using System.Text;
 
 using AIStudio.Chat;
-using AIStudio.Components.Settings;
 using AIStudio.Dialogs.Settings;
 using AIStudio.Settings.DataModel;
 
diff --git a/app/MindWork AI Studio/Assistants/Coding/AssistantCoding.razor.cs b/app/MindWork AI Studio/Assistants/Coding/AssistantCoding.razor.cs
index aecb93c5..61e94865 100644
--- a/app/MindWork AI Studio/Assistants/Coding/AssistantCoding.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/Coding/AssistantCoding.razor.cs	
@@ -1,5 +1,5 @@
 using System.Text;
-using AIStudio.Components.Settings;
+
 using AIStudio.Dialogs.Settings;
 
 namespace AIStudio.Assistants.Coding;
diff --git a/app/MindWork AI Studio/Assistants/EMail/AssistantEMail.razor.cs b/app/MindWork AI Studio/Assistants/EMail/AssistantEMail.razor.cs
index 48dc194e..7a91f1c8 100644
--- a/app/MindWork AI Studio/Assistants/EMail/AssistantEMail.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/EMail/AssistantEMail.razor.cs	
@@ -1,7 +1,6 @@
 using System.Text;
 
 using AIStudio.Chat;
-using AIStudio.Components.Settings;
 using AIStudio.Dialogs.Settings;
 
 namespace AIStudio.Assistants.EMail;
diff --git a/app/MindWork AI Studio/Assistants/ERI/AssistantERI.razor.cs b/app/MindWork AI Studio/Assistants/ERI/AssistantERI.razor.cs
index d86dcdaf..c752f4cb 100644
--- a/app/MindWork AI Studio/Assistants/ERI/AssistantERI.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/ERI/AssistantERI.razor.cs	
@@ -2,7 +2,6 @@ using System.Text;
 using System.Text.RegularExpressions;
 
 using AIStudio.Chat;
-using AIStudio.Components.Settings;
 using AIStudio.Dialogs;
 using AIStudio.Dialogs.Settings;
 using AIStudio.Settings.DataModel;
diff --git a/app/MindWork AI Studio/Assistants/GrammarSpelling/AssistantGrammarSpelling.razor.cs b/app/MindWork AI Studio/Assistants/GrammarSpelling/AssistantGrammarSpelling.razor.cs
index 97742c2d..4a0e53c1 100644
--- a/app/MindWork AI Studio/Assistants/GrammarSpelling/AssistantGrammarSpelling.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/GrammarSpelling/AssistantGrammarSpelling.razor.cs	
@@ -1,5 +1,4 @@
 using AIStudio.Chat;
-using AIStudio.Components.Settings;
 using AIStudio.Dialogs.Settings;
 
 namespace AIStudio.Assistants.GrammarSpelling;
diff --git a/app/MindWork AI Studio/Assistants/IconFinder/AssistantIconFinder.razor.cs b/app/MindWork AI Studio/Assistants/IconFinder/AssistantIconFinder.razor.cs
index ef518bab..a071a81e 100644
--- a/app/MindWork AI Studio/Assistants/IconFinder/AssistantIconFinder.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/IconFinder/AssistantIconFinder.razor.cs	
@@ -1,4 +1,3 @@
-using AIStudio.Components.Settings;
 using AIStudio.Dialogs.Settings;
 
 namespace AIStudio.Assistants.IconFinder;
diff --git a/app/MindWork AI Studio/Assistants/JobPosting/AssistantJobPostings.razor.cs b/app/MindWork AI Studio/Assistants/JobPosting/AssistantJobPostings.razor.cs
index 4834c677..651824dd 100644
--- a/app/MindWork AI Studio/Assistants/JobPosting/AssistantJobPostings.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/JobPosting/AssistantJobPostings.razor.cs	
@@ -1,5 +1,4 @@
 using AIStudio.Chat;
-using AIStudio.Components.Settings;
 using AIStudio.Dialogs.Settings;
 
 namespace AIStudio.Assistants.JobPosting;
diff --git a/app/MindWork AI Studio/Assistants/LegalCheck/AssistantLegalCheck.razor.cs b/app/MindWork AI Studio/Assistants/LegalCheck/AssistantLegalCheck.razor.cs
index 7e8bf222..218563fe 100644
--- a/app/MindWork AI Studio/Assistants/LegalCheck/AssistantLegalCheck.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/LegalCheck/AssistantLegalCheck.razor.cs	
@@ -1,5 +1,4 @@
 using AIStudio.Chat;
-using AIStudio.Components.Settings;
 using AIStudio.Dialogs.Settings;
 
 namespace AIStudio.Assistants.LegalCheck;
diff --git a/app/MindWork AI Studio/Assistants/MyTasks/AssistantMyTasks.razor.cs b/app/MindWork AI Studio/Assistants/MyTasks/AssistantMyTasks.razor.cs
index 7be85b28..3a512615 100644
--- a/app/MindWork AI Studio/Assistants/MyTasks/AssistantMyTasks.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/MyTasks/AssistantMyTasks.razor.cs	
@@ -1,5 +1,4 @@
 using AIStudio.Chat;
-using AIStudio.Components.Settings;
 using AIStudio.Dialogs.Settings;
 using AIStudio.Settings;
 
diff --git a/app/MindWork AI Studio/Assistants/RewriteImprove/AssistantRewriteImprove.razor.cs b/app/MindWork AI Studio/Assistants/RewriteImprove/AssistantRewriteImprove.razor.cs
index 440a4e7d..0fb45089 100644
--- a/app/MindWork AI Studio/Assistants/RewriteImprove/AssistantRewriteImprove.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/RewriteImprove/AssistantRewriteImprove.razor.cs	
@@ -1,5 +1,4 @@
 using AIStudio.Chat;
-using AIStudio.Components.Settings;
 using AIStudio.Dialogs.Settings;
 
 namespace AIStudio.Assistants.RewriteImprove;
diff --git a/app/MindWork AI Studio/Assistants/TextSummarizer/AssistantTextSummarizer.razor.cs b/app/MindWork AI Studio/Assistants/TextSummarizer/AssistantTextSummarizer.razor.cs
index d0df48c4..c5fc437c 100644
--- a/app/MindWork AI Studio/Assistants/TextSummarizer/AssistantTextSummarizer.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/TextSummarizer/AssistantTextSummarizer.razor.cs	
@@ -1,5 +1,4 @@
 using AIStudio.Chat;
-using AIStudio.Components.Settings;
 using AIStudio.Dialogs.Settings;
 
 namespace AIStudio.Assistants.TextSummarizer;
diff --git a/app/MindWork AI Studio/Assistants/Translation/AssistantTranslation.razor.cs b/app/MindWork AI Studio/Assistants/Translation/AssistantTranslation.razor.cs
index c29a862c..628190cd 100644
--- a/app/MindWork AI Studio/Assistants/Translation/AssistantTranslation.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/Translation/AssistantTranslation.razor.cs	
@@ -1,5 +1,4 @@
 using AIStudio.Chat;
-using AIStudio.Components.Settings;
 using AIStudio.Dialogs.Settings;
 
 namespace AIStudio.Assistants.Translation;
diff --git a/app/MindWork AI Studio/Components/ProviderSelection.razor.cs b/app/MindWork AI Studio/Components/ProviderSelection.razor.cs
index be84e294..66158211 100644
--- a/app/MindWork AI Studio/Components/ProviderSelection.razor.cs	
+++ b/app/MindWork AI Studio/Components/ProviderSelection.razor.cs	
@@ -1,7 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 
 using AIStudio.Assistants;
-using AIStudio.Dialogs.Settings;
 using AIStudio.Provider;
 using AIStudio.Settings;
 
diff --git a/app/MindWork AI Studio/Dialogs/Settings/SettingsDialogAgenda.razor.cs b/app/MindWork AI Studio/Dialogs/Settings/SettingsDialogAgenda.razor.cs
index 94333b70..261d6b31 100644
--- a/app/MindWork AI Studio/Dialogs/Settings/SettingsDialogAgenda.razor.cs	
+++ b/app/MindWork AI Studio/Dialogs/Settings/SettingsDialogAgenda.razor.cs	
@@ -1,5 +1,3 @@
-using AIStudio.Dialogs.Settings;
-
 namespace AIStudio.Dialogs.Settings;
 
 public partial class SettingsDialogAgenda : SettingsDialogBase;
\ No newline at end of file
diff --git a/app/MindWork AI Studio/Dialogs/Settings/SettingsDialogAssistantBias.razor.cs b/app/MindWork AI Studio/Dialogs/Settings/SettingsDialogAssistantBias.razor.cs
index 19fbafce..75767049 100644
--- a/app/MindWork AI Studio/Dialogs/Settings/SettingsDialogAssistantBias.razor.cs	
+++ b/app/MindWork AI Studio/Dialogs/Settings/SettingsDialogAssistantBias.razor.cs	
@@ -1,7 +1,3 @@
-using AIStudio.Dialogs;
-
-using DialogOptions = AIStudio.Dialogs.DialogOptions;
-
 namespace AIStudio.Dialogs.Settings;
 
 public partial class SettingsDialogAssistantBias : SettingsDialogBase
diff --git a/app/MindWork AI Studio/Dialogs/Settings/SettingsDialogBase.cs b/app/MindWork AI Studio/Dialogs/Settings/SettingsDialogBase.cs
index f788148b..430d61d0 100644
--- a/app/MindWork AI Studio/Dialogs/Settings/SettingsDialogBase.cs	
+++ b/app/MindWork AI Studio/Dialogs/Settings/SettingsDialogBase.cs	
@@ -1,7 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
+
 using AIStudio.Settings;
-using AIStudio.Tools.Services;
 
 using Microsoft.AspNetCore.Components;
 
@@ -24,8 +23,6 @@ public abstract class SettingsDialogBase : ComponentBase
     [Inject]
     protected MessageBus MessageBus { get; init; } = null!;
     
-    [Inject]
-    protected RustService RustService { get; init; } = null!;
     
     #region Overrides of ComponentBase
 
diff --git a/app/MindWork AI Studio/Dialogs/Settings/SettingsDialogTranslation.razor.cs b/app/MindWork AI Studio/Dialogs/Settings/SettingsDialogTranslation.razor.cs
index 83c8a290..1dc31ea8 100644
--- a/app/MindWork AI Studio/Dialogs/Settings/SettingsDialogTranslation.razor.cs	
+++ b/app/MindWork AI Studio/Dialogs/Settings/SettingsDialogTranslation.razor.cs	
@@ -1,5 +1,3 @@
-using AIStudio.Dialogs.Settings;
-
 namespace AIStudio.Dialogs.Settings;
 
 public partial class SettingsDialogTranslation : SettingsDialogBase;
\ No newline at end of file
diff --git a/app/MindWork AI Studio/Tools/JsRuntimeExtensions.cs b/app/MindWork AI Studio/Tools/JsRuntimeExtensions.cs
index 52671f93..702d2732 100644
--- a/app/MindWork AI Studio/Tools/JsRuntimeExtensions.cs	
+++ b/app/MindWork AI Studio/Tools/JsRuntimeExtensions.cs	
@@ -1,5 +1,4 @@
 using AIStudio.Assistants;
-using AIStudio.Dialogs.Settings;
 
 namespace AIStudio.Tools;