diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
deleted file mode 100644
index c3a0dc9..0000000
--- a/.config/dotnet-tools.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "version": 1,
-  "isRoot": true,
-  "tools": {
-    "xamlstyler.console": {
-      "version": "3.2008.4",
-      "commands": [
-        "xstyler"
-      ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/DiscordChatExporter.Gui/Behaviors/MultiSelectionListBoxBehavior.cs b/DiscordChatExporter.Gui/Behaviors/MultiSelectionListBoxBehavior.cs
index 4e593ee..bd4e9bd 100644
--- a/DiscordChatExporter.Gui/Behaviors/MultiSelectionListBoxBehavior.cs
+++ b/DiscordChatExporter.Gui/Behaviors/MultiSelectionListBoxBehavior.cs
@@ -53,7 +53,7 @@ namespace DiscordChatExporter.Gui.Behaviors
         }
 
         // Propagate selected items from view to model
-        private void OnListBoxSelectionChanged(object sender, SelectionChangedEventArgs args)
+        private void OnListBoxSelectionChanged(object? sender, SelectionChangedEventArgs args)
         {
             if (_viewHandled) return;
             if (AssociatedObject.Items.SourceCollection is null) return;
@@ -62,7 +62,7 @@ namespace DiscordChatExporter.Gui.Behaviors
         }
 
         // Re-select items when the set of items changes
-        private void OnListBoxItemsChanged(object sender, NotifyCollectionChangedEventArgs args)
+        private void OnListBoxItemsChanged(object? sender, NotifyCollectionChangedEventArgs args)
         {
             if (_viewHandled) return;
             if (AssociatedObject.Items.SourceCollection is null) return;
diff --git a/DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj b/DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj
index c5e05d4..f0389fe 100644
--- a/DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj
+++ b/DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj
@@ -33,9 +33,4 @@
     <ProjectReference Include="..\DiscordChatExporter.Core\DiscordChatExporter.Core.csproj" />
   </ItemGroup>
 
-  <Target Name="Format XAML" AfterTargets="BeforeBuild">
-    <Exec Command="dotnet tool restore" />
-    <Exec Command="dotnet xstyler -r -d $(MSBuildProjectDirectory)" />
-  </Target>
-
 </Project>
\ No newline at end of file