diff --git a/Source/HangoverAvalonia/Controls/CheckedListBox.axaml.cs b/Source/HangoverAvalonia/Controls/CheckedListBox.axaml.cs
index 79f899e8..bdcfcf61 100644
--- a/Source/HangoverAvalonia/Controls/CheckedListBox.axaml.cs
+++ b/Source/HangoverAvalonia/Controls/CheckedListBox.axaml.cs
@@ -1,9 +1,7 @@
 using Avalonia;
 using Avalonia.Collections;
 using Avalonia.Controls;
-using DataLayer;
 using HangoverAvalonia.ViewModels;
-using NPOI.XSSF.Streaming.Properties;
 using ReactiveUI;
 using System;
 using System.Collections;
diff --git a/Source/HangoverAvalonia/Program.cs b/Source/HangoverAvalonia/Program.cs
index 426b6853..037d6c57 100644
--- a/Source/HangoverAvalonia/Program.cs
+++ b/Source/HangoverAvalonia/Program.cs
@@ -1,5 +1,4 @@
 using Avalonia;
-using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.ReactiveUI;
 using System;
 
diff --git a/Source/HangoverAvalonia/ViewModels/MainVM.Database.cs b/Source/HangoverAvalonia/ViewModels/MainVM.Database.cs
index 070a96fa..0e11d5b4 100644
--- a/Source/HangoverAvalonia/ViewModels/MainVM.Database.cs
+++ b/Source/HangoverAvalonia/ViewModels/MainVM.Database.cs
@@ -1,7 +1,5 @@
 using HangoverBase;
 using ReactiveUI;
-using System;
-using System.Linq;
 
 namespace HangoverAvalonia.ViewModels
 {
diff --git a/Source/HangoverAvalonia/ViewModels/MainVM.Deleted.cs b/Source/HangoverAvalonia/ViewModels/MainVM.Deleted.cs
index 482c98a1..2c376fd7 100644
--- a/Source/HangoverAvalonia/ViewModels/MainVM.Deleted.cs
+++ b/Source/HangoverAvalonia/ViewModels/MainVM.Deleted.cs
@@ -1,9 +1,7 @@
 using ApplicationServices;
 using DataLayer;
 using ReactiveUI;
-using System;
 using System.Collections.Generic;
-using System.Linq;
 
 namespace HangoverAvalonia.ViewModels
 {
diff --git a/Source/HangoverAvalonia/ViewModels/MainVM.cs b/Source/HangoverAvalonia/ViewModels/MainVM.cs
index 9cc1fea6..340f4a15 100644
--- a/Source/HangoverAvalonia/ViewModels/MainVM.cs
+++ b/Source/HangoverAvalonia/ViewModels/MainVM.cs
@@ -1,18 +1,11 @@
-using System;
-using ApplicationServices;
-using DataLayer;
-using System.Collections.Generic;
-using HangoverBase;
-using ReactiveUI;
-
 namespace HangoverAvalonia.ViewModels
 {
 	public partial class MainVM : ViewModelBase
-    {
-        public MainVM()
-        {
+	{
+		public MainVM()
+		{
 			Load_databaseVM();
-            Load_deletedVM();
-        }
+			Load_deletedVM();
+		}
 	}
 }
diff --git a/Source/HangoverAvalonia/ViewModels/ViewModelBase.cs b/Source/HangoverAvalonia/ViewModels/ViewModelBase.cs
index 50908ee3..7425a30b 100644
--- a/Source/HangoverAvalonia/ViewModels/ViewModelBase.cs
+++ b/Source/HangoverAvalonia/ViewModels/ViewModelBase.cs
@@ -1,7 +1,4 @@
 using ReactiveUI;
-using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace HangoverAvalonia.ViewModels
 {
diff --git a/Source/HangoverAvalonia/Views/MainWindow.CLI.cs b/Source/HangoverAvalonia/Views/MainWindow.CLI.cs
index 6002bb80..116297f8 100644
--- a/Source/HangoverAvalonia/Views/MainWindow.CLI.cs
+++ b/Source/HangoverAvalonia/Views/MainWindow.CLI.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace HangoverAvalonia.Views
+namespace HangoverAvalonia.Views
 {
 	public partial class MainWindow
 	{
diff --git a/Source/HangoverAvalonia/Views/MainWindow.Database.cs b/Source/HangoverAvalonia/Views/MainWindow.Database.cs
index 0a9e6ed4..88f10b4a 100644
--- a/Source/HangoverAvalonia/Views/MainWindow.Database.cs
+++ b/Source/HangoverAvalonia/Views/MainWindow.Database.cs
@@ -1,11 +1,4 @@
-using HangoverAvalonia.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace HangoverAvalonia.Views
+namespace HangoverAvalonia.Views
 {
 	public partial class MainWindow
 	{
diff --git a/Source/HangoverAvalonia/Views/MainWindow.Deleted.cs b/Source/HangoverAvalonia/Views/MainWindow.Deleted.cs
index aa352552..2c2341e4 100644
--- a/Source/HangoverAvalonia/Views/MainWindow.Deleted.cs
+++ b/Source/HangoverAvalonia/Views/MainWindow.Deleted.cs
@@ -1,7 +1,6 @@
 using ApplicationServices;
 using DataLayer;
 using HangoverAvalonia.Controls;
-using System;
 using System.Linq;
 
 namespace HangoverAvalonia.Views
diff --git a/Source/HangoverAvalonia/Views/MainWindow.axaml b/Source/HangoverAvalonia/Views/MainWindow.axaml
index d407fbc7..1b849ddf 100644
--- a/Source/HangoverAvalonia/Views/MainWindow.axaml
+++ b/Source/HangoverAvalonia/Views/MainWindow.axaml
@@ -30,44 +30,6 @@
 				<Setter Property="Padding" Value="20,5,20,5"/>
 			</Style>
 		</TabControl.Styles>
-
-		<!-- Deleted Books Tab -->
-		<TabItem Name="deletedTab">
-			<TabItem.Header>
-				<TextBlock FontSize="14" VerticalAlignment="Center">Deleted Books</TextBlock>
-			</TabItem.Header>
-
-			<Grid
-				RowDefinitions="Auto,*,Auto">
-				
-				<TextBlock
-					Grid.Row="0"
-					Margin="5"
-					Text="To restore deleted book, check box and save" />
-				
-				<controls:CheckedListBox
-					Grid.Row="1"
-					Margin="5,0,5,0"
-					BorderThickness="1"
-					BorderBrush="Gray"
-					Name="deletedCbl"
-					Items="{Binding DeletedBooks}" />
-				
-				<Grid
-					Grid.Row="2"
-					Margin="5"
-					ColumnDefinitions="Auto,Auto,Auto,*">
-					
-					<Button Grid.Column="0" Margin="0,0,20,0" Content="Check All" Click="Deleted_CheckAll_Click" />
-					<Button Grid.Column="1" Margin="0,0,20,0" Content="Uncheck All" Click="Deleted_UncheckAll_Click" />
-					<TextBlock Grid.Column="2" VerticalAlignment="Center" Text="{Binding CheckedCountText}" />
-					<Button Grid.Column="3" HorizontalAlignment="Right" Content="Save" Click="Deleted_Save_Click" />
-					
-				</Grid>
-			</Grid>
-
-
-		</TabItem>
 		
 		<!-- Database Tab -->
 		<TabItem Name="databaseTab">
@@ -106,6 +68,42 @@
 			
 		</TabItem>
 
+		<!-- Deleted Books Tab -->
+		<TabItem Name="deletedTab">
+			<TabItem.Header>
+				<TextBlock FontSize="14" VerticalAlignment="Center">Deleted Books</TextBlock>
+			</TabItem.Header>
+
+			<Grid
+				RowDefinitions="Auto,*,Auto">
+
+				<TextBlock
+					Grid.Row="0"
+					Margin="5"
+					Text="To restore deleted book, check box and save" />
+
+				<controls:CheckedListBox
+					Grid.Row="1"
+					Margin="5,0,5,0"
+					BorderThickness="1"
+					BorderBrush="Gray"
+					Name="deletedCbl"
+					Items="{Binding DeletedBooks}" />
+
+				<Grid
+					Grid.Row="2"
+					Margin="5"
+					ColumnDefinitions="Auto,Auto,Auto,*">
+
+					<Button Grid.Column="0" Margin="0,0,20,0" Content="Check All" Click="Deleted_CheckAll_Click" />
+					<Button Grid.Column="1" Margin="0,0,20,0" Content="Uncheck All" Click="Deleted_UncheckAll_Click" />
+					<TextBlock Grid.Column="2" VerticalAlignment="Center" Text="{Binding CheckedCountText}" />
+					<Button Grid.Column="3" HorizontalAlignment="Right" Content="Save" Click="Deleted_Save_Click" />
+
+				</Grid>
+			</Grid>
+		</TabItem>
+
 		<!-- Command Line Interface Tab -->
 		<TabItem Name="cliTab">
 			<TabItem.Header>
diff --git a/Source/HangoverAvalonia/Views/MainWindow.axaml.cs b/Source/HangoverAvalonia/Views/MainWindow.axaml.cs
index 3e514ee0..9fcfd1f9 100644
--- a/Source/HangoverAvalonia/Views/MainWindow.axaml.cs
+++ b/Source/HangoverAvalonia/Views/MainWindow.axaml.cs
@@ -1,8 +1,6 @@
 using AppScaffolding;
 using Avalonia.Controls;
 using HangoverAvalonia.ViewModels;
-using System;
-using System.Linq;
 
 namespace HangoverAvalonia.Views
 {