diff --git a/Avalonia.Templates.csproj b/Avalonia.Templates.csproj
index 6933c111..7787ae40 100644
--- a/Avalonia.Templates.csproj
+++ b/Avalonia.Templates.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <PackageType>Template</PackageType>
-    <PackageVersion>0.10.12</PackageVersion>
+    <PackageVersion>0.10.12.1</PackageVersion>
     <PackageId>Avalonia.Templates</PackageId>
     <Title>Avalonia Templates</Title>
     <Description>Templates for creating Avalonia applications and libraries.</Description>
diff --git a/templates/csharp/app-mvvm/Views/MainWindow.axaml.cs b/templates/csharp/app-mvvm/Views/MainWindow.axaml.cs
index 5d2faaf1..923b1ec6 100644
--- a/templates/csharp/app-mvvm/Views/MainWindow.axaml.cs
+++ b/templates/csharp/app-mvvm/Views/MainWindow.axaml.cs
@@ -1,6 +1,4 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace AvaloniaAppTemplate.Views
 {
@@ -9,16 +7,6 @@ public partial class MainWindow : Window
         public MainWindow()
         {
             InitializeComponent();
-//-:cnd:noEmit
-#if DEBUG
-            this.AttachDevTools();
-#endif
-//+:cnd:noEmit
-        }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
         }
     }
 }
\ No newline at end of file
diff --git a/templates/csharp/app/MainWindow.axaml.cs b/templates/csharp/app/MainWindow.axaml.cs
index 2b3641bb..4c6ef668 100644
--- a/templates/csharp/app/MainWindow.axaml.cs
+++ b/templates/csharp/app/MainWindow.axaml.cs
@@ -1,6 +1,4 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace AvaloniaAppTemplate
 {
@@ -9,16 +7,6 @@ public partial class MainWindow : Window
         public MainWindow()
         {
             InitializeComponent();
-//-:cnd:noEmit
-#if DEBUG
-            this.AttachDevTools();
-#endif
-//+:cnd:noEmit
-        }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
         }
     }
 }
\ No newline at end of file
diff --git a/templates/csharp/xplat/AvaloniaTest/Views/MainView.axaml.cs b/templates/csharp/xplat/AvaloniaTest/Views/MainView.axaml.cs
index 2e562138..5ebe97c7 100644
--- a/templates/csharp/xplat/AvaloniaTest/Views/MainView.axaml.cs
+++ b/templates/csharp/xplat/AvaloniaTest/Views/MainView.axaml.cs
@@ -1,6 +1,4 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace AvaloniaTest.Views
 {
@@ -10,10 +8,5 @@ public MainView()
         {
             InitializeComponent();
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
\ No newline at end of file
diff --git a/templates/csharp/xplat/AvaloniaTest/Views/MainWindow.axaml.cs b/templates/csharp/xplat/AvaloniaTest/Views/MainWindow.axaml.cs
index be0b6a10..96735c57 100644
--- a/templates/csharp/xplat/AvaloniaTest/Views/MainWindow.axaml.cs
+++ b/templates/csharp/xplat/AvaloniaTest/Views/MainWindow.axaml.cs
@@ -1,6 +1,4 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace AvaloniaTest.Views
 {
@@ -9,14 +7,6 @@ public partial class MainWindow : Window
         public MainWindow()
         {
             InitializeComponent();
-#if DEBUG
-            this.AttachDevTools();
-#endif
-        }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
         }
     }
 }
\ No newline at end of file