diff --git a/MaterialModernWPF/App.xaml b/MaterialModernWPF/App.xaml
index 8624815..6cb4758 100644
--- a/MaterialModernWPF/App.xaml
+++ b/MaterialModernWPF/App.xaml
@@ -1,9 +1,8 @@
-<prism:PrismApplication x:Class="MaterialModernWPF.App"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:MaterialModernWPF"
-             xmlns:dragablz="http://dragablz.net/winfx/xaml/dragablz"
-             xmlns:prism="http://prismlibrary.com/">
+<prism:PrismApplication
+    x:Class="MaterialModernWPF.App"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:prism="http://prismlibrary.com/">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
diff --git a/MaterialModernWPF/Module/MainView.xaml.cs b/MaterialModernWPF/Module/MainView.xaml.cs
index 5b5c512..cebf07a 100644
--- a/MaterialModernWPF/Module/MainView.xaml.cs
+++ b/MaterialModernWPF/Module/MainView.xaml.cs
@@ -1,24 +1,9 @@
-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.Navigation;
-using System.Windows.Shapes;
-
-namespace MaterialModernWPF.Module
+namespace MaterialModernWPF.Module
 {
     /// <summary>
     /// Interaktionslogik für MainView.xaml
     /// </summary>
-    public partial class MainView : UserControl
+    public partial class MainView
     {
         public MainView()
         {
diff --git a/MaterialModernWPF/Module/MainViewModel.cs b/MaterialModernWPF/Module/MainViewModel.cs
index d92e84c..73d13fd 100644
--- a/MaterialModernWPF/Module/MainViewModel.cs
+++ b/MaterialModernWPF/Module/MainViewModel.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using DryIoc;
 using MaterialModernWPF.Service;
 
 namespace MaterialModernWPF.Module
diff --git a/MaterialModernWPF/Properties/AssemblyInfo.cs b/MaterialModernWPF/Properties/AssemblyInfo.cs
index ab423ad..ad9cb45 100644
--- a/MaterialModernWPF/Properties/AssemblyInfo.cs
+++ b/MaterialModernWPF/Properties/AssemblyInfo.cs
@@ -1,6 +1,4 @@
 using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Windows;
 
diff --git a/MaterialModernWPF/Service/DetailedGeometryView.xaml.cs b/MaterialModernWPF/Service/DetailedGeometryView.xaml.cs
index dfef822..97b6906 100644
--- a/MaterialModernWPF/Service/DetailedGeometryView.xaml.cs
+++ b/MaterialModernWPF/Service/DetailedGeometryView.xaml.cs
@@ -1,24 +1,9 @@
-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.Navigation;
-using System.Windows.Shapes;
-
-namespace MaterialModernWPF.Service
+namespace MaterialModernWPF.Service
 {
     /// <summary>
     /// Interaktionslogik für DetailedGeometryView.xaml
     /// </summary>
-    public partial class DetailedGeometryView : CalculationView
+    public partial class DetailedGeometryView
     {
         public DetailedGeometryView()
         {
diff --git a/MaterialModernWPF/View/InfoDialog.xaml b/MaterialModernWPF/View/InfoDialog.xaml
index 25ae071..9750e12 100644
--- a/MaterialModernWPF/View/InfoDialog.xaml
+++ b/MaterialModernWPF/View/InfoDialog.xaml
@@ -2,7 +2,6 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:local="clr-namespace:MaterialModernWPF"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:system="clr-namespace:System;assembly=mscorlib"