diff --git a/src/PostIt/PostIt/Settings/Settings.cs b/src/PostIt/PostIt/Settings/Settings.cs
index e6cc6fef..3cb40e38 100644
--- a/src/PostIt/PostIt/Settings/Settings.cs
+++ b/src/PostIt/PostIt/Settings/Settings.cs
@@ -1,7 +1,4 @@
 using System.Runtime.CompilerServices;
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Platform.Storage;
 using CommunityToolkit.Mvvm.ComponentModel;
 using IdentityModel.OidcClient;
 using Microsoft.Extensions.DependencyInjection;
@@ -18,7 +15,6 @@ namespace PostIt;
 public partial class Settings : ObservableObject
 {
     const string SettingsFileName = "postit-settings.json";
-    IStorageFolder? folder = null;
 
     /// <summary>
     /// Legacy loopback redirect URI. The post-2026.6 production flow
diff --git a/src/PostIt/PostIt/ViewLocator.cs b/src/PostIt/PostIt/ViewLocator.cs
index ba34bf7c..983cf13c 100644
--- a/src/PostIt/PostIt/ViewLocator.cs
+++ b/src/PostIt/PostIt/ViewLocator.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics.CodeAnalysis;
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
 using Microsoft.Extensions.DependencyInjection;
@@ -21,7 +20,7 @@ public class ViewLocator : IDataTemplate
         _services = services;
     }
 
-    public Control Build(object data)
+    public Control Build(object? data)
     {
         return data switch
         {
@@ -29,9 +28,10 @@ public class ViewLocator : IDataTemplate
             SettingsPageViewModel => _services.GetRequiredService<SettingsPage>(),
             HomePageViewModel => _services.GetRequiredService<HomePage>(),
             SignaturePageViewModel => _services.GetRequiredService<SignaturePage>(),
+            null => new TextBlock { Text = "No view for <null>" },
         _ => new TextBlock { Text = $"No view for {data.GetType().Name}" }
         };
     }
 
-    public bool Match(object data) => data is ViewModelBase;
+    public bool Match(object? data) => data is ViewModelBase;
 }