diff --git a/Flow.Launcher/Helper/HotKeyMapper.cs b/Flow.Launcher/Helper/HotKeyMapper.cs
index 614116c26..0132d335c 100644
--- a/Flow.Launcher/Helper/HotKeyMapper.cs
+++ b/Flow.Launcher/Helper/HotKeyMapper.cs
@@ -669,7 +669,7 @@ internal static class HotKeyMapper
                     pluginHotkey.Action == null) // Check action nullability
                     continue;
 
-                // TODO: Remove return to skip other commands & Organize main window hotkeys
+                // TODO: Remove return to skip other commands
                 if (pluginHotkey.Action.Invoke(selectedResult))
                     App.API.HideMainWindow();
             }
diff --git a/Flow.Launcher/HotkeyControlDialog.xaml.cs b/Flow.Launcher/HotkeyControlDialog.xaml.cs
index 1d42b20db..c7af8c5b8 100644
--- a/Flow.Launcher/HotkeyControlDialog.xaml.cs
+++ b/Flow.Launcher/HotkeyControlDialog.xaml.cs
@@ -137,7 +137,6 @@ public partial class HotkeyControlDialog : ContentDialog
         if (tbMsg == null)
             return;
 
-        // TODO: If we need to check !v.Hotkey.IsEmpty && for v.Hotkey?
         if (_hotkeySettings.RegisteredHotkeys.FirstOrDefault(v => v.Hotkey == hotkey) is { } registeredHotkeyData)
         {
             var description = string.Format(
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml.cs
index a21d4ae97..b99ea6e6d 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml.cs
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml.cs
@@ -54,7 +54,6 @@ public partial class SettingsPaneHotkey
             {
                 Title = metadata.Name,
                 Margin = new Thickness(0, 4, 0, 0),
-                // TODO: Support displaying plugin icon here
             };
             var hotkeyStackPanel = new StackPanel
             {