diff --git a/MMExNotifier.Tests/MainViewModelTests.cs b/MMExNotifier.Tests/MainViewModelTests.cs
index 73705df..9fc9b09 100644
--- a/MMExNotifier.Tests/MainViewModelTests.cs
+++ b/MMExNotifier.Tests/MainViewModelTests.cs
@@ -4,7 +4,6 @@
 using MMExNotifier.Helpers;
 using MMExNotifier.ViewModels;
 using Moq;
-using Windows.Media.ClosedCaptioning;
 
 namespace MMExNotifier.Tests
 {
@@ -121,6 +120,5 @@ public void OnDatabaseError_ShouldShowErrorMessage()
 
             mockNotificationService.Verify();
         }
-
     }
 }
\ No newline at end of file
diff --git a/MMExNotifier/App.xaml.cs b/MMExNotifier/App.xaml.cs
index 97df108..78738d9 100644
--- a/MMExNotifier/App.xaml.cs
+++ b/MMExNotifier/App.xaml.cs
@@ -2,8 +2,6 @@
 using MMExNotifier.DataModel;
 using MMExNotifier.Helpers;
 using MMExNotifier.ViewModels;
-using System;
-using System.Threading;
 using System.Windows;
 
 namespace MMExNotifier
diff --git a/MMExNotifier/DataModel/AppConfiguration.cs b/MMExNotifier/DataModel/AppConfiguration.cs
index 84f95e2..3de207a 100644
--- a/MMExNotifier/DataModel/AppConfiguration.cs
+++ b/MMExNotifier/DataModel/AppConfiguration.cs
@@ -1,11 +1,7 @@
 using Microsoft.Win32.TaskScheduler;
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Security.Principal;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
 
 namespace MMExNotifier.DataModel
 {
diff --git a/MMExNotifier/Helpers/INotificationService.cs b/MMExNotifier/Helpers/INotificationService.cs
index aeb0cd4..6a7ab2c 100644
--- a/MMExNotifier/Helpers/INotificationService.cs
+++ b/MMExNotifier/Helpers/INotificationService.cs
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace MMExNotifier.Helpers
 {
diff --git a/MMExNotifier/MVVM/RangeObservableCollection.cs b/MMExNotifier/MVVM/RangeObservableCollection.cs
index 2cbf9fd..2e566ce 100644
--- a/MMExNotifier/MVVM/RangeObservableCollection.cs
+++ b/MMExNotifier/MVVM/RangeObservableCollection.cs
@@ -1,11 +1,7 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace MMExNotifier.MVVM
 {
diff --git a/MMExNotifier/MVVM/RelayCommand.cs b/MMExNotifier/MVVM/RelayCommand.cs
index 658c07c..6709c4e 100644
--- a/MMExNotifier/MVVM/RelayCommand.cs
+++ b/MMExNotifier/MVVM/RelayCommand.cs
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Input;
 
 namespace MMExNotifier.MVVM
diff --git a/MMExNotifier/MVVM/ViewModelBase.cs b/MMExNotifier/MVVM/ViewModelBase.cs
index d082c44..0c2b581 100644
--- a/MMExNotifier/MVVM/ViewModelBase.cs
+++ b/MMExNotifier/MVVM/ViewModelBase.cs
@@ -1,12 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Linq.Expressions;
 using System.Runtime.CompilerServices;
-using System.Text;
-using System.Threading.Tasks;
-using Windows.ApplicationModel.Resources.Core;
 
 namespace MMExNotifier.MVVM
 {
diff --git a/MMExNotifier/ViewModels/MainViewModel.cs b/MMExNotifier/ViewModels/MainViewModel.cs
index 4c52f1f..01b0235 100644
--- a/MMExNotifier/ViewModels/MainViewModel.cs
+++ b/MMExNotifier/ViewModels/MainViewModel.cs
@@ -1,17 +1,8 @@
-using Microsoft.Toolkit.Uwp.Notifications;
-using MMExNotifier.Database;
+using MMExNotifier.Database;
 using MMExNotifier.DataModel;
 using MMExNotifier.Helpers;
 using MMExNotifier.MVVM;
 using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using Windows.UI.ApplicationSettings;
 
 namespace MMExNotifier.ViewModels
 {
diff --git a/MMExNotifier/Views/MainWindow.xaml.cs b/MMExNotifier/Views/MainWindow.xaml.cs
index 2aa22d2..743af23 100644
--- a/MMExNotifier/Views/MainWindow.xaml.cs
+++ b/MMExNotifier/Views/MainWindow.xaml.cs
@@ -1,16 +1,12 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Windows;
 using System.Windows.Input;
 using Microsoft.Win32;
 using Microsoft.Win32.TaskScheduler;
 using System.Security.Principal;
 using System.IO;
-using System.ComponentModel;
 using Drawing = System.Drawing;
 using System.Reflection;
-using MMExNotifier.DataModel;
 
 namespace MMExNotifier
 {