diff --git a/Filtration/App.xaml.cs b/Filtration/App.xaml.cs
index 4bb9604..87ea227 100644
--- a/Filtration/App.xaml.cs
+++ b/Filtration/App.xaml.cs
@@ -1,5 +1,4 @@
 using System;
-using System.IO.Compression;
 using System.Linq;
 using System.Windows;
 using System.Windows.Threading;
diff --git a/Filtration/Converters/AvailableThemeComponentsConverter.cs b/Filtration/Converters/AvailableThemeComponentsConverter.cs
index a2ccd32..0d4b3f3 100644
--- a/Filtration/Converters/AvailableThemeComponentsConverter.cs
+++ b/Filtration/Converters/AvailableThemeComponentsConverter.cs
@@ -1,9 +1,7 @@
 using System;
-using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Windows.Data;
-using System.Windows.Documents;
 using Filtration.ObjectModel.BlockItemBaseTypes;
 using Filtration.ObjectModel.BlockItemTypes;
 using Filtration.ObjectModel.Enums;
diff --git a/Filtration/Repositories/ItemFilterScriptRepository.cs b/Filtration/Repositories/ItemFilterScriptRepository.cs
index a4106e3..cc0c0c5 100644
--- a/Filtration/Repositories/ItemFilterScriptRepository.cs
+++ b/Filtration/Repositories/ItemFilterScriptRepository.cs
@@ -1,6 +1,4 @@
-using System;
-using System.IO;
-using Filtration.ObjectModel;
+using Filtration.ObjectModel;
 using Filtration.Services;
 using Filtration.ViewModels;
 
diff --git a/Filtration/UserControls/BlockItemControl.xaml.cs b/Filtration/UserControls/BlockItemControl.xaml.cs
index 2f71304..c84f737 100644
--- a/Filtration/UserControls/BlockItemControl.xaml.cs
+++ b/Filtration/UserControls/BlockItemControl.xaml.cs
@@ -3,7 +3,6 @@ using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
 using System.Windows;
-using System.Windows.Media;
 using Filtration.Annotations;
 using Filtration.ObjectModel;
 using Filtration.ObjectModel.BlockItemBaseTypes;
diff --git a/Filtration/UserControls/ItemPreviewControl.xaml.cs b/Filtration/UserControls/ItemPreviewControl.xaml.cs
index 4c277d0..550010f 100644
--- a/Filtration/UserControls/ItemPreviewControl.xaml.cs
+++ b/Filtration/UserControls/ItemPreviewControl.xaml.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Windows;
+using System.Windows;
 using System.Windows.Media;
 
 namespace Filtration.UserControls
diff --git a/Filtration/UserControls/ThemeComponentSelectionControl.xaml.cs b/Filtration/UserControls/ThemeComponentSelectionControl.xaml.cs
index e8a3139..7274056 100644
--- a/Filtration/UserControls/ThemeComponentSelectionControl.xaml.cs
+++ b/Filtration/UserControls/ThemeComponentSelectionControl.xaml.cs
@@ -1,10 +1,8 @@
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Windows;
 using Filtration.Annotations;
-using Filtration.ObjectModel.Enums;
 using Filtration.ObjectModel.ThemeEditor;
 using GalaSoft.MvvmLight.CommandWpf;
 
diff --git a/Filtration/Utilities/BlockGroupMapper.cs b/Filtration/Utilities/BlockGroupMapper.cs
index 3091b8b..267f376 100644
--- a/Filtration/Utilities/BlockGroupMapper.cs
+++ b/Filtration/Utilities/BlockGroupMapper.cs
@@ -1,6 +1,5 @@
 using System.Collections.ObjectModel;
 using System.Linq;
-using System.Net.Mime;
 using AutoMapper;
 using Filtration.ObjectModel;
 using Filtration.ViewModels;
diff --git a/Filtration/Views/MainWindow.xaml b/Filtration/Views/MainWindow.xaml
index e71218d..e0e3f27 100644
--- a/Filtration/Views/MainWindow.xaml
+++ b/Filtration/Views/MainWindow.xaml
@@ -8,7 +8,6 @@
         xmlns:viewModels="clr-namespace:Filtration.ViewModels"
         xmlns:viewsAvalonDock="clr-namespace:Filtration.Views.AvalonDock"
         xmlns:views="clr-namespace:Filtration.Views"
-        xmlns:commonConverters="clr-namespace:Filtration.Common.Converters;assembly=Filtration.Common"
         mc:Ignorable="d"
         d:DataContext="{d:DesignInstance Type=viewModels:MainWindowViewModel}"
         Title="{Binding WindowTitle}" Height="768" Width="1100" BorderThickness="1" BorderBrush="Black" IsIconVisible="True" >
@@ -16,9 +15,6 @@
         <KeyBinding Command="{Binding SaveCommand}" Modifiers="Control" Key="S" />
         <KeyBinding Command="{Binding OpenScriptCommand}" Modifiers="Control" Key="O" />
     </fluent:RibbonWindow.InputBindings>
-    <fluent:RibbonWindow.Resources>
-        <commonConverters:BooleanVisibilityConverter x:Key="BooleanVisibilityConverter" />
-    </fluent:RibbonWindow.Resources>
     <DockPanel x:Name="RootDockPanel">
         <fluent:Ribbon DockPanel.Dock="Top" x:Name="RibbonRoot">
             <fluent:Ribbon.Menu>
diff --git a/Filtration/Views/UpdateAvailableView.xaml.cs b/Filtration/Views/UpdateAvailableView.xaml.cs
index 23004c7..4274251 100644
--- a/Filtration/Views/UpdateAvailableView.xaml.cs
+++ b/Filtration/Views/UpdateAvailableView.xaml.cs
@@ -1,23 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
-
-namespace Filtration.Views
+namespace Filtration.Views
 {
-    /// <summary>
-    /// Interaction logic for UpdateAvailableView.xaml
-    /// </summary>
-    public partial class UpdateAvailableView : Window
+    public partial class UpdateAvailableView
     {
         public UpdateAvailableView()
         {