diff --git a/AiCoreUnitTest/Ollama2FacadeTest.cs b/AiCoreUnitTest/Ollama2FacadeTest.cs
index 4781039b1..a5fa2d403 100644
--- a/AiCoreUnitTest/Ollama2FacadeTest.cs
+++ b/AiCoreUnitTest/Ollama2FacadeTest.cs
@@ -1,6 +1,5 @@
using AICore.Facade.LLM;
using BeWo.Service.Core;
-using BS.Shared.Core;
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace AiCoreUnitTest
diff --git a/BeWo/AI/View/AiTranskriptionView.xaml.cs b/BeWo/AI/View/AiTranskriptionView.xaml.cs
index 803c2e361..1e52c61ad 100644
--- a/BeWo/AI/View/AiTranskriptionView.xaml.cs
+++ b/BeWo/AI/View/AiTranskriptionView.xaml.cs
@@ -19,7 +19,6 @@ using BeWo.ViewModel;
using BeWo.ViewModel.ListViewModel;
using BeWo.ViewModel.View.AI;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
using BS.Shared.Translation;
diff --git a/BeWo/Converter/ObjectVisibilityMultiConverter.cs b/BeWo/Converter/ObjectVisibilityMultiConverter.cs
index 395266a03..c781fe235 100644
--- a/BeWo/Converter/ObjectVisibilityMultiConverter.cs
+++ b/BeWo/Converter/ObjectVisibilityMultiConverter.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Windows.Data;
-using BS.Shared.Core;
using System.Windows;
namespace BeWo.Converter
diff --git a/BeWo/SchulbegleitenderDienst/SchulbegleitenderDienstEmployeeView.xaml.cs b/BeWo/SchulbegleitenderDienst/SchulbegleitenderDienstEmployeeView.xaml.cs
index 8229bfa5c..a75b850c2 100644
--- a/BeWo/SchulbegleitenderDienst/SchulbegleitenderDienstEmployeeView.xaml.cs
+++ b/BeWo/SchulbegleitenderDienst/SchulbegleitenderDienstEmployeeView.xaml.cs
@@ -19,7 +19,6 @@ using BeWo.ViewModel;
using BeWo.ServiceProxy;
using BS.Shared.Extensions;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Translation;
using DevExpress.Xpf.Editors;
diff --git a/BeWo/SchulbegleitenderDienst/VertretenderKlientSearchView.xaml.cs b/BeWo/SchulbegleitenderDienst/VertretenderKlientSearchView.xaml.cs
index c054b381c..0ffff4de0 100644
--- a/BeWo/SchulbegleitenderDienst/VertretenderKlientSearchView.xaml.cs
+++ b/BeWo/SchulbegleitenderDienst/VertretenderKlientSearchView.xaml.cs
@@ -29,7 +29,6 @@ using BeWo.Core;
using BeWo.Core.Service;
using BeWo.ViewModel.ListViewModel;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts.Compact;
using DevExpress.Xpf.Core;
using DevExpress.Xpf.Editors;
diff --git a/BeWo/SchulbegleitenderDienst/ViewModel/SbdConfigVM.cs b/BeWo/SchulbegleitenderDienst/ViewModel/SbdConfigVM.cs
index 837ff20d9..29d273975 100644
--- a/BeWo/SchulbegleitenderDienst/ViewModel/SbdConfigVM.cs
+++ b/BeWo/SchulbegleitenderDienst/ViewModel/SbdConfigVM.cs
@@ -2,7 +2,6 @@
using BeWo.Validation;
using BeWo.ViewModel;
using BeWo.ViewModel.ListViewModel;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
namespace BeWo.SchulbegleitenderDienst.ViewModel
diff --git a/BeWo/UploadDialog.xaml.cs b/BeWo/UploadDialog.xaml.cs
index 0a198c0b9..a24531239 100644
--- a/BeWo/UploadDialog.xaml.cs
+++ b/BeWo/UploadDialog.xaml.cs
@@ -3,7 +3,6 @@ using BeWo.ServiceProxy;
using BeWo.View;
using BeWo.ViewModel;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.Extensions;
using System;
using System.IO;
diff --git a/BeWo/View/Controls/ListboxSelectControl.xaml.cs b/BeWo/View/Controls/ListboxSelectControl.xaml.cs
index dba9a68ff..6bb8d3add 100644
--- a/BeWo/View/Controls/ListboxSelectControl.xaml.cs
+++ b/BeWo/View/Controls/ListboxSelectControl.xaml.cs
@@ -10,7 +10,6 @@ using System.Windows.Input;
using BeWo.Annotations;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.Extensions;
namespace BeWo.View.Controls
diff --git a/BeWo/View/Controls/NewsItemEditControl.xaml.cs b/BeWo/View/Controls/NewsItemEditControl.xaml.cs
index 884e35ac9..1eff821bf 100644
--- a/BeWo/View/Controls/NewsItemEditControl.xaml.cs
+++ b/BeWo/View/Controls/NewsItemEditControl.xaml.cs
@@ -5,7 +5,6 @@ using System.Windows.Controls;
using System.Windows.Input;
using BeWo.Validation;
using BeWo.ViewModel;
-using BS.Shared.Core;
namespace BeWo.View.Controls
{
diff --git a/BeWo/View/Detail/BudgetView.xaml.cs b/BeWo/View/Detail/BudgetView.xaml.cs
index 6b52cf4aa..245dee429 100644
--- a/BeWo/View/Detail/BudgetView.xaml.cs
+++ b/BeWo/View/Detail/BudgetView.xaml.cs
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Linq;
using System.Windows;
-using BS.Shared.Core;
using BS.Shared.Extensions;
using BeWo.Core;
diff --git a/BeWo/View/Detail/DateiBearbeiten.xaml.cs b/BeWo/View/Detail/DateiBearbeiten.xaml.cs
index 5159a07ce..8282709db 100644
--- a/BeWo/View/Detail/DateiBearbeiten.xaml.cs
+++ b/BeWo/View/Detail/DateiBearbeiten.xaml.cs
@@ -15,7 +15,6 @@ using BeWo.Core.Service;
using BS.Shared;
using BS.Shared.Extensions;
-using BS.Shared.Core;
using BS.Shared.Services;
using BS.Shared.Translation;
using DevExpress.Xpf.RichEdit;
diff --git a/BeWo/View/Detail/DienstView.xaml.cs b/BeWo/View/Detail/DienstView.xaml.cs
index 38877e848..ed3751768 100644
--- a/BeWo/View/Detail/DienstView.xaml.cs
+++ b/BeWo/View/Detail/DienstView.xaml.cs
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Linq;
using System.Windows;
-using BS.Shared.Core;
using BS.Shared.Extensions;
using BeWo.Core;
diff --git a/BeWo/View/Detail/InformationView.xaml.cs b/BeWo/View/Detail/InformationView.xaml.cs
index 75b9b90e6..bb9fbac53 100644
--- a/BeWo/View/Detail/InformationView.xaml.cs
+++ b/BeWo/View/Detail/InformationView.xaml.cs
@@ -15,7 +15,6 @@ using BeWo.Core.Service;
using BS.Shared;
using BS.Shared.Extensions;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Services;
using BS.Shared.Translation;
diff --git a/BeWo/View/Detail/MassnahmenHistory.cs b/BeWo/View/Detail/MassnahmenHistory.cs
index 8780a9505..aaaf3cca7 100644
--- a/BeWo/View/Detail/MassnahmenHistory.cs
+++ b/BeWo/View/Detail/MassnahmenHistory.cs
@@ -1,6 +1,5 @@
using BeWo.Core;
using BeWo.ViewModel.ListViewModel;
-using BS.Shared.Core;
using System;
using System.Collections.Generic;
using System.Linq;
diff --git a/BeWo/View/Detail/NotizenKategorieView.xaml.cs b/BeWo/View/Detail/NotizenKategorieView.xaml.cs
index c7eb43484..38830a612 100644
--- a/BeWo/View/Detail/NotizenKategorieView.xaml.cs
+++ b/BeWo/View/Detail/NotizenKategorieView.xaml.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Linq;
using System.Windows;
using System.Windows.Controls;
-using BS.Shared.Core;
using BS.Shared.Extensions;
using BeWo.Core;
diff --git a/BeWo/View/Detail/PreisView.xaml.cs b/BeWo/View/Detail/PreisView.xaml.cs
index b2e2974b0..841daf8f5 100644
--- a/BeWo/View/Detail/PreisView.xaml.cs
+++ b/BeWo/View/Detail/PreisView.xaml.cs
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Linq;
using System.Windows;
-using BS.Shared.Core;
using BS.Shared.Extensions;
using BeWo.Core;
diff --git a/BeWo/View/Detail/RatingEditView.xaml.cs b/BeWo/View/Detail/RatingEditView.xaml.cs
index f6180450b..61a618ebb 100644
--- a/BeWo/View/Detail/RatingEditView.xaml.cs
+++ b/BeWo/View/Detail/RatingEditView.xaml.cs
@@ -15,7 +15,6 @@ using BeWo.Core.Service;
using BS.Shared;
using BS.Shared.Extensions;
-using BS.Shared.Core;
using BS.Shared.Services;
using BS.Shared.Translation;
using DevExpress.Xpf.RichEdit;
diff --git a/BeWo/View/Detail/RatingTypeView.xaml.cs b/BeWo/View/Detail/RatingTypeView.xaml.cs
index dc8d743bc..f2a72616e 100644
--- a/BeWo/View/Detail/RatingTypeView.xaml.cs
+++ b/BeWo/View/Detail/RatingTypeView.xaml.cs
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Linq;
using System.Windows;
-using BS.Shared.Core;
using BS.Shared.Extensions;
using BeWo.Core;
diff --git a/BeWo/View/Detail/Report/DatenbereinigungView.xaml.cs b/BeWo/View/Detail/Report/DatenbereinigungView.xaml.cs
index 9121a4a5d..80ce74bdc 100644
--- a/BeWo/View/Detail/Report/DatenbereinigungView.xaml.cs
+++ b/BeWo/View/Detail/Report/DatenbereinigungView.xaml.cs
@@ -17,7 +17,6 @@ using BeWo.ViewModel;
using BeWo.ViewModel.ListViewModel;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
diff --git a/BeWo/View/Detail/Report/FlexibleReportView.xaml.cs b/BeWo/View/Detail/Report/FlexibleReportView.xaml.cs
index 0f8cedcca..93621c13f 100644
--- a/BeWo/View/Detail/Report/FlexibleReportView.xaml.cs
+++ b/BeWo/View/Detail/Report/FlexibleReportView.xaml.cs
@@ -14,7 +14,6 @@ using BeWo.ServiceProxy;
using BeWo.ViewModel;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
using BS.Shared.Translation;
diff --git a/BeWo/View/Detail/Suchergebnis.xaml.cs b/BeWo/View/Detail/Suchergebnis.xaml.cs
index 8b5a1cb05..5f51c900a 100644
--- a/BeWo/View/Detail/Suchergebnis.xaml.cs
+++ b/BeWo/View/Detail/Suchergebnis.xaml.cs
@@ -15,7 +15,6 @@ using BeWo.Core.Service;
using BS.Shared;
using BS.Shared.Extensions;
-using BS.Shared.Core;
using BS.Shared.Services;
using BS.Shared.Translation;
using DevExpress.Xpf.RichEdit;
diff --git a/BeWo/View/Detail/UrlaubskontoView.xaml.cs b/BeWo/View/Detail/UrlaubskontoView.xaml.cs
index b0193d78b..4dd690471 100755
--- a/BeWo/View/Detail/UrlaubskontoView.xaml.cs
+++ b/BeWo/View/Detail/UrlaubskontoView.xaml.cs
@@ -15,7 +15,6 @@ using BeWo.Core.Service;
using BS.Shared;
using BS.Shared.Extensions;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Services;
using BS.Shared.Translation;
diff --git a/BeWo/View/Detail/UrlaubstagSchenkenView.xaml.cs b/BeWo/View/Detail/UrlaubstagSchenkenView.xaml.cs
index 1de413e51..1c75a085b 100644
--- a/BeWo/View/Detail/UrlaubstagSchenkenView.xaml.cs
+++ b/BeWo/View/Detail/UrlaubstagSchenkenView.xaml.cs
@@ -15,7 +15,6 @@ using BeWo.Core.Service;
using BS.Shared;
using BS.Shared.Extensions;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Services;
using BS.Shared.Translation;
diff --git a/BeWo/View/Detail/Zeiterfassung/ServiceRecordCreationView.xaml.cs b/BeWo/View/Detail/Zeiterfassung/ServiceRecordCreationView.xaml.cs
index b63bdde9f..00a731512 100644
--- a/BeWo/View/Detail/Zeiterfassung/ServiceRecordCreationView.xaml.cs
+++ b/BeWo/View/Detail/Zeiterfassung/ServiceRecordCreationView.xaml.cs
@@ -5,7 +5,6 @@ using BeWo.ServiceProxy;
using BeWo.Validation;
using BeWo.ViewModel;
using BeWo.ViewModel.ListViewModel;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
namespace BeWo.View.Detail.Zeiterfassung
diff --git a/BeWo/View/Document/RtfEditView.xaml.cs b/BeWo/View/Document/RtfEditView.xaml.cs
index b4bb046a7..83527a73b 100644
--- a/BeWo/View/Document/RtfEditView.xaml.cs
+++ b/BeWo/View/Document/RtfEditView.xaml.cs
@@ -15,7 +15,6 @@ using BeWo.Core.Service;
using BS.Shared;
using BS.Shared.Extensions;
-using BS.Shared.Core;
using BS.Shared.Services;
using BS.Shared.Translation;
using DevExpress.Xpf.RichEdit;
diff --git a/BeWo/View/Document/SingleTemplateSelectionView.xaml.cs b/BeWo/View/Document/SingleTemplateSelectionView.xaml.cs
index e64360e05..7628cb2b2 100644
--- a/BeWo/View/Document/SingleTemplateSelectionView.xaml.cs
+++ b/BeWo/View/Document/SingleTemplateSelectionView.xaml.cs
@@ -15,7 +15,6 @@ using BeWo.Core.Service;
using BS.Shared;
using BS.Shared.Extensions;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Services;
using BS.Shared.Translation;
diff --git a/BeWo/View/Document/TeamFolderRightView.xaml.cs b/BeWo/View/Document/TeamFolderRightView.xaml.cs
index e2a649864..5e1e0f257 100644
--- a/BeWo/View/Document/TeamFolderRightView.xaml.cs
+++ b/BeWo/View/Document/TeamFolderRightView.xaml.cs
@@ -16,7 +16,6 @@ using BeWo.ViewModel;
using BeWo.ViewModel.ListViewModel;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
using BS.Shared.Translation;
diff --git a/BeWo/View/Document/TemplatePrintSelection.xaml.cs b/BeWo/View/Document/TemplatePrintSelection.xaml.cs
index fa0afceae..588f8d897 100644
--- a/BeWo/View/Document/TemplatePrintSelection.xaml.cs
+++ b/BeWo/View/Document/TemplatePrintSelection.xaml.cs
@@ -15,7 +15,6 @@ using BeWo.Core.Service;
using BS.Shared;
using BS.Shared.Extensions;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Services;
using BS.Shared.Translation;
diff --git a/BeWo/View/Document/VorlageEditView.xaml.cs b/BeWo/View/Document/VorlageEditView.xaml.cs
index 532dd5db7..ac0edead5 100644
--- a/BeWo/View/Document/VorlageEditView.xaml.cs
+++ b/BeWo/View/Document/VorlageEditView.xaml.cs
@@ -15,7 +15,6 @@ using BeWo.Core.Service;
using BS.Shared;
using BS.Shared.Extensions;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Services;
using BS.Shared.Translation;
diff --git a/BeWo/View/Search/SupportConceptGroupSearchView.cs b/BeWo/View/Search/SupportConceptGroupSearchView.cs
index 4cd824cb7..eb7a57d03 100644
--- a/BeWo/View/Search/SupportConceptGroupSearchView.cs
+++ b/BeWo/View/Search/SupportConceptGroupSearchView.cs
@@ -8,7 +8,6 @@ using System;
using System.Linq;
using System.Windows.Media.Imaging;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.Extensions;
using BeWo.View.Navigation.Sorter;
using BS.Shared.DataContracts.Compact;
diff --git a/BeWo/ViewModel/AppointmentVM.cs b/BeWo/ViewModel/AppointmentVM.cs
index b49ca49d7..4a7d5807e 100644
--- a/BeWo/ViewModel/AppointmentVM.cs
+++ b/BeWo/ViewModel/AppointmentVM.cs
@@ -7,7 +7,6 @@ using BeWo.Validation;
using BeWo.ViewModel.ListViewModel;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
diff --git a/BeWo/ViewModel/ContractVM.cs b/BeWo/ViewModel/ContractVM.cs
index 51638d107..05bddecdb 100644
--- a/BeWo/ViewModel/ContractVM.cs
+++ b/BeWo/ViewModel/ContractVM.cs
@@ -7,7 +7,6 @@ using BS.Shared.DataContracts;
using BS.Shared.Extensions;
using System.Collections.Generic;
-using BS.Shared.Core;
using System.Windows;
namespace BeWo.ViewModel
diff --git a/BeWo/ViewModel/CustomerTokenRelationVM.cs b/BeWo/ViewModel/CustomerTokenRelationVM.cs
index 9ed573c74..1529a8fda 100644
--- a/BeWo/ViewModel/CustomerTokenRelationVM.cs
+++ b/BeWo/ViewModel/CustomerTokenRelationVM.cs
@@ -1,5 +1,4 @@
using BeWo.Validation;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
diff --git a/BeWo/ViewModel/CustomerWohnhilfeVM.cs b/BeWo/ViewModel/CustomerWohnhilfeVM.cs
index 18db5409b..3799bc57b 100644
--- a/BeWo/ViewModel/CustomerWohnhilfeVM.cs
+++ b/BeWo/ViewModel/CustomerWohnhilfeVM.cs
@@ -1,5 +1,4 @@
using BeWo.ViewModel.Wohnhilfe;
-using BS.Shared.Core;
using BS.Shared.DataContracts.Wohnhilfe;
using DevExpress.Mvvm;
using System;
diff --git a/BeWo/ViewModel/EmployeeTokenRelationVM.cs b/BeWo/ViewModel/EmployeeTokenRelationVM.cs
index 99ffc391a..68260c591 100644
--- a/BeWo/ViewModel/EmployeeTokenRelationVM.cs
+++ b/BeWo/ViewModel/EmployeeTokenRelationVM.cs
@@ -1,5 +1,4 @@
using BeWo.Validation;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
diff --git a/BeWo/ViewModel/GkvAbrechnungVM.cs b/BeWo/ViewModel/GkvAbrechnungVM.cs
index a82e18dca..a5c72fe05 100644
--- a/BeWo/ViewModel/GkvAbrechnungVM.cs
+++ b/BeWo/ViewModel/GkvAbrechnungVM.cs
@@ -8,7 +8,6 @@ using BeWo.Core;
using BeWo.ServiceProxy;
using BeWo.Validation;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.GkvAbrechnung;
using BS.Shared.Extensions;
diff --git a/BeWo/ViewModel/GoalRatingVM.cs b/BeWo/ViewModel/GoalRatingVM.cs
index b1b5f8b58..011bfaa08 100644
--- a/BeWo/ViewModel/GoalRatingVM.cs
+++ b/BeWo/ViewModel/GoalRatingVM.cs
@@ -5,7 +5,6 @@ using BeWo.Validation;
using BeWo.ViewModel.ListViewModel;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
diff --git a/BeWo/ViewModel/Light/GkvAbrechnungLightVM.cs b/BeWo/ViewModel/Light/GkvAbrechnungLightVM.cs
index a182d933d..7d97c98ad 100644
--- a/BeWo/ViewModel/Light/GkvAbrechnungLightVM.cs
+++ b/BeWo/ViewModel/Light/GkvAbrechnungLightVM.cs
@@ -8,7 +8,6 @@ using BeWo.Core;
using BeWo.ServiceProxy;
using BeWo.Validation;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts.GkvAbrechnung;
using BS.Shared.DataContracts.Light;
using BS.Shared.Extensions;
diff --git a/BeWo/ViewModel/ListViewModel/AiConversationListVM.cs b/BeWo/ViewModel/ListViewModel/AiConversationListVM.cs
index dbbab7a2c..f1972d752 100644
--- a/BeWo/ViewModel/ListViewModel/AiConversationListVM.cs
+++ b/BeWo/ViewModel/ListViewModel/AiConversationListVM.cs
@@ -2,7 +2,6 @@
using BeWo.Core.Commands;
using BeWo.ServiceProxy;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts.Feature.AI;
using BS.Shared.Extensions;
using ChatController.Utilities.Extensions;
diff --git a/BeWo/ViewModel/ListViewModel/BudgetListVM.cs b/BeWo/ViewModel/ListViewModel/BudgetListVM.cs
index d3759d0b7..7dbcef328 100644
--- a/BeWo/ViewModel/ListViewModel/BudgetListVM.cs
+++ b/BeWo/ViewModel/ListViewModel/BudgetListVM.cs
@@ -1,7 +1,6 @@
using System.Collections.Generic;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
namespace BeWo.ViewModel.ListViewModel
diff --git a/BeWo/ViewModel/ListViewModel/CustomerVermittlungArbeitListVM.cs b/BeWo/ViewModel/ListViewModel/CustomerVermittlungArbeitListVM.cs
index 0ab4dd4b5..415b3ebb4 100644
--- a/BeWo/ViewModel/ListViewModel/CustomerVermittlungArbeitListVM.cs
+++ b/BeWo/ViewModel/ListViewModel/CustomerVermittlungArbeitListVM.cs
@@ -1,5 +1,4 @@
-using BS.Shared.Core;
-using BS.Shared.DataContracts;
+using BS.Shared.DataContracts;
using DevExpress.Mvvm;
using System;
using System.Collections.Generic;
diff --git a/BeWo/ViewModel/ListViewModel/DienstListVM.cs b/BeWo/ViewModel/ListViewModel/DienstListVM.cs
index 25015297f..e16885384 100644
--- a/BeWo/ViewModel/ListViewModel/DienstListVM.cs
+++ b/BeWo/ViewModel/ListViewModel/DienstListVM.cs
@@ -5,7 +5,6 @@ using System.Reflection;
using System.Windows.Media;
using BeWo.ServiceProxy;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using Color = System.Drawing.Color;
diff --git a/BeWo/ViewModel/ListViewModel/GoalRatingListVM.cs b/BeWo/ViewModel/ListViewModel/GoalRatingListVM.cs
index 736d58adc..b0b43038e 100644
--- a/BeWo/ViewModel/ListViewModel/GoalRatingListVM.cs
+++ b/BeWo/ViewModel/ListViewModel/GoalRatingListVM.cs
@@ -1,5 +1,4 @@
using System.Collections.Generic;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
namespace BeWo.ViewModel.ListViewModel
diff --git a/BeWo/ViewModel/ListViewModel/NotizenKategorieListVM.cs b/BeWo/ViewModel/ListViewModel/NotizenKategorieListVM.cs
index 299712098..31c94a034 100644
--- a/BeWo/ViewModel/ListViewModel/NotizenKategorieListVM.cs
+++ b/BeWo/ViewModel/ListViewModel/NotizenKategorieListVM.cs
@@ -1,6 +1,5 @@
using System.Collections.Generic;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
namespace BeWo.ViewModel.ListViewModel
diff --git a/BeWo/ViewModel/ListViewModel/RatingListVM.cs b/BeWo/ViewModel/ListViewModel/RatingListVM.cs
index ab7372d6d..5f3901ae4 100644
--- a/BeWo/ViewModel/ListViewModel/RatingListVM.cs
+++ b/BeWo/ViewModel/ListViewModel/RatingListVM.cs
@@ -1,5 +1,4 @@
using System.Collections.Generic;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
namespace BeWo.ViewModel.ListViewModel
diff --git a/BeWo/ViewModel/ListViewModel/RatingTypeListVM.cs b/BeWo/ViewModel/ListViewModel/RatingTypeListVM.cs
index 9e3d99e5b..224240127 100644
--- a/BeWo/ViewModel/ListViewModel/RatingTypeListVM.cs
+++ b/BeWo/ViewModel/ListViewModel/RatingTypeListVM.cs
@@ -1,7 +1,6 @@
using System.Collections.Generic;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
namespace BeWo.ViewModel.ListViewModel
diff --git a/BeWo/ViewModel/ListViewModel/WohneinheitBelegungListVM.cs b/BeWo/ViewModel/ListViewModel/WohneinheitBelegungListVM.cs
index 96ac7baae..1e406d918 100644
--- a/BeWo/ViewModel/ListViewModel/WohneinheitBelegungListVM.cs
+++ b/BeWo/ViewModel/ListViewModel/WohneinheitBelegungListVM.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
diff --git a/BeWo/ViewModel/ListViewModel/WohneinheitListVM.cs b/BeWo/ViewModel/ListViewModel/WohneinheitListVM.cs
index 5a3fa946f..da281b2ec 100644
--- a/BeWo/ViewModel/ListViewModel/WohneinheitListVM.cs
+++ b/BeWo/ViewModel/ListViewModel/WohneinheitListVM.cs
@@ -4,7 +4,6 @@ using System.ComponentModel;
using System.Linq;
using System.Windows;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
using DevExpress.Mvvm;
diff --git a/BeWo/ViewModel/NotizenEintragVM.cs b/BeWo/ViewModel/NotizenEintragVM.cs
index 529667b75..9b13dec83 100644
--- a/BeWo/ViewModel/NotizenEintragVM.cs
+++ b/BeWo/ViewModel/NotizenEintragVM.cs
@@ -3,7 +3,6 @@
using BeWo.Validation;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
namespace BeWo.ViewModel
diff --git a/BeWo/ViewModel/NotizenKategorieVM.cs b/BeWo/ViewModel/NotizenKategorieVM.cs
index e3abc4199..b8da08327 100644
--- a/BeWo/ViewModel/NotizenKategorieVM.cs
+++ b/BeWo/ViewModel/NotizenKategorieVM.cs
@@ -5,7 +5,6 @@ using BeWo.Validation;
using BeWo.ViewModel.ListViewModel;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
using DevExpress.Xpf.Editors.Helpers;
diff --git a/BeWo/ViewModel/OrganisationVM.cs b/BeWo/ViewModel/OrganisationVM.cs
index cb78e564f..7aa9e8c55 100644
--- a/BeWo/ViewModel/OrganisationVM.cs
+++ b/BeWo/ViewModel/OrganisationVM.cs
@@ -11,7 +11,6 @@ using BeWo.ViewModel.ListViewModel;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.Core.Rule;
-using BS.Shared.Core.Validation;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.GkvAbrechnung;
diff --git a/BeWo/ViewModel/RatingTypeVM.cs b/BeWo/ViewModel/RatingTypeVM.cs
index 47db2be5a..e7ca5d690 100644
--- a/BeWo/ViewModel/RatingTypeVM.cs
+++ b/BeWo/ViewModel/RatingTypeVM.cs
@@ -5,7 +5,6 @@ using BeWo.Validation;
using BeWo.ViewModel.ListViewModel;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
diff --git a/BeWo/ViewModel/RatingVM.cs b/BeWo/ViewModel/RatingVM.cs
index dacba4c13..99b4075dd 100644
--- a/BeWo/ViewModel/RatingVM.cs
+++ b/BeWo/ViewModel/RatingVM.cs
@@ -5,7 +5,6 @@ using BeWo.Validation;
using BeWo.ViewModel.ListViewModel;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
diff --git a/BeWo/ViewModel/SupportConceptPeriodStatisticsVM.cs b/BeWo/ViewModel/SupportConceptPeriodStatisticsVM.cs
index 2eec2985f..65d11de65 100644
--- a/BeWo/ViewModel/SupportConceptPeriodStatisticsVM.cs
+++ b/BeWo/ViewModel/SupportConceptPeriodStatisticsVM.cs
@@ -7,7 +7,6 @@ using BeWo.Validation;
using BeWo.ViewModel.ListViewModel;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.Extensions;
namespace BeWo.ViewModel
diff --git a/BeWo/ViewModel/WohnheimVM.cs b/BeWo/ViewModel/WohnheimVM.cs
index 6a1275fc6..3a7af61c7 100644
--- a/BeWo/ViewModel/WohnheimVM.cs
+++ b/BeWo/ViewModel/WohnheimVM.cs
@@ -5,7 +5,6 @@ using BeWo.Core;
using BeWo.Validation;
using BeWo.ViewModel.ListViewModel;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
using System.Windows.Forms;
diff --git a/BeWo/ownChat/ChatServiceCustomer.xaml.cs b/BeWo/ownChat/ChatServiceCustomer.xaml.cs
index 2634c3937..845ed2e03 100644
--- a/BeWo/ownChat/ChatServiceCustomer.xaml.cs
+++ b/BeWo/ownChat/ChatServiceCustomer.xaml.cs
@@ -27,7 +27,6 @@ using BeWo.ViewModel;
using BeWo.ServiceProxy;
using BS.Shared.Extensions;
using BS.Shared;
-using BS.Shared.Core;
using ChatController.ChatKlassen;
using Microsoft.Win32;
using Newtonsoft.Json;
diff --git a/Dakota/DakotaUtils.cs b/Dakota/DakotaUtils.cs
index 1d74cd44b..f3bc6399d 100644
--- a/Dakota/DakotaUtils.cs
+++ b/Dakota/DakotaUtils.cs
@@ -1,5 +1,4 @@
-using BS.Shared.Core;
-using BS.Shared.Exceptions;
+using BS.Shared.Exceptions;
using Dakota.Models;
using System;
using System.Collections.Generic;
diff --git a/Data/Entities/AbsenceTimeHistory.cs b/Data/Entities/AbsenceTimeHistory.cs
index 0942df4e5..3f55d5234 100644
--- a/Data/Entities/AbsenceTimeHistory.cs
+++ b/Data/Entities/AbsenceTimeHistory.cs
@@ -1,7 +1,6 @@
using System;
using BS.Shared;
-using BS.Shared.Core;
namespace BeWo.Data.Entities
{
diff --git a/Data/Entities/AiConfig.cs b/Data/Entities/AiConfig.cs
index 966154ad1..e552e0065 100644
--- a/Data/Entities/AiConfig.cs
+++ b/Data/Entities/AiConfig.cs
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using BS.Shared;
-using BS.Shared.Core;
namespace BeWo.Data.Entities
{
diff --git a/Data/Entities/AiConversation.cs b/Data/Entities/AiConversation.cs
index bb4774e6a..f00bac040 100644
--- a/Data/Entities/AiConversation.cs
+++ b/Data/Entities/AiConversation.cs
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using BS.Shared;
-using BS.Shared.Core;
using Newtonsoft.Json;
namespace BeWo.Data.Entities
diff --git a/Data/Entities/AiConversationMessage.cs b/Data/Entities/AiConversationMessage.cs
index 76c935d17..121634be9 100644
--- a/Data/Entities/AiConversationMessage.cs
+++ b/Data/Entities/AiConversationMessage.cs
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.Interface.Feature.AICore;
namespace BeWo.Data.Entities
diff --git a/Data/Entities/AiPromptbausteinFolder.cs b/Data/Entities/AiPromptbausteinFolder.cs
index 25c69bb4c..2482a5feb 100644
--- a/Data/Entities/AiPromptbausteinFolder.cs
+++ b/Data/Entities/AiPromptbausteinFolder.cs
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using BS.Shared;
-using BS.Shared.Core;
namespace BeWo.Data.Entities
{
diff --git a/Data/Entities/AiPromptbausteinPrompt.cs b/Data/Entities/AiPromptbausteinPrompt.cs
index d68ec1f53..122354c5a 100644
--- a/Data/Entities/AiPromptbausteinPrompt.cs
+++ b/Data/Entities/AiPromptbausteinPrompt.cs
@@ -3,7 +3,6 @@ using System.Collections;
using System.Collections.Generic;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.Interface;
namespace BeWo.Data.Entities
diff --git a/Data/Entities/AiPromptbausteinRoutine.cs b/Data/Entities/AiPromptbausteinRoutine.cs
index 6834062e5..c390fb8c5 100644
--- a/Data/Entities/AiPromptbausteinRoutine.cs
+++ b/Data/Entities/AiPromptbausteinRoutine.cs
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts.Compact;
namespace BeWo.Data.Entities
diff --git a/Data/Entities/AiPromptbausteinRoutineStep.cs b/Data/Entities/AiPromptbausteinRoutineStep.cs
index 990289494..b1ea00ba2 100644
--- a/Data/Entities/AiPromptbausteinRoutineStep.cs
+++ b/Data/Entities/AiPromptbausteinRoutineStep.cs
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using BS.Shared;
-using BS.Shared.Core;
namespace BeWo.Data.Entities
{
diff --git a/Data/Entities/AiUserSetting.cs b/Data/Entities/AiUserSetting.cs
index e12c3bc2d..2c78b13a4 100644
--- a/Data/Entities/AiUserSetting.cs
+++ b/Data/Entities/AiUserSetting.cs
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using BS.Shared;
-using BS.Shared.Core;
namespace BeWo.Data.Entities
{
diff --git a/Data/Entities/CustomerVermittlungArbeit.cs b/Data/Entities/CustomerVermittlungArbeit.cs
index 4f1d4b4da..b55d13b99 100644
--- a/Data/Entities/CustomerVermittlungArbeit.cs
+++ b/Data/Entities/CustomerVermittlungArbeit.cs
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
namespace BeWo.Data.Entities
diff --git a/Data/Entities/CustomerWohnhilfe.cs b/Data/Entities/CustomerWohnhilfe.cs
index 787792013..1a5c4f734 100644
--- a/Data/Entities/CustomerWohnhilfe.cs
+++ b/Data/Entities/CustomerWohnhilfe.cs
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts.Wohnhilfe;
namespace BeWo.Data.Entities
diff --git a/Data/Entities/Image.cs b/Data/Entities/Image.cs
index 2eaf8047d..794b58746 100644
--- a/Data/Entities/Image.cs
+++ b/Data/Entities/Image.cs
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using BS.Shared;
-using BS.Shared.Core;
namespace BeWo.Data.Entities
{
diff --git a/Data/Entities/OvertimeHistory.cs b/Data/Entities/OvertimeHistory.cs
index 74bbcd69a..86f866501 100644
--- a/Data/Entities/OvertimeHistory.cs
+++ b/Data/Entities/OvertimeHistory.cs
@@ -1,7 +1,6 @@
using System;
using BS.Shared;
-using BS.Shared.Core;
namespace BeWo.Data.Entities
{
diff --git a/Data/Entities/StoredFile.cs b/Data/Entities/StoredFile.cs
index 9a2a515e7..7e6948fea 100644
--- a/Data/Entities/StoredFile.cs
+++ b/Data/Entities/StoredFile.cs
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.Interface;
namespace BeWo.Data.Entities
diff --git a/Data/ICD10/ICD10DAO.cs b/Data/ICD10/ICD10DAO.cs
index a7fe85167..c97e41fea 100644
--- a/Data/ICD10/ICD10DAO.cs
+++ b/Data/ICD10/ICD10DAO.cs
@@ -8,7 +8,6 @@ using System.Net.Mime;
using System.Text;
using System.Xml.Linq;
-using BS.Shared.Core;
namespace BeWo.Data.ICD10
{
diff --git a/Data/MultitenancyOperationContextExt.cs b/Data/MultitenancyOperationContextExt.cs
index b4f5916d9..561fe624b 100644
--- a/Data/MultitenancyOperationContextExt.cs
+++ b/Data/MultitenancyOperationContextExt.cs
@@ -1,5 +1,4 @@
-using BS.Shared.Core;
-using BS.Shared.Exceptions;
+using BS.Shared.Exceptions;
using System.ServiceModel;
namespace BeWo.Data
diff --git a/Report/DefaultReports/Abwesenheiten.cs b/Report/DefaultReports/Abwesenheiten.cs
index 9b7f7da81..6bf678e07 100644
--- a/Report/DefaultReports/Abwesenheiten.cs
+++ b/Report/DefaultReports/Abwesenheiten.cs
@@ -7,7 +7,6 @@ using System.Data;
using System.Drawing.Printing;
using BeWo.Data.Access;
using BeWo.Data.Entities;
-using BS.Shared.Core;
namespace BeWo.Report.DefaultReports
{
diff --git a/Report/DefaultReports/Bewertungsstatistik.cs b/Report/DefaultReports/Bewertungsstatistik.cs
index 30bc049d5..dbd9bdbe3 100644
--- a/Report/DefaultReports/Bewertungsstatistik.cs
+++ b/Report/DefaultReports/Bewertungsstatistik.cs
@@ -1,6 +1,5 @@
using System;
using BeWo.Report.ReportObjects;
-using BS.Shared.Core;
using System.Data;
using DevExpress.XtraReports.UI;
using System.Linq;
diff --git a/Report/DefaultReports/BewertungsstatistikReport.cs b/Report/DefaultReports/BewertungsstatistikReport.cs
index 6c39482e7..9cd6f5cb8 100644
--- a/Report/DefaultReports/BewertungsstatistikReport.cs
+++ b/Report/DefaultReports/BewertungsstatistikReport.cs
@@ -1,6 +1,5 @@
using System;
using BeWo.Report.ReportObjects;
-using BS.Shared.Core;
using System.Data;
diff --git a/Report/DefaultReports/BudgetnachweisAnhangDigga.cs b/Report/DefaultReports/BudgetnachweisAnhangDigga.cs
index 533bc4f09..e7bdfb4a7 100644
--- a/Report/DefaultReports/BudgetnachweisAnhangDigga.cs
+++ b/Report/DefaultReports/BudgetnachweisAnhangDigga.cs
@@ -2,7 +2,6 @@
using System.Linq;
using BeWo.Report;
using BeWo.Report.ReportObjects;
-using BS.Shared.Core;
namespace BeWo.Report.DefaultReports
{
diff --git a/Report/DefaultReports/Invoices/GkvBegleitzettel.cs b/Report/DefaultReports/Invoices/GkvBegleitzettel.cs
index 695b17bc0..d20b2d777 100644
--- a/Report/DefaultReports/Invoices/GkvBegleitzettel.cs
+++ b/Report/DefaultReports/Invoices/GkvBegleitzettel.cs
@@ -3,7 +3,6 @@ using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Report;
using BeWo.Report.ReportObjects;
-using BS.Shared.Core;
using BS.Shared.Extensions;
using DevExpress.XtraReports.UI;
diff --git a/Report/DefaultReports/Invoices/SbdLeistungsnachweisAbrechnung.cs b/Report/DefaultReports/Invoices/SbdLeistungsnachweisAbrechnung.cs
index 4d05003a0..43eba340f 100644
--- a/Report/DefaultReports/Invoices/SbdLeistungsnachweisAbrechnung.cs
+++ b/Report/DefaultReports/Invoices/SbdLeistungsnachweisAbrechnung.cs
@@ -5,7 +5,6 @@ using BeWo.Report.ReportObjects;
using BeWo.Report;
using DevExpress.XtraReports.UI;
using System.Data;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
namespace BeWo.Report.DefaultReports.Invoices
diff --git a/Report/DefaultReports/JahresReport.cs b/Report/DefaultReports/JahresReport.cs
index 2afd46c04..f30c4cb5d 100644
--- a/Report/DefaultReports/JahresReport.cs
+++ b/Report/DefaultReports/JahresReport.cs
@@ -1,6 +1,5 @@
using System;
using BeWo.Report.ReportObjects;
-using BS.Shared.Core;
using System.Data;
using System.Collections.Generic;
using System.Linq;
diff --git a/Report/DefaultReports/LeistungsnachweisSbd.cs b/Report/DefaultReports/LeistungsnachweisSbd.cs
index 152a8a325..8d9fd22d7 100644
--- a/Report/DefaultReports/LeistungsnachweisSbd.cs
+++ b/Report/DefaultReports/LeistungsnachweisSbd.cs
@@ -4,7 +4,6 @@ using BeWo.Report.ReportObjects;
using BeWo.Report;
using DevExpress.XtraReports.UI;
using System.Data;
-using BS.Shared.Core;
namespace BeWo.Report.DefaultReports
{
diff --git a/Report/DefaultReports/LwlPruefliste.cs b/Report/DefaultReports/LwlPruefliste.cs
index 8eb02ce3f..e51458de6 100644
--- a/Report/DefaultReports/LwlPruefliste.cs
+++ b/Report/DefaultReports/LwlPruefliste.cs
@@ -4,7 +4,6 @@ using System.Drawing;
using System.IO;
using System.Text.RegularExpressions;
using BeWo.Report.ReportObjects;
-using BS.Shared.Core;
using DevExpress.XtraReports.UI;
namespace BeWo.Report.DefaultReports
diff --git a/Report/DefaultReports/RosterIstReport.cs b/Report/DefaultReports/RosterIstReport.cs
index d1d575844..25fd83834 100644
--- a/Report/DefaultReports/RosterIstReport.cs
+++ b/Report/DefaultReports/RosterIstReport.cs
@@ -5,7 +5,6 @@ using System.Linq;
using BeWo.Report;
using BeWo.Report.ReportObjects;
-using BS.Shared.Core;
using DevExpress.XtraReports.UI;
namespace BeWo.Report.DefaultReports
diff --git a/Report/ReportObjects/BewertungsstatistikRO.cs b/Report/ReportObjects/BewertungsstatistikRO.cs
index 3ce29a057..c2adacbd7 100644
--- a/Report/ReportObjects/BewertungsstatistikRO.cs
+++ b/Report/ReportObjects/BewertungsstatistikRO.cs
@@ -3,7 +3,6 @@ using BeWo.Data.Entities;
using BeWo.Service.DCEntityMapper;
using BeWo.Service.ServiceImplementations;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
using System;
diff --git a/Report/ReportObjects/BudgetnachweisAnhangDiggaRO.cs b/Report/ReportObjects/BudgetnachweisAnhangDiggaRO.cs
index 7a8ad440a..c0418a0cf 100644
--- a/Report/ReportObjects/BudgetnachweisAnhangDiggaRO.cs
+++ b/Report/ReportObjects/BudgetnachweisAnhangDiggaRO.cs
@@ -7,7 +7,6 @@ using BeWo.Service.DCEntityMapper;
using BeWo.Service.Invoicing;
using BeWo.Service.Plugins;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
diff --git a/Report/ReportObjects/CustomerListRO.cs b/Report/ReportObjects/CustomerListRO.cs
index 57f384076..4e9e56c1e 100644
--- a/Report/ReportObjects/CustomerListRO.cs
+++ b/Report/ReportObjects/CustomerListRO.cs
@@ -4,7 +4,6 @@ using System.Linq;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Service.DCEntityMapper;
-using BS.Shared.Core;
namespace BeWo.Report.ReportObjects
{
diff --git a/Report/ReportObjects/GkvAbrechnungRO.cs b/Report/ReportObjects/GkvAbrechnungRO.cs
index d72b0e29a..757748694 100644
--- a/Report/ReportObjects/GkvAbrechnungRO.cs
+++ b/Report/ReportObjects/GkvAbrechnungRO.cs
@@ -1,7 +1,6 @@
using BeWo.Data.Entities;
using BeWo.Service.Plugins;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.GkvAbrechnung;
using BS.Shared.Extensions;
diff --git a/Report/ReportObjects/LwlPrueflisteRO.cs b/Report/ReportObjects/LwlPrueflisteRO.cs
index 5bf4d25c1..5b9aa1a1e 100644
--- a/Report/ReportObjects/LwlPrueflisteRO.cs
+++ b/Report/ReportObjects/LwlPrueflisteRO.cs
@@ -4,7 +4,6 @@ using System.Linq;
using BeWo.Data.Access;
using BeWo.Data.ICD10;
using BS.Shared;
-using BS.Shared.Core;
namespace BeWo.Report.ReportObjects
{
diff --git a/Report/ReportObjects/LwvKASpitzabrechnungRO.cs b/Report/ReportObjects/LwvKASpitzabrechnungRO.cs
index 22d82ca70..deac3d953 100644
--- a/Report/ReportObjects/LwvKASpitzabrechnungRO.cs
+++ b/Report/ReportObjects/LwvKASpitzabrechnungRO.cs
@@ -7,7 +7,6 @@ using BeWo.Data.Entities;
using BeWo.Service.DCEntityMapper;
using BeWo.Service.Plugins;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
using BS.Shared.Services;
diff --git a/Report/ReportObjects/MitarbeiterstundenkontoBerechnungMonate.cs b/Report/ReportObjects/MitarbeiterstundenkontoBerechnungMonate.cs
index a18bdf4c8..eba2356ae 100644
--- a/Report/ReportObjects/MitarbeiterstundenkontoBerechnungMonate.cs
+++ b/Report/ReportObjects/MitarbeiterstundenkontoBerechnungMonate.cs
@@ -7,7 +7,6 @@ using BeWo.Data.Entities;
using BeWo.Data.Access;
using BeWo.Service.Configuration;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.Extensions;
using BeWo.Service.Plugins;
diff --git a/Report/ReportObjects/MitarbeiterstundenkontoMonateRO.cs b/Report/ReportObjects/MitarbeiterstundenkontoMonateRO.cs
index f653b890f..0e139e960 100644
--- a/Report/ReportObjects/MitarbeiterstundenkontoMonateRO.cs
+++ b/Report/ReportObjects/MitarbeiterstundenkontoMonateRO.cs
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Linq;
using System.Windows.Ink;
-using BS.Shared.Core;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BS.Shared;
diff --git a/Report/ReportObjects/MonatlicherSollIstVergleichRO.cs b/Report/ReportObjects/MonatlicherSollIstVergleichRO.cs
index 94bca2d11..7cedd0956 100644
--- a/Report/ReportObjects/MonatlicherSollIstVergleichRO.cs
+++ b/Report/ReportObjects/MonatlicherSollIstVergleichRO.cs
@@ -7,7 +7,6 @@ using BeWo.Data.Entities;
using BeWo.Service.DCEntityMapper;
using BeWo.Service.Plugins;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
using BS.Shared.Services;
diff --git a/Report/ReportObjects/PersonListRO.cs b/Report/ReportObjects/PersonListRO.cs
index 71a75d012..46029e17b 100644
--- a/Report/ReportObjects/PersonListRO.cs
+++ b/Report/ReportObjects/PersonListRO.cs
@@ -4,7 +4,6 @@ using System.Linq;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Service.DCEntityMapper;
-using BS.Shared.Core;
using BS.Shared.DataContracts.Compact;
namespace BeWo.Report.ReportObjects
diff --git a/Report/ReportObjects/ServiceRecordChangesAfterInvoiceDateRO.cs b/Report/ReportObjects/ServiceRecordChangesAfterInvoiceDateRO.cs
index 364f8e826..290e217b5 100644
--- a/Report/ReportObjects/ServiceRecordChangesAfterInvoiceDateRO.cs
+++ b/Report/ReportObjects/ServiceRecordChangesAfterInvoiceDateRO.cs
@@ -6,7 +6,6 @@ using BeWo.Data.Entities;
using BeWo.Service.DCEntityMapper;
using BeWo.Service.Plugins;
using BS.Shared;
-using BS.Shared.Core;
namespace BeWo.Report.ReportObjects
{
diff --git a/Report/ReportObjects/UrlaubskontoRO.cs b/Report/ReportObjects/UrlaubskontoRO.cs
index 0c7285783..28a8e4640 100644
--- a/Report/ReportObjects/UrlaubskontoRO.cs
+++ b/Report/ReportObjects/UrlaubskontoRO.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.Extensions;
namespace BeWo.Report.ReportObjects
diff --git a/Server/Components/AICore/AICore.csproj b/Server/Components/AICore/AICore.csproj
index a6d1948fa..937b44fcd 100644
--- a/Server/Components/AICore/AICore.csproj
+++ b/Server/Components/AICore/AICore.csproj
@@ -116,6 +116,7 @@
+
diff --git a/Shared/Core/AiUtils.cs b/Server/Components/AICore/Core/AiUtils.cs
similarity index 98%
rename from Shared/Core/AiUtils.cs
rename to Server/Components/AICore/Core/AiUtils.cs
index 4a394a930..08273d50c 100644
--- a/Shared/Core/AiUtils.cs
+++ b/Server/Components/AICore/Core/AiUtils.cs
@@ -4,7 +4,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
-namespace BS.Shared.Core
+namespace AICore.Core
{
public static class AiUtils
{
diff --git a/Server/Components/AICore/Facade/LLM/OllamaApiClient.cs b/Server/Components/AICore/Facade/LLM/OllamaApiClient.cs
index 18ec434aa..2a922bcc4 100644
--- a/Server/Components/AICore/Facade/LLM/OllamaApiClient.cs
+++ b/Server/Components/AICore/Facade/LLM/OllamaApiClient.cs
@@ -12,7 +12,6 @@ using BS.Shared;
using BS.Shared.Logger;
using log4net;
using System.Runtime.CompilerServices;
-using BS.Shared.Core;
using BeWo.ServerUtils.Core;
namespace AICore.Facade.LLM
diff --git a/Server/Components/AICore/Prompt/SystemPrompts/AiConversationSystemPromptBuilder.cs b/Server/Components/AICore/Prompt/SystemPrompts/AiConversationSystemPromptBuilder.cs
index 6674a3d2a..0a19fbc4c 100644
--- a/Server/Components/AICore/Prompt/SystemPrompts/AiConversationSystemPromptBuilder.cs
+++ b/Server/Components/AICore/Prompt/SystemPrompts/AiConversationSystemPromptBuilder.cs
@@ -1,7 +1,6 @@
using AICore.Context.Summary;
using AICore.Context.SummaryParser;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts.Feature.AI;
using BS.Shared.Exceptions;
using BS.Shared.Translation;
diff --git a/Server/Components/AICore/Prompt/SystemPrompts/AiFunctionSystemPromptBuilder.cs b/Server/Components/AICore/Prompt/SystemPrompts/AiFunctionSystemPromptBuilder.cs
index 5b1c7dbec..940e00ccc 100644
--- a/Server/Components/AICore/Prompt/SystemPrompts/AiFunctionSystemPromptBuilder.cs
+++ b/Server/Components/AICore/Prompt/SystemPrompts/AiFunctionSystemPromptBuilder.cs
@@ -2,7 +2,6 @@
using AICore.Context.Summary.Function;
using AICore.Context.SummaryParser;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts.Feature.AI;
using Newtonsoft.Json.Linq;
using System;
diff --git a/Service/Core/MailUtils.cs b/Service/Core/MailUtils.cs
index 45353eddc..8fadd3c6b 100644
--- a/Service/Core/MailUtils.cs
+++ b/Service/Core/MailUtils.cs
@@ -9,7 +9,6 @@ using System.Net.Mail;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
-using BS.Shared.Core;
namespace BeWo.Service.Core
{
diff --git a/Service/DCEntityMapper/AiConfigDC_AiConfig.cs b/Service/DCEntityMapper/AiConfigDC_AiConfig.cs
index eb4bcadb7..5a596fdec 100644
--- a/Service/DCEntityMapper/AiConfigDC_AiConfig.cs
+++ b/Service/DCEntityMapper/AiConfigDC_AiConfig.cs
@@ -5,7 +5,6 @@ using BeWo.Data.Access;
using BeWo.Data.Entities;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts.Feature.AI;
namespace BeWo.Service.DCEntityMapper
diff --git a/Service/DCEntityMapper/AiConversationDC_AiConversation.cs b/Service/DCEntityMapper/AiConversationDC_AiConversation.cs
index f00ac2d51..789f3e433 100644
--- a/Service/DCEntityMapper/AiConversationDC_AiConversation.cs
+++ b/Service/DCEntityMapper/AiConversationDC_AiConversation.cs
@@ -6,7 +6,6 @@ using BeWo.Data.Access;
using BeWo.Data.Entities;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts.Feature.AI;
using BS.Shared.Extensions;
diff --git a/Service/DCEntityMapper/AiConversationMessageDC_AiConversationMessage.cs b/Service/DCEntityMapper/AiConversationMessageDC_AiConversationMessage.cs
index c698e1f08..28c04c6ce 100644
--- a/Service/DCEntityMapper/AiConversationMessageDC_AiConversationMessage.cs
+++ b/Service/DCEntityMapper/AiConversationMessageDC_AiConversationMessage.cs
@@ -6,7 +6,6 @@ using BeWo.Data.Access;
using BeWo.Data.Entities;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts.Feature.AI;
namespace BeWo.Service.DCEntityMapper
diff --git a/Service/DCEntityMapper/AiModelDC_AiModel.cs b/Service/DCEntityMapper/AiModelDC_AiModel.cs
index 85f1e1741..e31ef26eb 100644
--- a/Service/DCEntityMapper/AiModelDC_AiModel.cs
+++ b/Service/DCEntityMapper/AiModelDC_AiModel.cs
@@ -5,7 +5,6 @@ using BeWo.Data.Access;
using BeWo.Data.Entities;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts.Feature.AI;
namespace BeWo.Service.DCEntityMapper
diff --git a/Service/DCEntityMapper/AiPromptbausteinFolderDC_AiPromptbausteinFolder.cs b/Service/DCEntityMapper/AiPromptbausteinFolderDC_AiPromptbausteinFolder.cs
index 6e4d5d104..bb3bb75fc 100644
--- a/Service/DCEntityMapper/AiPromptbausteinFolderDC_AiPromptbausteinFolder.cs
+++ b/Service/DCEntityMapper/AiPromptbausteinFolderDC_AiPromptbausteinFolder.cs
@@ -5,7 +5,6 @@ using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Service.ServiceImplementations;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts.Feature.AI;
namespace BeWo.Service.DCEntityMapper
diff --git a/Service/DCEntityMapper/AiPromptbausteinPromptDC_AiPromptbausteinPrompt.cs b/Service/DCEntityMapper/AiPromptbausteinPromptDC_AiPromptbausteinPrompt.cs
index 213980d03..0afcedc6e 100644
--- a/Service/DCEntityMapper/AiPromptbausteinPromptDC_AiPromptbausteinPrompt.cs
+++ b/Service/DCEntityMapper/AiPromptbausteinPromptDC_AiPromptbausteinPrompt.cs
@@ -6,7 +6,6 @@ using BeWo.Data.Entities;
using BeWo.Data.Security;
using BeWo.Service.ServiceImplementations;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts.Feature.AI;
namespace BeWo.Service.DCEntityMapper
diff --git a/Service/DCEntityMapper/AiPromptbausteinRoutineDC_AiPromptbausteinRoutine.cs b/Service/DCEntityMapper/AiPromptbausteinRoutineDC_AiPromptbausteinRoutine.cs
index be6da7129..8ee396ce7 100644
--- a/Service/DCEntityMapper/AiPromptbausteinRoutineDC_AiPromptbausteinRoutine.cs
+++ b/Service/DCEntityMapper/AiPromptbausteinRoutineDC_AiPromptbausteinRoutine.cs
@@ -6,7 +6,6 @@ using BeWo.Data.Entities;
using BeWo.Data.Security;
using BeWo.Service.ServiceImplementations;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Feature.AI;
diff --git a/Service/DCEntityMapper/AiPromptbausteinRoutineStepDC_AiPromptbausteinRoutineStep.cs b/Service/DCEntityMapper/AiPromptbausteinRoutineStepDC_AiPromptbausteinRoutineStep.cs
index 4bbfdc192..19638ab49 100644
--- a/Service/DCEntityMapper/AiPromptbausteinRoutineStepDC_AiPromptbausteinRoutineStep.cs
+++ b/Service/DCEntityMapper/AiPromptbausteinRoutineStepDC_AiPromptbausteinRoutineStep.cs
@@ -5,7 +5,6 @@ using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Data.Security;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Feature.AI;
diff --git a/Service/DCEntityMapper/AiSettingsDC_AiSettings.cs b/Service/DCEntityMapper/AiSettingsDC_AiSettings.cs
index ceee85ec1..95be2218b 100644
--- a/Service/DCEntityMapper/AiSettingsDC_AiSettings.cs
+++ b/Service/DCEntityMapper/AiSettingsDC_AiSettings.cs
@@ -5,7 +5,6 @@ using BeWo.Data.Access;
using BeWo.Data.Entities;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
namespace BeWo.Service.DCEntityMapper
diff --git a/Service/DCEntityMapper/AiUserSettingDC_AiUserSetting.cs b/Service/DCEntityMapper/AiUserSettingDC_AiUserSetting.cs
index 28f776230..09728b805 100644
--- a/Service/DCEntityMapper/AiUserSettingDC_AiUserSetting.cs
+++ b/Service/DCEntityMapper/AiUserSettingDC_AiUserSetting.cs
@@ -5,7 +5,6 @@ using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Data.Security;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Feature.AI;
diff --git a/Service/DCEntityMapper/BudgetDC_Budget.cs b/Service/DCEntityMapper/BudgetDC_Budget.cs
index c9d88d6e4..5cfd6ca7b 100644
--- a/Service/DCEntityMapper/BudgetDC_Budget.cs
+++ b/Service/DCEntityMapper/BudgetDC_Budget.cs
@@ -5,7 +5,6 @@ using BeWo.Data.Entities;
using BS.Shared;
using BS.Shared.DataContracts;
using System.Collections.Generic;
-using BS.Shared.Core;
namespace BeWo.Service.DCEntityMapper
{
diff --git a/Service/DCEntityMapper/CustomerVermittlungArbeitDC_CustomerVermittlungArbeit.cs b/Service/DCEntityMapper/CustomerVermittlungArbeitDC_CustomerVermittlungArbeit.cs
index 90540f253..14ab0446a 100644
--- a/Service/DCEntityMapper/CustomerVermittlungArbeitDC_CustomerVermittlungArbeit.cs
+++ b/Service/DCEntityMapper/CustomerVermittlungArbeitDC_CustomerVermittlungArbeit.cs
@@ -5,7 +5,6 @@ using BeWo.Data.Access;
using BeWo.Data.Entities;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
diff --git a/Service/DCEntityMapper/CustomerWohnhilfeDC_CustomerWohnhilfe.cs b/Service/DCEntityMapper/CustomerWohnhilfeDC_CustomerWohnhilfe.cs
index 8e42416ab..347421ae0 100644
--- a/Service/DCEntityMapper/CustomerWohnhilfeDC_CustomerWohnhilfe.cs
+++ b/Service/DCEntityMapper/CustomerWohnhilfeDC_CustomerWohnhilfe.cs
@@ -5,7 +5,6 @@ using BeWo.Data.Access;
using BeWo.Data.Entities;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts.Wohnhilfe;
namespace BeWo.Service.DCEntityMapper
diff --git a/Service/DCEntityMapper/DienstEintragDC_DienstEintrag.cs b/Service/DCEntityMapper/DienstEintragDC_DienstEintrag.cs
index 5723fc6a4..51552b8a3 100644
--- a/Service/DCEntityMapper/DienstEintragDC_DienstEintrag.cs
+++ b/Service/DCEntityMapper/DienstEintragDC_DienstEintrag.cs
@@ -5,7 +5,6 @@ using BeWo.Data.Entities;
using BS.Shared;
using BS.Shared.DataContracts;
using System.Collections.Generic;
-using BS.Shared.Core;
namespace BeWo.Service.DCEntityMapper
{
diff --git a/Service/DCEntityMapper/DienstInfoDC_DienstInfo.cs b/Service/DCEntityMapper/DienstInfoDC_DienstInfo.cs
index c5c255dbe..b47493a36 100644
--- a/Service/DCEntityMapper/DienstInfoDC_DienstInfo.cs
+++ b/Service/DCEntityMapper/DienstInfoDC_DienstInfo.cs
@@ -5,7 +5,6 @@ using BeWo.Data.Entities;
using BS.Shared;
using BS.Shared.DataContracts;
using System.Collections.Generic;
-using BS.Shared.Core;
namespace BeWo.Service.DCEntityMapper
{
diff --git a/Service/DCEntityMapper/EmployeeDC_Employee.cs b/Service/DCEntityMapper/EmployeeDC_Employee.cs
index d48891ed7..173593906 100644
--- a/Service/DCEntityMapper/EmployeeDC_Employee.cs
+++ b/Service/DCEntityMapper/EmployeeDC_Employee.cs
@@ -4,7 +4,6 @@ using BeWo.Data.Access;
using BeWo.Data.Entities;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
namespace BeWo.Service.DCEntityMapper
diff --git a/Service/DCEntityMapper/EmploymentTypeDC_EmploymentType.cs b/Service/DCEntityMapper/EmploymentTypeDC_EmploymentType.cs
index 815e8af05..6372adfae 100644
--- a/Service/DCEntityMapper/EmploymentTypeDC_EmploymentType.cs
+++ b/Service/DCEntityMapper/EmploymentTypeDC_EmploymentType.cs
@@ -6,7 +6,6 @@ using BeWo.Data.Entities;
using BS.Shared.DataContracts;
-using Utils = BS.Shared.Core.Utils;
namespace BeWo.Service.DCEntityMapper
{
diff --git a/Service/DCEntityMapper/GkvAbrechnungDC_GkvAbrechnung.cs b/Service/DCEntityMapper/GkvAbrechnungDC_GkvAbrechnung.cs
index 4728234b3..09a3c681c 100644
--- a/Service/DCEntityMapper/GkvAbrechnungDC_GkvAbrechnung.cs
+++ b/Service/DCEntityMapper/GkvAbrechnungDC_GkvAbrechnung.cs
@@ -2,7 +2,6 @@
using BeWo.Data.Entities;
using BeWo.Data.Entities.Light;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.Core.Validation;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.GkvAbrechnung;
diff --git a/Service/DCEntityMapper/GoalRatingDC_GoalRating.cs b/Service/DCEntityMapper/GoalRatingDC_GoalRating.cs
index 6cf1c1809..47e9a6b41 100644
--- a/Service/DCEntityMapper/GoalRatingDC_GoalRating.cs
+++ b/Service/DCEntityMapper/GoalRatingDC_GoalRating.cs
@@ -1,7 +1,6 @@
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
namespace BeWo.Service.DCEntityMapper
diff --git a/Service/DCEntityMapper/HomeViewPanelDC_HomeViewPanel.cs b/Service/DCEntityMapper/HomeViewPanelDC_HomeViewPanel.cs
index a74ad9463..351d2f019 100644
--- a/Service/DCEntityMapper/HomeViewPanelDC_HomeViewPanel.cs
+++ b/Service/DCEntityMapper/HomeViewPanelDC_HomeViewPanel.cs
@@ -4,7 +4,6 @@ using BeWo.Data.Access;
using BeWo.Data.Entities;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
namespace BeWo.Service.DCEntityMapper
diff --git a/Service/DCEntityMapper/ImageDC_Image.cs b/Service/DCEntityMapper/ImageDC_Image.cs
index a8e8f374e..4e1d4caa6 100644
--- a/Service/DCEntityMapper/ImageDC_Image.cs
+++ b/Service/DCEntityMapper/ImageDC_Image.cs
@@ -5,7 +5,6 @@ using BeWo.Data.Access;
using BeWo.Data.Entities;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
namespace BeWo.Service.DCEntityMapper
diff --git a/Service/DCEntityMapper/PreisDC_Preis.cs b/Service/DCEntityMapper/PreisDC_Preis.cs
index 611a3c288..d25819a3a 100644
--- a/Service/DCEntityMapper/PreisDC_Preis.cs
+++ b/Service/DCEntityMapper/PreisDC_Preis.cs
@@ -5,7 +5,6 @@ using BeWo.Data.Entities;
using BS.Shared;
using BS.Shared.DataContracts;
using System.Collections.Generic;
-using BS.Shared.Core;
namespace BeWo.Service.DCEntityMapper
{
diff --git a/Service/DCEntityMapper/RatingDC_Rating.cs b/Service/DCEntityMapper/RatingDC_Rating.cs
index 133a4ed91..b97ab7aad 100644
--- a/Service/DCEntityMapper/RatingDC_Rating.cs
+++ b/Service/DCEntityMapper/RatingDC_Rating.cs
@@ -1,7 +1,6 @@
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
namespace BeWo.Service.DCEntityMapper
diff --git a/Service/DCEntityMapper/RatingTypeDC_RatingType.cs b/Service/DCEntityMapper/RatingTypeDC_RatingType.cs
index b52fe2665..38a4b2121 100644
--- a/Service/DCEntityMapper/RatingTypeDC_RatingType.cs
+++ b/Service/DCEntityMapper/RatingTypeDC_RatingType.cs
@@ -1,7 +1,6 @@
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
namespace BeWo.Service.DCEntityMapper
diff --git a/Service/DCEntityMapper/ReportTemplateDC_ReportTemplate.cs b/Service/DCEntityMapper/ReportTemplateDC_ReportTemplate.cs
index 96af92a2d..de10ca68b 100644
--- a/Service/DCEntityMapper/ReportTemplateDC_ReportTemplate.cs
+++ b/Service/DCEntityMapper/ReportTemplateDC_ReportTemplate.cs
@@ -5,7 +5,6 @@ using BeWo.Data.Entities;
using BS.Shared;
using BS.Shared.DataContracts;
using System.Collections.Generic;
-using BS.Shared.Core;
namespace BeWo.Service.DCEntityMapper
{
diff --git a/Service/DCEntityMapper/SettlementDC_SettlementInvoice.cs b/Service/DCEntityMapper/SettlementDC_SettlementInvoice.cs
index 8c248cf54..d8d6cd6f1 100644
--- a/Service/DCEntityMapper/SettlementDC_SettlementInvoice.cs
+++ b/Service/DCEntityMapper/SettlementDC_SettlementInvoice.cs
@@ -6,7 +6,6 @@ using BeWo.Data.Access;
using BeWo.Data.Entities;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
diff --git a/Service/DCEntityMapper/StoredFileDC_StoredFile.cs b/Service/DCEntityMapper/StoredFileDC_StoredFile.cs
index c9170d4b7..95a64f2a1 100644
--- a/Service/DCEntityMapper/StoredFileDC_StoredFile.cs
+++ b/Service/DCEntityMapper/StoredFileDC_StoredFile.cs
@@ -5,7 +5,6 @@ using BeWo.Data.Access;
using BeWo.Data.Entities;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
namespace BeWo.Service.DCEntityMapper
diff --git a/Service/DCEntityMapper/SupportConceptCostBearerRelDC_CostBearer2SupportConcept.cs b/Service/DCEntityMapper/SupportConceptCostBearerRelDC_CostBearer2SupportConcept.cs
index 0a68831b3..1cc4213d2 100644
--- a/Service/DCEntityMapper/SupportConceptCostBearerRelDC_CostBearer2SupportConcept.cs
+++ b/Service/DCEntityMapper/SupportConceptCostBearerRelDC_CostBearer2SupportConcept.cs
@@ -1,7 +1,6 @@
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
namespace BeWo.Service.DCEntityMapper
diff --git a/Service/Multitenancy/MultitenancyBehaviorExtension.cs b/Service/Multitenancy/MultitenancyBehaviorExtension.cs
index 616b43486..c146b2457 100644
--- a/Service/Multitenancy/MultitenancyBehaviorExtension.cs
+++ b/Service/Multitenancy/MultitenancyBehaviorExtension.cs
@@ -1,5 +1,4 @@
using BeWo.ServerUtils.Core;
-using BS.Shared.Core;
using System;
using System.ServiceModel.Configuration;
diff --git a/Service/Plugins/AiFunctionService.cs b/Service/Plugins/AiFunctionService.cs
index d07b30ba5..98a56560b 100644
--- a/Service/Plugins/AiFunctionService.cs
+++ b/Service/Plugins/AiFunctionService.cs
@@ -17,7 +17,6 @@ using DevExpress.XtraCharts.Native;
using System.IO;
using BS.Shared.Interface;
using System.Text.Json;
-using BS.Shared.Core;
using BeWo.Data.Security;
using BS.Shared.Exceptions;
diff --git a/Service/Plugins/AiPromptbausteineService.cs b/Service/Plugins/AiPromptbausteineService.cs
index 238848176..2c30c870a 100644
--- a/Service/Plugins/AiPromptbausteineService.cs
+++ b/Service/Plugins/AiPromptbausteineService.cs
@@ -7,7 +7,6 @@ using BeWo.Service.Core;
using BeWo.Service.DCEntityMapper;
using BeWo.Service.ServiceProxy;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts.Feature.AI;
using BS.Shared.Extensions;
using DevExpress.CodeParser.Diagnostics;
diff --git a/Service/Plugins/AiService.cs b/Service/Plugins/AiService.cs
index a0ab2031c..61a6ca062 100644
--- a/Service/Plugins/AiService.cs
+++ b/Service/Plugins/AiService.cs
@@ -9,7 +9,6 @@ using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Service.DCEntityMapper;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
using Newtonsoft.Json;
diff --git a/Service/Plugins/AiService2.cs b/Service/Plugins/AiService2.cs
index e5286ec7d..5c4470934 100644
--- a/Service/Plugins/AiService2.cs
+++ b/Service/Plugins/AiService2.cs
@@ -12,6 +12,7 @@ using System.Text;
using System.Web.Hosting;
using System.Windows.Interop;
using AICore.Context.Summary;
+using AICore.Core;
using AICore.Prompt;
using AICore.Prompt.SystemPrompts;
using BeWo.Data.Access;
@@ -22,7 +23,6 @@ using BeWo.Service.DCEntityMapper;
using BeWo.Service.ServiceProxy;
using BeWo.Service.ServiceUtils;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Feature.AI;
using BS.Shared.DataContracts.Feature.AI.Functions.ServiceRecords;
diff --git a/Service/Plugins/DataExporter.cs b/Service/Plugins/DataExporter.cs
index 74a78cb9e..13c9d0cee 100644
--- a/Service/Plugins/DataExporter.cs
+++ b/Service/Plugins/DataExporter.cs
@@ -14,7 +14,6 @@ using BS.Shared.Extensions;
using BS.Shared.Services;
using BS.Shared.Translation;
using NHibernate.Util;
-using Utils = BS.Shared.Core.Utils;
namespace BeWo.Service.Plugins
{
diff --git a/Service/Plugins/FlexibleReportService.cs b/Service/Plugins/FlexibleReportService.cs
index a981eb00f..117a9019c 100644
--- a/Service/Plugins/FlexibleReportService.cs
+++ b/Service/Plugins/FlexibleReportService.cs
@@ -10,7 +10,6 @@ using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
using BS.Shared.Services;
-using Utils = BS.Shared.Core.Utils;
namespace BeWo.Service.Plugins
{
diff --git a/Service/Plugins/StundenuebersichtAuswertung.cs b/Service/Plugins/StundenuebersichtAuswertung.cs
index 88d05ed94..6a52cc870 100644
--- a/Service/Plugins/StundenuebersichtAuswertung.cs
+++ b/Service/Plugins/StundenuebersichtAuswertung.cs
@@ -14,7 +14,6 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
-using Utils = BS.Shared.Core.Utils;
namespace BeWo.Service.Plugins
{
diff --git a/Service/Plugins/SupportConceptValidator.cs b/Service/Plugins/SupportConceptValidator.cs
index d67826141..9e69beb37 100644
--- a/Service/Plugins/SupportConceptValidator.cs
+++ b/Service/Plugins/SupportConceptValidator.cs
@@ -6,7 +6,6 @@ using BeWo.Data.Entities;
using BeWo.Service.DCEntityMapper;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
diff --git a/Service/Reporting/IJahresBerichtElement.cs b/Service/Reporting/IJahresBerichtElement.cs
index d32e02225..588d1003e 100644
--- a/Service/Reporting/IJahresBerichtElement.cs
+++ b/Service/Reporting/IJahresBerichtElement.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Services;
using BeWo.Data.Access;
diff --git a/Service/Reporting/JahresBerichtNachAlter.cs b/Service/Reporting/JahresBerichtNachAlter.cs
index 4da53cadf..ed471a5e9 100644
--- a/Service/Reporting/JahresBerichtNachAlter.cs
+++ b/Service/Reporting/JahresBerichtNachAlter.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Services;
using BeWo.Data.Access;
diff --git a/Service/Reporting/JahresBerichtNachDiagnose.cs b/Service/Reporting/JahresBerichtNachDiagnose.cs
index cb84693c2..6dab1c5a5 100644
--- a/Service/Reporting/JahresBerichtNachDiagnose.cs
+++ b/Service/Reporting/JahresBerichtNachDiagnose.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Services;
using BeWo.Data.Access;
diff --git a/Service/Reporting/JahresBerichtNachKlinikaufenthalt.cs b/Service/Reporting/JahresBerichtNachKlinikaufenthalt.cs
index 2268be873..1775a8fca 100644
--- a/Service/Reporting/JahresBerichtNachKlinikaufenthalt.cs
+++ b/Service/Reporting/JahresBerichtNachKlinikaufenthalt.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Services;
using BeWo.Data.Access;
diff --git a/Service/Reporting/Straffaelligenhilfe/AsaStatistic.cs b/Service/Reporting/Straffaelligenhilfe/AsaStatistic.cs
index a88836657..dd992bb44 100644
--- a/Service/Reporting/Straffaelligenhilfe/AsaStatistic.cs
+++ b/Service/Reporting/Straffaelligenhilfe/AsaStatistic.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Services;
using BeWo.Data.Access;
diff --git a/Service/Reporting/Straffaelligenhilfe/StatisticBase.cs b/Service/Reporting/Straffaelligenhilfe/StatisticBase.cs
index 5353e1093..a580cb861 100644
--- a/Service/Reporting/Straffaelligenhilfe/StatisticBase.cs
+++ b/Service/Reporting/Straffaelligenhilfe/StatisticBase.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Services;
using BeWo.Data.Access;
diff --git a/Service/Reporting/Straffaelligenhilfe/TgvStatistic.cs b/Service/Reporting/Straffaelligenhilfe/TgvStatistic.cs
index b3a7cb807..72632ec8e 100644
--- a/Service/Reporting/Straffaelligenhilfe/TgvStatistic.cs
+++ b/Service/Reporting/Straffaelligenhilfe/TgvStatistic.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Services;
using BeWo.Data.Access;
diff --git a/Service/Reporting/Straffaelligenhilfe/VgaStatistic.cs b/Service/Reporting/Straffaelligenhilfe/VgaStatistic.cs
index d5f6b9f47..cf239440b 100644
--- a/Service/Reporting/Straffaelligenhilfe/VgaStatistic.cs
+++ b/Service/Reporting/Straffaelligenhilfe/VgaStatistic.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Services;
using BeWo.Data.Access;
diff --git a/Service/ServiceBehavior/JsonError/JsonErrorHandler.cs b/Service/ServiceBehavior/JsonError/JsonErrorHandler.cs
index 9e95e81f9..d20d59a44 100644
--- a/Service/ServiceBehavior/JsonError/JsonErrorHandler.cs
+++ b/Service/ServiceBehavior/JsonError/JsonErrorHandler.cs
@@ -1,7 +1,6 @@
using BeWo.Data.Access;
using BeWo.ServerUtils.Core;
using BeWo.Service.Core;
-using BS.Shared.Core;
using System;
using System.Collections.Generic;
using System.Configuration;
diff --git a/Service/ServiceBehavior/WCFError/WCFErrorHandler.cs b/Service/ServiceBehavior/WCFError/WCFErrorHandler.cs
index 326e4705d..01ba0192a 100644
--- a/Service/ServiceBehavior/WCFError/WCFErrorHandler.cs
+++ b/Service/ServiceBehavior/WCFError/WCFErrorHandler.cs
@@ -1,6 +1,5 @@
using BeWo.ServerUtils.Core;
using BeWo.Service.Core;
-using BS.Shared.Core;
using DevExpress.CodeParser.Diagnostics;
using log4net;
using System;
diff --git a/Service/ServiceContracts/IApiService.cs b/Service/ServiceContracts/IApiService.cs
index b5d96d1d4..ca468fa6f 100644
--- a/Service/ServiceContracts/IApiService.cs
+++ b/Service/ServiceContracts/IApiService.cs
@@ -8,7 +8,6 @@ using System.Text;
using System.Threading.Tasks;
using BeWo.Service.Attributes;
using System.IO;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
namespace BeWo.Service.ServiceContracts
diff --git a/Service/ServiceImplementations/ApiServiceImp.cs b/Service/ServiceImplementations/ApiServiceImp.cs
index 520235815..260b73555 100644
--- a/Service/ServiceImplementations/ApiServiceImp.cs
+++ b/Service/ServiceImplementations/ApiServiceImp.cs
@@ -1,7 +1,6 @@
using BeWo.Data.Access;
using BeWo.Service.Core;
using BeWo.Service.ServiceContracts;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.AdminService;
using DevExpress.Pdf.Native.BouncyCastle.Ocsp;
diff --git a/Service/ServiceImplementations/ApiStreamServiceImp.cs b/Service/ServiceImplementations/ApiStreamServiceImp.cs
index a751e51ab..c226d10bd 100644
--- a/Service/ServiceImplementations/ApiStreamServiceImp.cs
+++ b/Service/ServiceImplementations/ApiStreamServiceImp.cs
@@ -1,7 +1,6 @@
using BeWo.Data.Access;
using BeWo.Service.Core;
using BeWo.Service.ServiceContracts;
-using BS.Shared.Core;
using DevExpress.Pdf.Native.BouncyCastle.Ocsp;
using Newtonsoft.Json;
using System;
diff --git a/Service/ServiceImplementations/Enhanced/AiEnhancedServiceImp.cs b/Service/ServiceImplementations/Enhanced/AiEnhancedServiceImp.cs
index e792d81f2..3fdb3a3a2 100644
--- a/Service/ServiceImplementations/Enhanced/AiEnhancedServiceImp.cs
+++ b/Service/ServiceImplementations/Enhanced/AiEnhancedServiceImp.cs
@@ -5,7 +5,6 @@ using BeWo.Service.BusinessLogic;
using BeWo.Service.Plugins;
using BeWo.Service.ServiceContracts.Enhanced;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts.Feature.AI;
using BS.Shared.DataContracts.Feature.AI.Functions.ServiceRecords;
using DevExpress.Charts.Native;
diff --git a/Service/ServiceImplementations/Enhanced/StatusServiceImp.cs b/Service/ServiceImplementations/Enhanced/StatusServiceImp.cs
index b4ce42dfd..e76a48dc3 100644
--- a/Service/ServiceImplementations/Enhanced/StatusServiceImp.cs
+++ b/Service/ServiceImplementations/Enhanced/StatusServiceImp.cs
@@ -1,7 +1,6 @@
using BeWo.Service.ServiceContracts.Enhanced;
using BeWo.Service.Status;
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.DataContracts;
using System;
using System.Collections.Generic;
diff --git a/Service/ServiceImplementations/GkvAccountingServiceImp.cs b/Service/ServiceImplementations/GkvAccountingServiceImp.cs
index 09b8c2cfe..f0a948a07 100644
--- a/Service/ServiceImplementations/GkvAccountingServiceImp.cs
+++ b/Service/ServiceImplementations/GkvAccountingServiceImp.cs
@@ -8,7 +8,6 @@ using BeWo.Service.Plugins;
using BeWo.Service.ServiceContracts;
using BS.Shared;
using BS.Shared.AppSender;
-using BS.Shared.Core;
using BS.Shared.Core.Validation;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.GkvAbrechnung;
diff --git a/Service/ServiceProxy/ServiceFacade.cs b/Service/ServiceProxy/ServiceFacade.cs
index c6969e3ab..064162f0e 100644
--- a/Service/ServiceProxy/ServiceFacade.cs
+++ b/Service/ServiceProxy/ServiceFacade.cs
@@ -6,7 +6,6 @@ using System.Threading.Tasks;
using AICore.Facade.LLM;
using BeWo.Service.Core;
using BS.Shared;
-using BS.Shared.Core;
namespace BeWo.Service.ServiceProxy
{
diff --git a/Service/ServiceProxy/XRechnungApiClient.cs b/Service/ServiceProxy/XRechnungApiClient.cs
index 73af1e1c3..dd1413e82 100644
--- a/Service/ServiceProxy/XRechnungApiClient.cs
+++ b/Service/ServiceProxy/XRechnungApiClient.cs
@@ -1,6 +1,5 @@
using BeWo.Data.Entities;
using BeWo.Service.Core;
-using BS.Shared.Core;
using BS.Shared.Core.Facade;
using BS.Shared.DataContracts;
using DevExpress.XtraRichEdit.Model;
diff --git a/Shared/Core/Validation/GkvValidation.cs b/Shared/Core/Validation/GkvValidation.cs
index f75fad0d1..9f42ecc12 100644
--- a/Shared/Core/Validation/GkvValidation.cs
+++ b/Shared/Core/Validation/GkvValidation.cs
@@ -1,5 +1,4 @@
-using BS.Shared.Core.Rule;
-using BS.Shared.DataContracts;
+using BS.Shared.DataContracts;
using BS.Shared.Exceptions;
using BS.Shared.Extensions;
using BS.Shared.Interface;
diff --git a/Shared/DataContracts/BudgetDC.cs b/Shared/DataContracts/BudgetDC.cs
index 078cbc7be..9823d201b 100644
--- a/Shared/DataContracts/BudgetDC.cs
+++ b/Shared/DataContracts/BudgetDC.cs
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Runtime.Serialization;
-using BS.Shared.Core;
namespace BS.Shared.DataContracts
{
diff --git a/Shared/DataContracts/ClientPartials/AdditionalServiceGroupOfPeopleRelationDC.cs b/Shared/DataContracts/ClientPartials/AdditionalServiceGroupOfPeopleRelationDC.cs
index 70eb6b628..f3ccbfdff 100644
--- a/Shared/DataContracts/ClientPartials/AdditionalServiceGroupOfPeopleRelationDC.cs
+++ b/Shared/DataContracts/ClientPartials/AdditionalServiceGroupOfPeopleRelationDC.cs
@@ -1,5 +1,4 @@
-using BS.Shared.Core;
-
+
namespace BS.Shared.DataContracts
{
public partial class AdditionalServiceGroupOfPeopleRelationDC : IDataContract
diff --git a/Shared/DataContracts/ClientPartials/UserDC.cs b/Shared/DataContracts/ClientPartials/UserDC.cs
index bff6ca30a..7ea6ab1ea 100644
--- a/Shared/DataContracts/ClientPartials/UserDC.cs
+++ b/Shared/DataContracts/ClientPartials/UserDC.cs
@@ -1,5 +1,4 @@
-using BS.Shared.Core;
-using System.Collections.Generic;
+using System.Collections.Generic;
using System.Linq;
namespace BS.Shared.DataContracts
diff --git a/Shared/DataContracts/DienstBlockDC.cs b/Shared/DataContracts/DienstBlockDC.cs
index f1491b0bb..5e98faa11 100644
--- a/Shared/DataContracts/DienstBlockDC.cs
+++ b/Shared/DataContracts/DienstBlockDC.cs
@@ -4,7 +4,6 @@ using System.Diagnostics;
using System.Drawing;
using System.Runtime.Serialization;
-using BS.Shared.Core;
using BS.Shared.DataContracts.Compact;
namespace BS.Shared.DataContracts
diff --git a/Shared/DataContracts/DienstEintragDC.cs b/Shared/DataContracts/DienstEintragDC.cs
index 4f6cfc2d9..9ff9a64fb 100644
--- a/Shared/DataContracts/DienstEintragDC.cs
+++ b/Shared/DataContracts/DienstEintragDC.cs
@@ -4,7 +4,6 @@ using System.Diagnostics;
using System.Drawing;
using System.Runtime.Serialization;
-using BS.Shared.Core;
namespace BS.Shared.DataContracts
{
diff --git a/Shared/DataContracts/DienstInfoDC.cs b/Shared/DataContracts/DienstInfoDC.cs
index 523bfcf05..ad4063255 100644
--- a/Shared/DataContracts/DienstInfoDC.cs
+++ b/Shared/DataContracts/DienstInfoDC.cs
@@ -4,7 +4,6 @@ using System.Diagnostics;
using System.Drawing;
using System.Runtime.Serialization;
-using BS.Shared.Core;
namespace BS.Shared.DataContracts
{
diff --git a/Shared/DataContracts/Feature/Wohnhilfe/CustomerWohnhilfeDC.cs b/Shared/DataContracts/Feature/Wohnhilfe/CustomerWohnhilfeDC.cs
index 480be0dd8..c6b49e640 100644
--- a/Shared/DataContracts/Feature/Wohnhilfe/CustomerWohnhilfeDC.cs
+++ b/Shared/DataContracts/Feature/Wohnhilfe/CustomerWohnhilfeDC.cs
@@ -1,5 +1,4 @@
-using BS.Shared.Core;
-using System;
+using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
diff --git a/Shared/DataContracts/FlexibleReportLayoutDC.cs b/Shared/DataContracts/FlexibleReportLayoutDC.cs
index 9725b57a2..95dff1eb6 100644
--- a/Shared/DataContracts/FlexibleReportLayoutDC.cs
+++ b/Shared/DataContracts/FlexibleReportLayoutDC.cs
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Runtime.Serialization;
-using BS.Shared.Core;
namespace BS.Shared.DataContracts
{
diff --git a/Shared/DataContracts/InactivePersonDC.cs b/Shared/DataContracts/InactivePersonDC.cs
index 454eb70be..e34726550 100644
--- a/Shared/DataContracts/InactivePersonDC.cs
+++ b/Shared/DataContracts/InactivePersonDC.cs
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Runtime.Serialization;
-using BS.Shared.Core;
using BS.Shared.Extensions;
using BS.Shared.Interface.Abstract;
diff --git a/Shared/DataContracts/PreisDC.cs b/Shared/DataContracts/PreisDC.cs
index d3097f82c..f11b550f3 100644
--- a/Shared/DataContracts/PreisDC.cs
+++ b/Shared/DataContracts/PreisDC.cs
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Runtime.Serialization;
-using BS.Shared.Core;
namespace BS.Shared.DataContracts
{
diff --git a/Shared/DataContracts/ReportTemplateDC.cs b/Shared/DataContracts/ReportTemplateDC.cs
index 924dc173c..5f10995b4 100644
--- a/Shared/DataContracts/ReportTemplateDC.cs
+++ b/Shared/DataContracts/ReportTemplateDC.cs
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Runtime.Serialization;
-using BS.Shared.Core;
namespace BS.Shared.DataContracts
{
diff --git a/Shared/DataContracts/ServerStatusDC.cs b/Shared/DataContracts/ServerStatusDC.cs
index ebd72c346..3174bca38 100644
--- a/Shared/DataContracts/ServerStatusDC.cs
+++ b/Shared/DataContracts/ServerStatusDC.cs
@@ -1,5 +1,4 @@
-using BS.Shared.Core;
-using System;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.Serialization;
diff --git a/Shared/DataContracts/ServiceRecordPeriodStatisticsInfoDC.cs b/Shared/DataContracts/ServiceRecordPeriodStatisticsInfoDC.cs
index b71e82504..8496991df 100644
--- a/Shared/DataContracts/ServiceRecordPeriodStatisticsInfoDC.cs
+++ b/Shared/DataContracts/ServiceRecordPeriodStatisticsInfoDC.cs
@@ -1,7 +1,6 @@
using System;
using System.Runtime.Serialization;
-using BS.Shared.Core;
namespace BS.Shared.DataContracts
{
diff --git a/Shared/DataContracts/ServiceRecordStatisticsInfoDC.cs b/Shared/DataContracts/ServiceRecordStatisticsInfoDC.cs
index 44fdbb4cd..e808945c5 100644
--- a/Shared/DataContracts/ServiceRecordStatisticsInfoDC.cs
+++ b/Shared/DataContracts/ServiceRecordStatisticsInfoDC.cs
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Runtime.Serialization;
-using BS.Shared.Core;
namespace BS.Shared.DataContracts
{
diff --git a/Shared/DataContracts/SupportConceptPeriodStatisticsDC.cs b/Shared/DataContracts/SupportConceptPeriodStatisticsDC.cs
index 58dce3ca2..fc05212d3 100644
--- a/Shared/DataContracts/SupportConceptPeriodStatisticsDC.cs
+++ b/Shared/DataContracts/SupportConceptPeriodStatisticsDC.cs
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Runtime.Serialization;
-using BS.Shared.Core;
namespace BS.Shared.DataContracts
{
diff --git a/Shared/Exceptions/BeWoNotImplementedException.cs b/Shared/Exceptions/BeWoNotImplementedException.cs
index 51979a424..befbac15a 100644
--- a/Shared/Exceptions/BeWoNotImplementedException.cs
+++ b/Shared/Exceptions/BeWoNotImplementedException.cs
@@ -1,5 +1,4 @@
-using BS.Shared.Core;
-using System;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.Serialization;
diff --git a/Shared/Logger/FileLogger.cs b/Shared/Logger/FileLogger.cs
index ebd423170..529cfa5a0 100644
--- a/Shared/Logger/FileLogger.cs
+++ b/Shared/Logger/FileLogger.cs
@@ -1,5 +1,4 @@
using BS.Shared;
-using BS.Shared.Core;
using BS.Shared.Exceptions;
using BS.Shared.Interface;
using Newtonsoft.Json;
diff --git a/Shared/Shared.csproj b/Shared/Shared.csproj
index bcb2a7462..5e9b71b4b 100644
--- a/Shared/Shared.csproj
+++ b/Shared/Shared.csproj
@@ -143,7 +143,6 @@
-