diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/Language.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/Language.cs
deleted file mode 100644
index 1b60b8a..0000000
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/Language.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-// 2025/6/23 by Zhe Fang
-
-namespace BetterLyrics.WinUI3.Enums
-{
-    public enum Language
-    {
-        FollowSystem,
-        English,
-        SimplifiedChinese,
-        TraditionalChinese,
-        Japanese,
-        Korean,
-    }
-}
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LocalSearchTargetProps.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LocalSearchTargetProps.cs
deleted file mode 100644
index 920027a..0000000
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LocalSearchTargetProps.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-// 2025/6/23 by Zhe Fang
-
-namespace BetterLyrics.WinUI3.Enums
-{
-    public enum LocalSearchTargetProps
-    {
-        LyricsOnly,
-        LyricsAndAlbumArt,
-    }
-}
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/SettingsStoreType.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/SettingsStoreType.cs
deleted file mode 100644
index 5cdb7dd..0000000
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/SettingsStoreType.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace BetterLyrics.WinUI3.Enums
-{
-    public enum SettingsStoreType
-    {
-        Container,
-        JSON
-    }
-}
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/ShortcutID.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/ShortcutID.cs
index 69cf9e3..099a978 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/ShortcutID.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/ShortcutID.cs
@@ -1,6 +1,6 @@
 namespace BetterLyrics.WinUI3.Enums
 {
-    public enum ShortcutID
+    public enum ShortcutId
     {
         LyricsWindowShowOrHide,
         LyricsWindowSwitch,
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/AlbumArtChangedEventArgs.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/AlbumArtChangedEventArgs.cs
deleted file mode 100644
index cd7d20f..0000000
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/AlbumArtChangedEventArgs.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Windows.Graphics.Imaging;
-using Windows.UI;
-
-namespace BetterLyrics.WinUI3.Events
-{
-    public class AlbumArtChangedEventArgs(SoftwareBitmap? albumArtSwBitmap, List<Color> albumArtLightAccentColors, List<Color> albumArtDarkAccentColors) : EventArgs
-    {
-        public SoftwareBitmap? AlbumArtSwBitmap { get; set; } = albumArtSwBitmap;
-        public List<Color> AlbumArtLightAccentColors { get; set; } = albumArtLightAccentColors;
-        public List<Color> AlbumArtDarkAccentColors { get; set; } = albumArtDarkAccentColors;
-    }
-}
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/LibChangedEventArgs.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/LibChangedEventArgs.cs
deleted file mode 100644
index dbddb56..0000000
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/LibChangedEventArgs.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-// 2025/6/23 by Zhe Fang
-
-using System;
-using System.IO;
-
-namespace BetterLyrics.WinUI3.Events
-{
-    public class LibChangedEventArgs(string folder, string filePath, WatcherChangeTypes changeType) : EventArgs
-    {
-        public WatcherChangeTypes ChangeType { get; } = changeType;
-        public string FilePath { get; } = filePath;
-        public string Folder { get; } = folder;
-    }
-}
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/LyricsChangedEventArgs.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/LyricsChangedEventArgs.cs
deleted file mode 100644
index 1bc310e..0000000
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/LyricsChangedEventArgs.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using BetterLyrics.WinUI3.Models.Lyrics;
-using System;
-
-namespace BetterLyrics.WinUI3.Events
-{
-    public class LyricsChangedEventArgs(LyricsData? lyricsData) : EventArgs
-    {
-        public LyricsData? LyricsData { get; } = lyricsData;
-    }
-}
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/MediaSourceProvidersInfoEventArgs.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/MediaSourceProvidersInfoEventArgs.cs
deleted file mode 100644
index 52ad60f..0000000
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/MediaSourceProvidersInfoEventArgs.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using BetterLyrics.WinUI3.Models.Settings;
-using System;
-using System.Collections.Generic;
-
-namespace BetterLyrics.WinUI3.Events
-{
-    public class MediaSourceProvidersInfoEventArgs(List<MediaSourceProviderInfo> sessionIds) : EventArgs
-    {
-        public List<MediaSourceProviderInfo> MediaSourceProviersInfo { get; set; } = sessionIds;
-    }
-}
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/GlobalHotKeyHook.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/GlobalHotKeyHook.cs
index 7b91e63..cbfedc6 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/GlobalHotKeyHook.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/GlobalHotKeyHook.cs
@@ -20,7 +20,7 @@ namespace BetterLyrics.WinUI3.Hooks
         /// <param name="id"></param>
         /// <param name="keys"></param>
         /// <param name="action"></param>
-        private static void RegisterHotKey(Window window, ShortcutID id, List<string> keys, Action action)
+        private static void RegisterHotKey(Window window, ShortcutId id, List<string> keys, Action action)
         {
             if (keys.Count == 0) return;
 
@@ -58,7 +58,7 @@ namespace BetterLyrics.WinUI3.Hooks
             }
         }
 
-        private static void UnregisterHotKey(Window window, ShortcutID id)
+        private static void UnregisterHotKey(Window window, ShortcutId id)
         {
             HWND hwnd = WindowNative.GetWindowHandle(window);
             User32.UnregisterHotKey(hwnd, (int)id);
@@ -66,13 +66,13 @@ namespace BetterLyrics.WinUI3.Hooks
             _keys.Remove((int)id);
         }
 
-        public static void UpdateHotKey(Window window, ShortcutID id, List<string> keys, Action action)
+        public static void UpdateHotKey(Window window, ShortcutId id, List<string> keys, Action action)
         {
             UnregisterHotKey(window, id);
             RegisterHotKey(window, id, keys, action);
         }
 
-        public static bool IsHotKeyRegistered(ShortcutID id)
+        public static bool IsHotKeyRegistered(ShortcutId id)
         {
             return _actions.ContainsKey((int)id);
         }
@@ -82,7 +82,7 @@ namespace BetterLyrics.WinUI3.Hooks
             return _keys.ContainsValue(keys);
         }
 
-        public static bool TryInvokeAction(ShortcutID id)
+        public static bool TryInvokeAction(ShortcutId id)
         {
             return TryInvokeAction((int)id);
         }
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/PlaybackSettingsControlViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/PlaybackSettingsControlViewModel.cs
index 29caeb9..a182d7f 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/PlaybackSettingsControlViewModel.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/PlaybackSettingsControlViewModel.cs
@@ -96,11 +96,6 @@ namespace BetterLyrics.WinUI3.ViewModels
             LastFMUser = e.User;
         }
 
-        private void MediaSessionsService_SessionIdsChanged(object? sender, Events.MediaSourceProvidersInfoEventArgs e)
-        {
-            SelectedMediaSourceProvider = AppSettings.MediaSourceProvidersInfo.FirstOrDefault();
-        }
-
         [RelayCommand]
         private void LibreTranslateServerTest()
         {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/SystemTrayWindow.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/SystemTrayWindow.xaml.cs
index 7f4a3c2..8136f39 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/SystemTrayWindow.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/SystemTrayWindow.xaml.cs
@@ -79,7 +79,7 @@ public sealed partial class SystemTrayWindow : Window, IRecipient<PropertyChange
 
     private void UpdateLyricsWindowSwitchShortcut()
     {
-        GlobalHotKeyHook.UpdateHotKey(this, ShortcutID.LyricsWindowSwitch,
+        GlobalHotKeyHook.UpdateHotKey(this, ShortcutId.LyricsWindowSwitch,
             _settingsService.AppSettings.GeneralSettings.LyricsWindowSwitchShortcut,
             () =>
             {
@@ -90,7 +90,7 @@ public sealed partial class SystemTrayWindow : Window, IRecipient<PropertyChange
 
     private void UpdatePlayOrPauseSongShortcut()
     {
-        GlobalHotKeyHook.UpdateHotKey(this, ShortcutID.PlayOrPauseSong, _settingsService.AppSettings.GeneralSettings.PlayOrPauseShortcut, (() =>
+        GlobalHotKeyHook.UpdateHotKey(this, ShortcutId.PlayOrPauseSong, _settingsService.AppSettings.GeneralSettings.PlayOrPauseShortcut, (() =>
         {
             if (_gsmtcService.CurrentIsPlaying)
             {
@@ -105,7 +105,7 @@ public sealed partial class SystemTrayWindow : Window, IRecipient<PropertyChange
 
     private void UpdatePreviousSongShortcut()
     {
-        GlobalHotKeyHook.UpdateHotKey(this, ShortcutID.PreviousSong, _settingsService.AppSettings.GeneralSettings.PreviousSongShortcut, () =>
+        GlobalHotKeyHook.UpdateHotKey(this, ShortcutId.PreviousSong, _settingsService.AppSettings.GeneralSettings.PreviousSongShortcut, () =>
         {
             _ = _gsmtcService.PreviousAsync();
         });
@@ -113,7 +113,7 @@ public sealed partial class SystemTrayWindow : Window, IRecipient<PropertyChange
 
     private void UpdateNextSongShortcut()
     {
-        GlobalHotKeyHook.UpdateHotKey(this, ShortcutID.NextSong, _settingsService.AppSettings.GeneralSettings.NextSongShortcut, () =>
+        GlobalHotKeyHook.UpdateHotKey(this, ShortcutId.NextSong, _settingsService.AppSettings.GeneralSettings.NextSongShortcut, () =>
         {
             _ = _gsmtcService.NextAsync();
         });
@@ -121,7 +121,7 @@ public sealed partial class SystemTrayWindow : Window, IRecipient<PropertyChange
 
     private void UpdateLyricsWindowShowHideShortcut()
     {
-        GlobalHotKeyHook.UpdateHotKey(this, ShortcutID.LyricsWindowShowOrHide,
+        GlobalHotKeyHook.UpdateHotKey(this, ShortcutId.LyricsWindowShowOrHide,
             _settingsService.AppSettings.GeneralSettings.ShowOrHideLyricsWindowShortcut,
             () =>
             {