diff --git a/Aaru.Gui/Views/Dialogs/About.xaml.cs b/Aaru.Gui/Views/Dialogs/About.xaml.cs
index f64d358cd..ad2309c0c 100644
--- a/Aaru.Gui/Views/Dialogs/About.xaml.cs
+++ b/Aaru.Gui/Views/Dialogs/About.xaml.cs
@@ -41,9 +41,6 @@ public sealed class About : Window
     public About()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     void InitializeComponent() => AvaloniaXamlLoader.Load(this);
diff --git a/Aaru.Gui/Views/Dialogs/Console.xaml.cs b/Aaru.Gui/Views/Dialogs/Console.xaml.cs
index 002e5bde3..c9c5f291c 100644
--- a/Aaru.Gui/Views/Dialogs/Console.xaml.cs
+++ b/Aaru.Gui/Views/Dialogs/Console.xaml.cs
@@ -41,9 +41,6 @@ public sealed class Console : Window
     public Console()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     void InitializeComponent() => AvaloniaXamlLoader.Load(this);
diff --git a/Aaru.Gui/Views/Dialogs/Encodings.xaml.cs b/Aaru.Gui/Views/Dialogs/Encodings.xaml.cs
index 9a969a6df..f95c3d4b0 100644
--- a/Aaru.Gui/Views/Dialogs/Encodings.xaml.cs
+++ b/Aaru.Gui/Views/Dialogs/Encodings.xaml.cs
@@ -41,9 +41,6 @@ public sealed class Encodings : Window
     public Encodings()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     void InitializeComponent() => AvaloniaXamlLoader.Load(this);
diff --git a/Aaru.Gui/Views/Dialogs/LicenseDialog.xaml.cs b/Aaru.Gui/Views/Dialogs/LicenseDialog.xaml.cs
index c4a467e6e..f70386c4f 100644
--- a/Aaru.Gui/Views/Dialogs/LicenseDialog.xaml.cs
+++ b/Aaru.Gui/Views/Dialogs/LicenseDialog.xaml.cs
@@ -41,9 +41,6 @@ public sealed class LicenseDialog : Window
     public LicenseDialog()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     void InitializeComponent() => AvaloniaXamlLoader.Load(this);
diff --git a/Aaru.Gui/Views/Dialogs/PluginsDialog.xaml.cs b/Aaru.Gui/Views/Dialogs/PluginsDialog.xaml.cs
index 5ea6e86e7..80e579b76 100644
--- a/Aaru.Gui/Views/Dialogs/PluginsDialog.xaml.cs
+++ b/Aaru.Gui/Views/Dialogs/PluginsDialog.xaml.cs
@@ -41,9 +41,6 @@ public sealed class PluginsDialog : Window
     public PluginsDialog()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     void InitializeComponent() => AvaloniaXamlLoader.Load(this);
diff --git a/Aaru.Gui/Views/Dialogs/SettingsDialog.xaml.cs b/Aaru.Gui/Views/Dialogs/SettingsDialog.xaml.cs
index d0b686dda..f0e51dafe 100644
--- a/Aaru.Gui/Views/Dialogs/SettingsDialog.xaml.cs
+++ b/Aaru.Gui/Views/Dialogs/SettingsDialog.xaml.cs
@@ -41,9 +41,6 @@ public sealed class SettingsDialog : Window
     public SettingsDialog()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     void InitializeComponent() => AvaloniaXamlLoader.Load(this);
diff --git a/Aaru.Gui/Views/Dialogs/StatisticsDialog.xaml.cs b/Aaru.Gui/Views/Dialogs/StatisticsDialog.xaml.cs
index 17446d26b..9ec51b3cc 100644
--- a/Aaru.Gui/Views/Dialogs/StatisticsDialog.xaml.cs
+++ b/Aaru.Gui/Views/Dialogs/StatisticsDialog.xaml.cs
@@ -41,9 +41,6 @@ public sealed class StatisticsDialog : Window
     public StatisticsDialog()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     void InitializeComponent() => AvaloniaXamlLoader.Load(this);
diff --git a/Aaru.Gui/Views/Windows/DecodeMediaTags.xaml.cs b/Aaru.Gui/Views/Windows/DecodeMediaTags.xaml.cs
index 65fd6dfbd..9831b856f 100644
--- a/Aaru.Gui/Views/Windows/DecodeMediaTags.xaml.cs
+++ b/Aaru.Gui/Views/Windows/DecodeMediaTags.xaml.cs
@@ -41,9 +41,6 @@ public sealed class DecodeMediaTags : Window
     public DecodeMediaTags()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     void InitializeComponent() => AvaloniaXamlLoader.Load(this);
diff --git a/Aaru.Gui/Views/Windows/DeviceList.axaml.cs b/Aaru.Gui/Views/Windows/DeviceList.axaml.cs
index a670be497..260311084 100644
--- a/Aaru.Gui/Views/Windows/DeviceList.axaml.cs
+++ b/Aaru.Gui/Views/Windows/DeviceList.axaml.cs
@@ -42,9 +42,6 @@ public partial class DeviceList : Window
     public DeviceList()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     /// <inheritdoc />
diff --git a/Aaru.Gui/Views/Windows/DeviceView.axaml.cs b/Aaru.Gui/Views/Windows/DeviceView.axaml.cs
index 54c1bf9b5..76bce878e 100644
--- a/Aaru.Gui/Views/Windows/DeviceView.axaml.cs
+++ b/Aaru.Gui/Views/Windows/DeviceView.axaml.cs
@@ -42,9 +42,6 @@ public partial class DeviceView : Window
     public DeviceView()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     /// <inheritdoc />
diff --git a/Aaru.Gui/Views/Windows/IbgLogView.axaml.cs b/Aaru.Gui/Views/Windows/IbgLogView.axaml.cs
index 9d69044c2..b0c5ba91e 100644
--- a/Aaru.Gui/Views/Windows/IbgLogView.axaml.cs
+++ b/Aaru.Gui/Views/Windows/IbgLogView.axaml.cs
@@ -42,9 +42,6 @@ public partial class IbgLogView : Window
     public IbgLogView()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     /// <inheritdoc />
diff --git a/Aaru.Gui/Views/Windows/ImageChecksum.xaml.cs b/Aaru.Gui/Views/Windows/ImageChecksum.xaml.cs
index 54a7f3b2a..875a86e1b 100644
--- a/Aaru.Gui/Views/Windows/ImageChecksum.xaml.cs
+++ b/Aaru.Gui/Views/Windows/ImageChecksum.xaml.cs
@@ -42,9 +42,6 @@ public sealed class ImageChecksum : Window
     public ImageChecksum()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     void InitializeComponent() => AvaloniaXamlLoader.Load(this);
diff --git a/Aaru.Gui/Views/Windows/ImageConvert.xaml.cs b/Aaru.Gui/Views/Windows/ImageConvert.xaml.cs
index 5d8b472f3..18ccc1f1e 100644
--- a/Aaru.Gui/Views/Windows/ImageConvert.xaml.cs
+++ b/Aaru.Gui/Views/Windows/ImageConvert.xaml.cs
@@ -42,9 +42,6 @@ public sealed class ImageConvert : Window
     public ImageConvert()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     void InitializeComponent() => AvaloniaXamlLoader.Load(this);
diff --git a/Aaru.Gui/Views/Windows/ImageEntropy.xaml.cs b/Aaru.Gui/Views/Windows/ImageEntropy.xaml.cs
index 55a856521..983e419c1 100644
--- a/Aaru.Gui/Views/Windows/ImageEntropy.xaml.cs
+++ b/Aaru.Gui/Views/Windows/ImageEntropy.xaml.cs
@@ -42,9 +42,6 @@ public sealed class ImageEntropy : Window
     public ImageEntropy()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     void InitializeComponent() => AvaloniaXamlLoader.Load(this);
diff --git a/Aaru.Gui/Views/Windows/ImageSidecar.xaml.cs b/Aaru.Gui/Views/Windows/ImageSidecar.xaml.cs
index f808180db..50bb76727 100644
--- a/Aaru.Gui/Views/Windows/ImageSidecar.xaml.cs
+++ b/Aaru.Gui/Views/Windows/ImageSidecar.xaml.cs
@@ -41,9 +41,6 @@ public sealed class ImageSidecar : Window
     public ImageSidecar()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     void InitializeComponent() => AvaloniaXamlLoader.Load(this);
diff --git a/Aaru.Gui/Views/Windows/ImageVerify.xaml.cs b/Aaru.Gui/Views/Windows/ImageVerify.xaml.cs
index ade6a063a..6cea570dc 100644
--- a/Aaru.Gui/Views/Windows/ImageVerify.xaml.cs
+++ b/Aaru.Gui/Views/Windows/ImageVerify.xaml.cs
@@ -42,9 +42,6 @@ public sealed class ImageVerify : Window
     public ImageVerify()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     void InitializeComponent() => AvaloniaXamlLoader.Load(this);
diff --git a/Aaru.Gui/Views/Windows/MediaDump.xaml.cs b/Aaru.Gui/Views/Windows/MediaDump.xaml.cs
index ac2969cc3..e559bbb13 100644
--- a/Aaru.Gui/Views/Windows/MediaDump.xaml.cs
+++ b/Aaru.Gui/Views/Windows/MediaDump.xaml.cs
@@ -42,9 +42,6 @@ public sealed class MediaDump : Window
     public MediaDump()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     void InitializeComponent() => AvaloniaXamlLoader.Load(this);
diff --git a/Aaru.Gui/Views/Windows/MediaScan.xaml.cs b/Aaru.Gui/Views/Windows/MediaScan.xaml.cs
index fea4a9f22..f20191ed3 100644
--- a/Aaru.Gui/Views/Windows/MediaScan.xaml.cs
+++ b/Aaru.Gui/Views/Windows/MediaScan.xaml.cs
@@ -42,9 +42,6 @@ public sealed class MediaScan : Window
     public MediaScan()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     void InitializeComponent() => AvaloniaXamlLoader.Load(this);
diff --git a/Aaru.Gui/Views/Windows/MhddLogView.axaml.cs b/Aaru.Gui/Views/Windows/MhddLogView.axaml.cs
index 2328c02fd..8d9e9d840 100644
--- a/Aaru.Gui/Views/Windows/MhddLogView.axaml.cs
+++ b/Aaru.Gui/Views/Windows/MhddLogView.axaml.cs
@@ -42,9 +42,6 @@ public partial class MhddLogView : Window
     public MhddLogView()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     /// <inheritdoc />
diff --git a/Aaru.Gui/Views/Windows/SplashWindow.xaml.cs b/Aaru.Gui/Views/Windows/SplashWindow.xaml.cs
index 09f1a2cf8..eb906bc50 100644
--- a/Aaru.Gui/Views/Windows/SplashWindow.xaml.cs
+++ b/Aaru.Gui/Views/Windows/SplashWindow.xaml.cs
@@ -43,9 +43,6 @@ public sealed class SplashWindow : Window
     public SplashWindow()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     void InitializeComponent() => AvaloniaXamlLoader.Load(this);
diff --git a/Aaru.Gui/Views/Windows/ViewSector.xaml.cs b/Aaru.Gui/Views/Windows/ViewSector.xaml.cs
index 0a8d9ecca..273a24ec3 100644
--- a/Aaru.Gui/Views/Windows/ViewSector.xaml.cs
+++ b/Aaru.Gui/Views/Windows/ViewSector.xaml.cs
@@ -41,9 +41,6 @@ public sealed class ViewSector : Window
     public ViewSector()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
     }
 
     void InitializeComponent() => AvaloniaXamlLoader.Load(this);