diff --git a/src/modules/keyboardmanager/KeyboardManagerEditor/KeyboardManagerEditor.cpp b/src/modules/keyboardmanager/KeyboardManagerEditor/KeyboardManagerEditor.cpp
index 21a39d9c11e8..0bbd19be61be 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEditor/KeyboardManagerEditor.cpp
+++ b/src/modules/keyboardmanager/KeyboardManagerEditor/KeyboardManagerEditor.cpp
@@ -77,11 +77,6 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance,
         type = static_cast<KeyboardManagerEditorType>(_wtoi(cmdArgs[1]));
     }
 
-    //while (true)
-    //{
-    //    std::this_thread::sleep_for(std::chrono::milliseconds(500));
-    //}
-
     std::wstring keysForShortcutToEdit = L"";
     std::wstring action = L"";
     
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/BufferValidationHelpers.cpp b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/BufferValidationHelpers.cpp
index 587d9ea9492a..b6e1144eddcb 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/BufferValidationHelpers.cpp
+++ b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/BufferValidationHelpers.cpp
@@ -204,8 +204,7 @@ namespace BufferValidationHelpers
                     }
                     else
                     {
-                        // for now, since we will allow Chords, we do allow this:
-                        // warn and reset the drop down
+                        // this used to "warn and reset the drop down" but for now, since we will allow Chords, we do allow this
                         // errorType = ShortcutErrorType::ShortcutNotMoreThanOneActionKey;
                     }
                 }
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/EditShortcutsWindow.cpp b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/EditShortcutsWindow.cpp
index 65214a6a6029..fd817776dac5 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/EditShortcutsWindow.cpp
+++ b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/EditShortcutsWindow.cpp
@@ -68,10 +68,10 @@ static IAsyncAction OnClickAccept(
     ApplyRemappings();
 }
 
-static void OnClickAcceptNoCheck()
-{
-    //ApplyRemappings();
-}
+//static void OnClickAcceptNoCheck()
+//{
+//    //ApplyRemappings();
+//}
 
 static bool isInSingleEditMode = false;
 static bool isInCreateNewMode = false;
@@ -116,10 +116,12 @@ inline void CreateEditShortcutsWindowImpl(HINSTANCE hInst, KBMEditor::KeyboardMa
         isEditShortcutsWindowRegistrationCompleted = true;
     }
 
+    // we might be passed via cmdline some keysForShortcutToEdit, this means we're editing just one shortcut
     if (!keysForShortcutToEdit.empty())
     {
         isInSingleEditMode = true;
 
+        // or making a new one
         if (keysForShortcutToEdit == L"inCreateNewMode")
         {
             isInCreateNewMode = true;
@@ -250,19 +252,12 @@ inline void CreateEditShortcutsWindowImpl(HINSTANCE hInst, KBMEditor::KeyboardMa
     auto newShortcutHeaderContainer = UIHelpers::GetWrapped(newShortcutHeader, EditorConstants::ShortcutTargetColumnWidth);
     tableHeader.Children().Append(newShortcutHeaderContainer.as<FrameworkElement>());
 
-    if (isInSingleEditMode)
-    {
-    }
-    else
+    if (!isInSingleEditMode)
     {
+        // add normal header if in normal mode
         tableHeader.Children().Append(targetAppHeader);
     }
 
-    /*if (isInSingleEditMode)
-    {
-        tableHeader.Visibility(Visibility::Collapsed);
-    }*/
-
     // Store handle of edit shortcuts window
     ShortcutControl::editShortcutsWindowHandle = _hWndEditShortcutsWindow;
 
@@ -315,17 +310,6 @@ inline void CreateEditShortcutsWindowImpl(HINSTANCE hInst, KBMEditor::KeyboardMa
             isHidden = (keysForShortcutToEdit != it.first.ToHstringVK());
         }
 
-        /*
-(
-        StackPanel& parent, 
-        std::vector<std::vector<std::unique_ptr<ShortcutControl>>>& keyboardRemapControlObjects,
-        const Shortcut& originalKeys = Shortcut(),
-        const KeyShortcutTextUnion& newKeys = Shortcut(),
-        const std::wstring& targetAppName = L"",
-        bool isHidden = false
-    );        
-        */
-
         ShortcutControl::AddNewShortcutControlRow(shortcutTable, keyboardRemapControlObjects, it.first, it.second.targetShortcut, L"", isHidden, isInSingleEditMode, OnClickAcceptNoCheckFn, action);
     }
 
@@ -405,8 +389,6 @@ inline void CreateEditShortcutsWindowImpl(HINSTANCE hInst, KBMEditor::KeyboardMa
 
     if (isInCreateNewMode)
     {
-        //ShortcutControl& newShortcut =  ShortcutControl::AddNewShortcutControlRow(shortcutTable, keyboardRemapControlObjects);
-
         ShortcutControl& newShortcut = ShortcutControl::AddNewShortcutControlRow(shortcutTable, keyboardRemapControlObjects, Shortcut(), Shortcut(), L"", false, true, nullptr, L"");
 
         // Whenever a remap is added move to the bottom of the screen
@@ -415,7 +397,7 @@ inline void CreateEditShortcutsWindowImpl(HINSTANCE hInst, KBMEditor::KeyboardMa
         // Set focus to the first Type Button in the newly added row
         UIHelpers::SetFocusOnTypeButtonInLastRow(shortcutTable, EditorConstants::ShortcutTableColCount);
 
-        // not working from here, cross thread maybe
+        // not working from here, cross thread maybe, but likely just not finding the correct item
         // newShortcut.OpenNewShortcutControlRow(shortcutTable, shortcutTable.Children().GetAt(shortcutTable.Children().Size() - 1).as<StackPanel>());
     }
 
@@ -440,10 +422,7 @@ inline void CreateEditShortcutsWindowImpl(HINSTANCE hInst, KBMEditor::KeyboardMa
 
     // Remapping table
     StackPanel mappingsPanel;
-    if (isInSingleEditMode)
-    {
-    }
-    else
+    if (!isInSingleEditMode)
     {
         mappingsPanel.Children().Append(tableHeader);
     }
@@ -492,11 +471,10 @@ inline void CreateEditShortcutsWindowImpl(HINSTANCE hInst, KBMEditor::KeyboardMa
 
     if (isInSingleEditMode)
     {
+        // more regigger of the screen for single mode
         headerText.Text(GET_RESOURCE_STRING(IDS_EDITTHISSHORTCUT_WINDOWNAME));
         addShortcut.Visibility(Visibility::Collapsed);
         headerText.Visibility(Visibility::Collapsed);
-        //shortcutRemapInfoExample.Visibility(Visibility::Collapsed);
-        //shortcutRemapInfoHeader.Visibility(Visibility::Collapsed);
         shortcutRemapInfoHeader.Text(GET_RESOURCE_STRING(IDS_EDITSINGLESHORTCUT_INFO));
 
         StackPanel tempSp;
@@ -507,10 +485,6 @@ inline void CreateEditShortcutsWindowImpl(HINSTANCE hInst, KBMEditor::KeyboardMa
         tempSp.Children().Append(applyButton);
         tempSp.Children().Append(cancelButton);
 
-        //mappingsPanel.Children().Append(tempSp);
-        //xamlContainer.Children().Append(tempSp);
-        //xamlContainer.SetBelow(tempSp, scrollViewer);
-
         StackPanel tempSp2;
         tempSp.Margin({ 10, 10, 10, 0 });
         tempSp2.Children().Append(xamlContent);
@@ -584,12 +558,6 @@ LRESULT CALLBACK EditShortcutsWindowProc(HWND hWnd, UINT messageCode, WPARAM wPa
 
         mmi->ptMinTrackSize.x = static_cast<LONG>(minWidth);
         mmi->ptMinTrackSize.y = static_cast<LONG>(minHeight);
-
-        //if (isInSingleEditMode)
-        //{
-        //    mmi->ptMaxTrackSize.x = static_cast<LONG>(minWidth);
-        //    mmi->ptMaxTrackSize.y = static_cast<LONG>(minHeight);
-        //}
     }
     break;
     case WM_GETDPISCALEDSIZE:
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/KeyDropDownControl.cpp b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/KeyDropDownControl.cpp
index a3f00939d563..6db554b4f5fe 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/KeyDropDownControl.cpp
+++ b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/KeyDropDownControl.cpp
@@ -12,7 +12,6 @@
 #include "EditorHelpers.h"
 #include "ShortcutErrorType.h"
 #include "EditorConstants.h"
-#include <Dialog.h>
 
 // Initialized to null
 KBMEditor::KeyboardManagerState* KeyDropDownControl::keyboardManagerState = nullptr;
@@ -438,11 +437,6 @@ void KeyDropDownControl::AddShortcutToControl(Shortcut shortcut, StackPanel tabl
     {
         bool ignoreWarning = false;
 
-        //while (true)
-        //{
-        //    Sleep(1000);
-        //}
-
         // If more than one key is to be added, ignore a shortcut to key warning on partially entering the remapping
         if (shortcutKeyCodes.size() > 1)
         {
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/KeyboardManagerState.cpp b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/KeyboardManagerState.cpp
index f4b63fb66ff0..cfd90a759a46 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/KeyboardManagerState.cpp
+++ b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/KeyboardManagerState.cpp
@@ -109,7 +109,6 @@ void KeyboardManagerState::ConfigureDetectSingleKeyRemapUI(const StackPanel& tex
     std::lock_guard<std::mutex> lock(currentSingleKeyUI_mutex);
     currentSingleKeyUI = textBlock.as<winrt::Windows::Foundation::IInspectable>();
 }
-//void xAddKeyToLayout(const winrt::Windows::UI::Xaml::Controls::StackPanel& panel, const winrt::hstring& key);
 
 TextBlock KeyboardManagerState::AddKeyToLayout(const StackPanel& panel, const hstring& key)
 {
@@ -193,7 +192,7 @@ void KeyboardManagerState::UpdateDetectShortcutUI()
 
         if (detectedShortcut.HasChord())
         {
-            //TextBlock, to show what shortcut in text, e.g.: "CRTL+j, k" OR "CRTL+j, CRTL+k".
+            // add a TextBlock, to show what shortcut in text, e.g.: "CRTL+j, k" OR "CRTL+j, CRTL+k".
 
             TextBlock txtComma;
             txtComma.Text(L",");
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/ShortcutControl.cpp b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/ShortcutControl.cpp
index d2423f18dc4c..8fbbf29c1b66 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/ShortcutControl.cpp
+++ b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/ShortcutControl.cpp
@@ -11,7 +11,6 @@
 #include "UIHelpers.h"
 #include "EditorHelpers.h"
 #include "EditorConstants.h"
-//#include <Dialog.h>
 
 //Both static members are initialized to null
 HWND ShortcutControl::editShortcutsWindowHandle = nullptr;
@@ -45,21 +44,13 @@ ShortcutControl::ShortcutControl(StackPanel table, StackPanel row, const int col
     fontIcon.FontFamily(Media::FontFamily(L"Segoe MDL2 Assets")); // Set the font family to Segoe MDL2 Assets
     // Set the FontIcon as the content of the button
     btnPickShortcut.as<Button>().Content(fontIcon);
-    //btnPickShortcut.as<Button>().Width(EditorConstants::ShortcutTableDropDownWidth / 2);
 
     uint32_t rowIndex;
 
     UIElementCollection children = table.Children();
     bool indexFound = children.IndexOf(row, rowIndex);
 
-    /*while (true)
-    {
-        Sleep(1000);
-    }*/
-
-    //auto nameX = L"btnPickShortcut_" + std::to_wstring(colIndex) + L"-" + std::to_wstring(rowIndex);
     auto nameX = L"btnPickShortcut_" + std::to_wstring(colIndex);
-    //auto nameX = L"btnPickShortcut";
     btnPickShortcut.as<Button>().Name(nameX);
 
     // Set an accessible name for the type shortcut button
@@ -71,8 +62,6 @@ ShortcutControl::ShortcutControl(StackPanel table, StackPanel row, const int col
     keyComboStackPanel.as<StackPanel>().Orientation(Windows::UI::Xaml::Controls::Orientation::Horizontal);
     keyComboStackPanel.as<StackPanel>().Spacing(EditorConstants::ShortcutTableDropDownSpacing);
 
-    //keyComboStackPanel.as<StackPanel>().Children().Append(btnPickShortcut.as<Button>());
-
     shortcutControlLayout.as<StackPanel>().Children().Append(keyComboStackPanel.as<StackPanel>());
 
     spBtnPickShortcut = UIHelpers::GetLabelWrapped(btnPickShortcut.as<Button>(), GET_RESOURCE_STRING(IDS_EDITSHORTCUTS_LABELSHORTCUT), 80).as<StackPanel>();
@@ -80,11 +69,6 @@ ShortcutControl::ShortcutControl(StackPanel table, StackPanel row, const int col
 
     shortcutControlLayout.as<StackPanel>().Children().Append(shortcutDropDownVariableSizedWrapGrid.as<VariableSizedWrapGrid>());
 
-    //KeyDropDownControl::AddDropDown(table, row, shortcutDropDownVariableSizedWrapGrid.as<VariableSizedWrapGrid>(), colIndex, shortcutRemapBuffer, keyDropDownControlObjects, targetApp, isHybridControl, false);
-
-    //int runProgramLabelWidth = 80;
-    //UIHelpers::GetLabelWrapped(temp, L"XXXX:", runProgramLabelWidth).as<StackPanel>()
-
     try
     {
         // If a layout update has been triggered by other methods (e.g.: adapting to zoom level), this may throw an exception.
@@ -97,44 +81,9 @@ ShortcutControl::ShortcutControl(StackPanel table, StackPanel row, const int col
 
 void ShortcutControl::OpenNewShortcutControlRow(StackPanel table, StackPanel row)
 {
-    //auto newItemIndex = parent.Children().Size() - 1;
-    //auto nameX = L"btnPickShortcut_0";
-
-    //auto btnPickShortcut = row.FindName(nameX).as<Button>();
-    //if (btnPickShortcut == nullptr)
-    //{
-    //    // not good.
-    //    return;
-    //}
-
-    /*while (true)
-    {
-        Sleep(1000);
-    }*/
-
-    if (false)
-    {
-        try
-        {
-            auto _btnPickShortcut = btnPickShortcut;
-            std::vector<std::unique_ptr<KeyDropDownControl>>& _x = keyDropDownControlObjects;
-            btnPickShortcut.Dispatcher().RunAsync(
-                Windows::UI::Core::CoreDispatcherPriority::Normal,
-                [&_x, _btnPickShortcut, table, row] {
-                    keyboardManagerState->SetUIState(KBMEditor::KeyboardManagerUIState::DetectShortcutWindowActivated, editShortcutsWindowHandle);
-                    CreateDetectShortcutWindow(_btnPickShortcut, _btnPickShortcut.XamlRoot(), *keyboardManagerState, 0, table, _x, row, nullptr, false, false, editShortcutsWindowHandle, shortcutRemapBuffer);
-                });
-        }
-        catch (...)
-        {
-        }
-    }
-    else
-    {
-        keyboardManagerState->SetUIState(KBMEditor::KeyboardManagerUIState::DetectShortcutWindowActivated, editShortcutsWindowHandle);
-        // Using the XamlRoot of the typeShortcut to get the root of the XAML host
-        CreateDetectShortcutWindow(btnPickShortcut, btnPickShortcut.XamlRoot(), *keyboardManagerState, 0, table, keyDropDownControlObjects, row, nullptr, false, false, editShortcutsWindowHandle, shortcutRemapBuffer);
-    }
+    keyboardManagerState->SetUIState(KBMEditor::KeyboardManagerUIState::DetectShortcutWindowActivated, editShortcutsWindowHandle);
+    // Using the XamlRoot of the typeShortcut to get the root of the XAML host
+    CreateDetectShortcutWindow(btnPickShortcut, btnPickShortcut.XamlRoot(), *keyboardManagerState, 0, table, keyDropDownControlObjects, row, nullptr, false, false, editShortcutsWindowHandle, shortcutRemapBuffer);
 }
 
 // Function to set the accessible name of the target App text box
@@ -181,16 +130,9 @@ ShortcutControl& ShortcutControl::AddNewShortcutControlRow(StackPanel& parent, s
 
     row.Name(L"row");
 
-    /*while (true)
-    {
-        Sleep(1000);
-    }*/
-
-    //bool isInSingleEditMode = false;
     if (isHidden)
     {
         row.Visibility(Visibility::Collapsed);
-        //isInSingleEditMode = true;
     }
 
     parent.Children().Append(row);
@@ -199,9 +141,6 @@ ShortcutControl& ShortcutControl::AddNewShortcutControlRow(StackPanel& parent, s
 
     ShortcutControl& newShortcutToRemap = *(newrow.back());
 
-    //const auto& newShortcutToRemap = newrow.back(); // Get a reference to the last unique_ptr
-    //return *newShortcutToRemap;
-
     newrow.emplace_back(std::make_unique<ShortcutControl>(parent, row, 1, targetAppTextBox));
 
     keyboardRemapControlObjects.push_back(std::move(newrow));
@@ -213,21 +152,12 @@ ShortcutControl& ShortcutControl::AddNewShortcutControlRow(StackPanel& parent, s
     row.BorderBrush(Application::Current().Resources().Lookup(box_value(L"CardStrokeColorDefaultBrush")).as<Media::Brush>());
     row.BorderThickness({ 0, 1, 0, 1 });
 
-    /*if (isInSingleEditMode)
-    {
-        row.Orientation(Orientation::Vertical);
-        row.HorizontalAlignment(HorizontalAlignment::Left);
-    }*/
-
     // ShortcutControl for the original shortcut
     auto origin = keyboardRemapControlObjects.back()[0]->GetShortcutControl();
 
     if (isInSingleEditMode)
     {
-        //const long xd = EditorConstants::ShortcutOriginColumnWidth;
         origin.Width(EditorConstants::ShortcutOriginColumnWidth);
-        //auto x = EditorConstants::ShortcutOriginColumnWidth - 50;
-        //origin.Width(x);
     }
     else
     {
@@ -343,26 +273,6 @@ ShortcutControl& ShortcutControl::AddNewShortcutControlRow(StackPanel& parent, s
     actionTypeCombo.SelectionChanged([parent, row, controlStackPanel, actionTypeCombo, shortcutItemsGrid, spBtnPickShortcut, spUnicodeTextKeysInput, runProgramStackPanel, openURIStackPanel](winrt::Windows::Foundation::IInspectable const&, SelectionChangedEventArgs const&) {
         const auto shortcutType = ShortcutControl::GetShortcutType(actionTypeCombo);
 
-        /*uint32_t rowIndex;
-        if (!parent.Children().IndexOf(row, rowIndex))
-        {
-            return;
-        }*/
-        /*while (true)
-        {
-            Sleep(1000);
-        }*/
-
-        /*TextBox unicodeTextKeysInput = controlStackPanel.FindName(L"unicodeTextKeysInput_" + std::to_wstring(rowIndex)).as<TextBox>();
-        if (unicodeTextKeysInput == nullptr)
-        {
-            unicodeTextKeysInput = row.FindName(L"unicodeTextKeysInput_" + std::to_wstring(rowIndex)).as<TextBox>();
-            if (unicodeTextKeysInput == nullptr)
-            {
-                return;
-            }
-        }*/
-
         if (shortcutType == ShortcutControl::ShortcutType::Shortcut)
         {
             spBtnPickShortcut.Visibility(Visibility::Visible);
@@ -397,14 +307,6 @@ ShortcutControl& ShortcutControl::AddNewShortcutControlRow(StackPanel& parent, s
         }
     });
 
-    /*while (true)
-    {
-        std::this_thread::sleep_for(std::chrono::seconds(1));
-    }*/
-
-    //target.BorderThickness({ 1, 1, 1, 1 });
-    //target.BorderBrush(Media::SolidColorBrush(Colors::Red()));
-
     target.Width(target.Width() - 120);
 
     row.Children().Append(target);
@@ -493,12 +395,6 @@ ShortcutControl& ShortcutControl::AddNewShortcutControlRow(StackPanel& parent, s
             }
             else if (runProgram)
             {
-                //auto parent = targetAppTextBox.Parent().as<StackPanel>();
-
-                /*auto runProgramPathInput = ShortcutControl::FindRowChildByName(parent, L"runProgramPathInput").as<TextBox>();
-                auto runProgramArgsForProgramInput = ShortcutControl::FindRowChildByName(parent, L"runProgramArgsForProgramInput").as<TextBox>();
-                auto runProgramStartInDirInput = ShortcutControl::FindRowChildByName(parent, L"runProgramStartInDirInput").as<TextBox>();*/
-
                 auto runProgramPathInput = row.FindName(L"runProgramPathInput_" + std::to_wstring(rowIndex)).as<TextBox>();
                 auto runProgramArgsForProgramInput = row.FindName(L"runProgramArgsForProgramInput_" + std::to_wstring(rowIndex)).as<TextBox>();
                 auto runProgramStartInDirInput = row.FindName(L"runProgramStartInDirInput_" + std::to_wstring(rowIndex)).as<TextBox>();
@@ -545,11 +441,6 @@ ShortcutControl& ShortcutControl::AddNewShortcutControlRow(StackPanel& parent, s
         ShortcutControl::SetAccessibleNameForTextBox(targetAppTextBox, rowIndex + 1);
     });
 
-    /*while (true)
-    {
-        Sleep(1000);
-    }*/
-
     // We need two containers in order to align it horizontally and vertically
 
     if (isInSingleEditMode)
@@ -600,21 +491,6 @@ ShortcutControl& ShortcutControl::AddNewShortcutControlRow(StackPanel& parent, s
             UIElementCollection children = parent.Children();
             bool indexFound = children.IndexOf(row, rowIndex);
 
-            if (isInSingleEditMode)
-            {
-                // need to confirm this.
-                /*
-            * 
-            auto reallyDelete = GET_RESOURCE_STRING(IDS_EDITSHORTCUTS_PARTIALCONFIRMATIONDIALOGTITLE);
-            reallyDelete = L"REALLY?";
-
-            if (!co_await Dialog::PartialRemappingConfirmationDialog(parent.XamlRoot(), reallyDelete))
-            {
-                co_return;
-            }
-            */
-            }
-
             // IndexOf could fail if the row got deleted and the button handler was invoked twice. In this case it should return
             if (!indexFound)
             {
@@ -717,57 +593,6 @@ ShortcutControl& ShortcutControl::AddNewShortcutControlRow(StackPanel& parent, s
     return newShortcutToRemap;
 }
 
-//StackPanel* findChildByName(const StackPanel& panel, const std::string& name)
-//{
-//    if (panel.name == name)
-//    {
-//        return const_cast<StackPanel*>(&panel);
-//    }
-//
-//    for (const auto& child : panel.children)
-//    {
-//        StackPanel* found = findChildByName(child, name);
-//        if (found != nullptr)
-//        {
-//            return found;
-//        }
-//    }
-//
-//    return nullptr;
-//}
-
-//winrt::Windows::Foundation::IInspectable ShortcutControl::FindRowChildByName(const StackPanel& panel, const wchar_t* nameToFind)
-//{
-//    StackPanel returnPanel = panel;
-//
-//    while (returnPanel.Name() != winrt::to_hstring(L"row"))
-//    {
-//        if (returnPanel.Parent() == nullptr)
-//        {
-//            return returnPanel;
-//        }
-//        else
-//        {
-//            try
-//            {
-//                returnPanel = returnPanel.Parent().as<StackPanel>();
-//            }
-//            catch (...)
-//            {
-//                // parent must not be StackPanel
-//                return nullptr;
-//            }
-//        }
-//    }
-//
-//    if (returnPanel != nullptr)
-//    {
-//        return returnPanel.FindName(nameToFind);
-//    }
-//
-//    return returnPanel;
-//}
-
 StackPanel SetupOpenURIControls(StackPanel& parent, StackPanel& row, Shortcut& shortCut, winrt::Windows::UI::Xaml::Thickness& textInputMargin, ::StackPanel& _controlStackPanel)
 {
     StackPanel openUriStackPanel;
@@ -803,8 +628,6 @@ StackPanel SetupOpenURIControls(StackPanel& parent, StackPanel& row, Shortcut& s
         tempShortcut.operationType = Shortcut::OperationType::OpenURI;
         tempShortcut.uriToOpen = ShortcutControl::RemoveExtraQuotes(uriTextBox.Text().c_str());
         ShortcutControl::shortcutRemapBuffer[rowIndex].first[1] = tempShortcut;
-
-        //ShortcutControl::RunProgramTextOnChange(rowIndex, shortcutRemapBuffer, runProgramPathInput, runProgramArgsForProgramInput, runProgramStartInDirInput);
     });
 
     _controlStackPanel.Children().Append(openUriStackPanel);
@@ -847,7 +670,6 @@ StackPanel SetupRunProgramControls(StackPanel& parent, StackPanel& row, Shortcut
 
     runProgramPathInput.AcceptsReturn(false);
     runProgramPathInput.IsSpellCheckEnabled(false);
-    //runProgramPathInput.Visibility(Visibility::Collapsed);
     runProgramPathInput.Width(EditorConstants::TableDropDownHeight);
     runProgramPathInput.HorizontalAlignment(HorizontalAlignment::Left);
 
@@ -868,10 +690,6 @@ StackPanel SetupRunProgramControls(StackPanel& parent, StackPanel& row, Shortcut
     stackPanelForRunProgramPath.Orientation(Orientation::Horizontal);
     stackPanelRunProgramStartInDir.Orientation(Orientation::Horizontal);
 
-    /*   while (true)
-    {
-        std::this_thread::sleep_for(std::chrono::seconds(1));
-    }*/
     pickFileBtn.Content(winrt::box_value(GET_RESOURCE_STRING(IDS_BROWSE_FOR_PROGRAM_BUTTON)));
     pickPathBtn.Content(winrt::box_value(GET_RESOURCE_STRING(IDS_BROWSE_FOR_PATH_BUTTON)));
     pickFileBtn.Margin(textInputMargin);
@@ -884,13 +702,11 @@ StackPanel SetupRunProgramControls(StackPanel& parent, StackPanel& row, Shortcut
     stackPanelRunProgramStartInDir.Children().Append(pickPathBtn);
 
     int runProgramLabelWidth = 90;
-    //controlStackPanel.Children().Append(stackPanelForRunProgramPath);
+
     controlStackPanel.Children().Append(UIHelpers::GetLabelWrapped(stackPanelForRunProgramPath, GET_RESOURCE_STRING(IDS_EDITSHORTCUTS_LABELPROGRAM), runProgramLabelWidth).as<StackPanel>());
 
-    //controlStackPanel.Children().Append(runProgramArgsForProgramInput);
     controlStackPanel.Children().Append(UIHelpers::GetLabelWrapped(runProgramArgsForProgramInput, GET_RESOURCE_STRING(IDS_EDITSHORTCUTS_LABELARGS), runProgramLabelWidth).as<StackPanel>());
 
-    //controlStackPanel.Children().Append(stackPanelRunProgramStartInDir);
     controlStackPanel.Children().Append(UIHelpers::GetLabelWrapped(stackPanelRunProgramStartInDir, GET_RESOURCE_STRING(IDS_EDITSHORTCUTS_LABELSTARTIN), runProgramLabelWidth).as<StackPanel>());
 
     auto runProgramAppNotRunningSound = TextBox();
@@ -924,6 +740,8 @@ StackPanel SetupRunProgramControls(StackPanel& parent, StackPanel& row, Shortcut
     runProgramAlreadyRunningAction.Items().Append(winrt::box_value(GET_RESOURCE_STRING(IDS_ALREADYRUNNINGDONOTHING)));
     runProgramAlreadyRunningAction.Items().Append(winrt::box_value(GET_RESOURCE_STRING(IDS_ALREADYRUNNINGCLOSE)));
     runProgramAlreadyRunningAction.Items().Append(winrt::box_value(GET_RESOURCE_STRING(IDS_ALREADYRUNNINGTERMINATE)));
+
+    // lets think about this, I like it, some don't
     runProgramAlreadyRunningAction.Items().Append(winrt::box_value(GET_RESOURCE_STRING(IDS_ALREADYRUNNINGCLOSEANDTERMINATE)));
     runProgramAlreadyRunningAction.SelectedIndex(0);
 
@@ -932,12 +750,6 @@ StackPanel SetupRunProgramControls(StackPanel& parent, StackPanel& row, Shortcut
     controlStackPanel.Children().Append(UIHelpers::GetLabelWrapped(runProgramElevationTypeCombo, GET_RESOURCE_STRING(IDS_EDITSHORTCUTS_LABELELEVATION), runProgramLabelWidth).as<StackPanel>());
     controlStackPanel.Children().Append(UIHelpers::GetLabelWrapped(runProgramAlreadyRunningAction, GET_RESOURCE_STRING(IDS_EDITSHORTCUTS_LABELIFRUNNING), runProgramLabelWidth).as<StackPanel>());
 
-    //StackPanel selectOptionsSP;
-    //selectOptionsSP.Orientation(Orientation::Horizontal);
-    //selectOptionsSP.Children().Append(UIHelpers::GetLabelWrapped(runProgramElevationTypeCombo, GET_RESOURCE_STRING(IDS_EDITSHORTCUTS_LABELELEVATION), runProgramLabelWidth).as<StackPanel>());
-    //selectOptionsSP.Children().Append(UIHelpers::GetLabelWrapped(runProgramAlreadyRunningAction, GET_RESOURCE_STRING(IDS_EDITSHORTCUTS_LABELIFRUNNING), runProgramLabelWidth, HorizontalAlignment::Right).as<StackPanel>());    
-    //controlStackPanel.Children().Append(selectOptionsSP);
-
     auto runProgramStartWindow = ComboBox();
     runProgramStartWindow.Name(L"runProgramStartWindow_" + std::to_wstring(rowIndex));
     runProgramStartWindow.Width(EditorConstants::RemapTableDropDownWidth - 40);
@@ -957,7 +769,6 @@ StackPanel SetupRunProgramControls(StackPanel& parent, StackPanel& row, Shortcut
         CreateNewTempShortcut(row, tempShortcut, rowIndex);
         ShortcutControl::shortcutRemapBuffer[rowIndex].first[1] = tempShortcut;
 
-        //ShortcutControl::RunProgramTextOnChange(rowIndex, shortcutRemapBuffer, runProgramPathInput, runProgramArgsForProgramInput, runProgramStartInDirInput);
     });
 
     runProgramArgsForProgramInput.TextChanged([parent, row](winrt::Windows::Foundation::IInspectable const& sender, winrt::Windows::UI::Xaml::Controls::TextChangedEventArgs const& e) mutable {
@@ -970,7 +781,7 @@ StackPanel SetupRunProgramControls(StackPanel& parent, StackPanel& row, Shortcut
         Shortcut tempShortcut;
         CreateNewTempShortcut(row, tempShortcut, rowIndex);
         ShortcutControl::shortcutRemapBuffer[rowIndex].first[1] = tempShortcut;
-        //ShortcutControl::RunProgramTextOnChange(rowIndex, shortcutRemapBuffer, runProgramPathInput, runProgramArgsForProgramInput, runProgramStartInDirInput);
+
     });
 
     runProgramAppNotRunningSound.TextChanged([parent, row](winrt::Windows::Foundation::IInspectable const& sender, winrt::Windows::UI::Xaml::Controls::TextChangedEventArgs const& e) mutable {
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/ShortcutControl.h b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/ShortcutControl.h
index d66436106f27..cc975c8a269e 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/ShortcutControl.h
+++ b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/ShortcutControl.h
@@ -26,10 +26,8 @@ class ShortcutControl
     winrt::Windows::Foundation::IInspectable shortcutDropDownVariableSizedWrapGrid;
 
     // Button to type the shortcut
-    //winrt::Windows::Foundation::IInspectable btnPickShortcut;
     Button btnPickShortcut;
-
-    // TODO
+    
     StackPanel spBtnPickShortcut;
 
     // StackPanel to parent the above controls
@@ -74,10 +72,9 @@ class ShortcutControl
     // Function to add a new row to the shortcut table. If the originalKeys and newKeys args are provided, then the displayed shortcuts are set to those values.
     static ShortcutControl& AddNewShortcutControlRow(StackPanel& parent, std::vector<std::vector<std::unique_ptr<ShortcutControl>>>& keyboardRemapControlObjects, const Shortcut& originalKeys = Shortcut(), const KeyShortcutTextUnion& newKeys = Shortcut(), const std::wstring& targetAppName = L"", bool isHidden = false, bool closeOnDelete = false, std::function<void()> fn = nullptr, const std::wstring& actio = L"");
 
+    // Function to delete the shortcut control
     static void ShortcutControl::DeleteShortcutControl(StackPanel& parent, std::vector<std::vector<std::unique_ptr<ShortcutControl>>>& keyboardRemapControlObjects, int index);
 
-    //static winrt::Windows::Foundation::IInspectable ShortcutControl::FindRowChildByName(const winrt::Windows::UI::Xaml::Controls::StackPanel& parent, const wchar_t* nameToFind);
-
     // Function to get the shortcut type
     static ShortcutType GetShortcutType(const Controls::ComboBox& typeCombo);
 
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/UIHelpers.cpp b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/UIHelpers.cpp
index 491e67580b4c..771c914f4666 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/UIHelpers.cpp
+++ b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/UIHelpers.cpp
@@ -35,33 +35,6 @@ namespace UIHelpers
 
     void SetFocusOnTypeButtonInLastRow(StackPanel& parent, long colCount)
     {
-        //auto newItemIndex = parent.Children().Size() - 1;
-        //auto nameX = L"btnPickShortcut_" + std::to_wstring(0) + L"-" + std::to_wstring(newItemIndex);
-
-        //auto btnPickShortcut = parent.FindName(nameX).as<Button>();
-        //if (btnPickShortcut == nullptr)
-        //{
-        //    btnPickShortcut = FindElementByName(parent, nameX).as<Button>();
-        //}
-
-        //if (btnPickShortcut != nullptr)
-        //{
-        //    btnPickShortcut.Focus(FocusState::Programmatic);
-        //    //btnPickShortcut.Click(nullptr);
-
-        //    ////auto peer = ButtonAutomationPeer::ProviderFromPeer(btnPickShortcut).as<ButtonAutomationPeer>();
-        //    //FrameworkElementAutomationPeer peer = FrameworkElementAutomationPeer::FromElement(btnPickShortcut).as<FrameworkElementAutomationPeer>();
-
-        //    //if (peer != nullptr)
-        //    //{
-        //    //    auto xxx = peer.GetPattern(PatternInterface::Invoke).as<InvokePattern>();
-        //    //
-
-        //    //}
-
-        //    return;
-        //}
-
         // First element in the last row (StackPanel)
         auto lastHotKeyLine = parent.Children().GetAt(parent.Children().Size() - 1).as<StackPanel>();
 
diff --git a/src/modules/keyboardmanager/KeyboardManagerEngine/main.cpp b/src/modules/keyboardmanager/KeyboardManagerEngine/main.cpp
index 552d42b8da15..92f26f8f6d74 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEngine/main.cpp
+++ b/src/modules/keyboardmanager/KeyboardManagerEngine/main.cpp
@@ -26,12 +26,7 @@ int WINAPI wWinMain(_In_ HINSTANCE /*hInstance*/,
     }
 
     InitUnhandledExceptionHandler();
-
-    //while (true)
-    //{
-    //    Sleep(1000);
-    //}
-
+    
     auto mutex = CreateMutex(nullptr, true, instanceMutexName.c_str());
     if (mutex == nullptr)
     {
diff --git a/src/modules/keyboardmanager/common/KeyboardManagerConstants.h b/src/modules/keyboardmanager/common/KeyboardManagerConstants.h
index 7e0d205f53e6..5aacdf3380ba 100644
--- a/src/modules/keyboardmanager/common/KeyboardManagerConstants.h
+++ b/src/modules/keyboardmanager/common/KeyboardManagerConstants.h
@@ -77,10 +77,7 @@ namespace KeyboardManagerConstants
     inline const std::wstring ShortcutOpenURI = L"openUri";
 
     // Name of the property use to store shortcutOperationType.
-    inline const std::wstring ShortcutOperationType = L"operationType";
-
-    // Name of the property use to store runProgramFilePath.
-    //inline const std::wstring IsRunProgramSettingName = L"isRunProgram";
+    inline const std::wstring ShortcutOperationType = L"operationType";    
 
     // Name of the property use to store the target application.
     inline const std::wstring TargetAppSettingName = L"targetApp";
diff --git a/src/modules/keyboardmanager/common/MappingConfiguration.cpp b/src/modules/keyboardmanager/common/MappingConfiguration.cpp
index f937e928c31e..f3e65e09b6f9 100644
--- a/src/modules/keyboardmanager/common/MappingConfiguration.cpp
+++ b/src/modules/keyboardmanager/common/MappingConfiguration.cpp
@@ -226,8 +226,7 @@ bool MappingConfiguration::LoadAppSpecificShortcutRemaps(const json::JsonObject&
 
                     auto tempShortcut = Shortcut(newRemapKeys.c_str());
                     tempShortcut.operationType = Shortcut::OperationType::RunProgram;
-                    tempShortcut.runProgramFilePath = runProgramFilePath;
-                    //tempShortcut.elevationLevel = elevationLevel;
+                    tempShortcut.runProgramFilePath = runProgramFilePath;                    
                     tempShortcut.runProgramArgs = runProgramArgs;
                     tempShortcut.runProgramStartInDir = runProgramStartInDir;
                     tempShortcut.elevationLevel = static_cast<Shortcut::ElevationLevel>(runProgramElevationLevel);
@@ -487,9 +486,7 @@ bool MappingConfiguration::SaveSettingsToFile()
         // For shortcut to shortcut remapping
         else if (it.second.targetShortcut.index() == 1)
         {
-            auto targetShortcut = std::get<Shortcut>(it.second.targetShortcut);
-
-            //keys.SetNamedValue(KeyboardManagerConstants::IsRunProgramSettingName, json::value(targetShortcut.isRunProgram));
+            auto targetShortcut = std::get<Shortcut>(it.second.targetShortcut);            
 
             if (targetShortcut.operationType == Shortcut::OperationType::RunProgram)
             {
@@ -555,9 +552,7 @@ bool MappingConfiguration::SaveSettingsToFile()
             // For shortcut to shortcut remapping
             else if (itKeys.second.targetShortcut.index() == 1)
             {
-                auto targetShortcut = std::get<Shortcut>(itKeys.second.targetShortcut);
-
-                //keys.SetNamedValue(KeyboardManagerConstants::IsRunProgramSettingName, json::value(targetShortcut.isRunProgram));
+                auto targetShortcut = std::get<Shortcut>(itKeys.second.targetShortcut);                
 
                 if (targetShortcut.operationType == Shortcut::OperationType::RunProgram)
                 {
diff --git a/src/modules/keyboardmanager/common/Shortcut.cpp b/src/modules/keyboardmanager/common/Shortcut.cpp
index f8644d162574..22319e6f3161 100644
--- a/src/modules/keyboardmanager/common/Shortcut.cpp
+++ b/src/modules/keyboardmanager/common/Shortcut.cpp
@@ -55,25 +55,6 @@ Shortcut::Shortcut(const std::wstring& shortcutVK, const DWORD secondKeyOfChord)
     secondKey = secondKeyOfChord;
 }
 
-// Constructor to initialize shortcut from a list of keys and runProgram data
-//Shortcut::Shortcut(const std::wstring& shortcutVK, const bool isRunProgram, const std::wstring& _runProgramFilePath, const std::wstring& _runProgramArgs, const std::wstring& _runProgramStartInDir, const Shortcut::ElevationLevel _elevationLevel) :
-//    winKey(ModifierKey::Disabled), ctrlKey(ModifierKey::Disabled), altKey(ModifierKey::Disabled), shiftKey(ModifierKey::Disabled), actionKey(NULL)
-//{
-//    Shortcut::isRunProgram = isRunProgram;
-//    if (Shortcut::isRunProgram)
-//    {
-//        operationType = RunProgram;
-//        runProgramFilePath = _runProgramFilePath;
-//        runProgramArgs = _runProgramArgs;
-//        runProgramStartInDir = _runProgramStartInDir;
-//        elevationLevel = _elevationLevel;
-//        //secondKey = _secondKeyOfChord;
-//    }
-//
-//    auto keys = splitwstring(shortcutVK, ';');
-//    SetKeyCodes(ConvertToNumbers(keys));
-//}
-
 // Constructor to initialize shortcut from a list of keys
 Shortcut::Shortcut(const std::vector<int32_t>& keys)
 {
@@ -496,9 +477,8 @@ void Shortcut::ResetKey(const DWORD input)
     {
         shiftKey = ModifierKey::Disabled;
     }
-    else
-    {
-    }
+
+    // we always want to reset these also, I think for now since this got a little weirder when chords
     actionKey = {};
     secondKey = {};
 }
@@ -915,28 +895,29 @@ bool Shortcut::IsKeyboardStateClearExceptShortcut(KeyboardManagerInput::InputInt
     return true;
 }
 
-int Shortcut::GetModifiersCount() const
-{   
-    int modifierCount = 0;
-    if (winKey != ModifierKey::Disabled)
-    {
-        modifierCount += 1;
-    }
-    if (ctrlKey != ModifierKey::Disabled)
-    {
-        modifierCount += 1;
-    }
-    if (altKey != ModifierKey::Disabled)
-    {
-        modifierCount += 1;
-    }
-    if (shiftKey != ModifierKey::Disabled)
-    {
-        modifierCount += 1;
-    }
-
-    return modifierCount;
-}
+// Function to get the number of modifiers.
+//int Shortcut::GetModifiersCount() const
+//{   
+//    int modifierCount = 0;
+//    if (winKey != ModifierKey::Disabled)
+//    {
+//        modifierCount += 1;
+//    }
+//    if (ctrlKey != ModifierKey::Disabled)
+//    {
+//        modifierCount += 1;
+//    }
+//    if (altKey != ModifierKey::Disabled)
+//    {
+//        modifierCount += 1;
+//    }
+//    if (shiftKey != ModifierKey::Disabled)
+//    {
+//        modifierCount += 1;
+//    }
+//
+//    return modifierCount;
+//}
 
 // Function to get the number of modifiers that are common between the current shortcut and the shortcut in the argument
 int Shortcut::GetCommonModifiersCount(const Shortcut& input) const
diff --git a/src/modules/keyboardmanager/common/Shortcut.h b/src/modules/keyboardmanager/common/Shortcut.h
index 0fa5c44b0c9e..020035313c26 100644
--- a/src/modules/keyboardmanager/common/Shortcut.h
+++ b/src/modules/keyboardmanager/common/Shortcut.h
@@ -63,7 +63,6 @@ class Shortcut
     ModifierKey altKey = ModifierKey::Disabled;
     ModifierKey shiftKey = ModifierKey::Disabled;
 
-    //bool isRunProgram = false;
     std::wstring runProgramFilePath;
     std::wstring runProgramArgs;
     std::wstring runProgramStartInDir;
@@ -91,9 +90,6 @@ class Shortcut
     // Constructor to initialize Shortcut from it's virtual key code string representation.
     Shortcut(const std::wstring& shortcutVK, const DWORD _secondKeyOfChord);
 
-    // Constructor to initialize shortcut from a list of keys and a runProgram data
-    /*Shortcut(const std::wstring& shortcutVK, const bool isRunProgram, const std::wstring& runProgramFilePath, const std::wstring& runProgramArgs, const std::wstring& runProgramStartInDir, const Shortcut::ElevationLevel elevationLevel);*/
-
     // Constructor to initialize shortcut from a list of keys
     Shortcut(const std::vector<int32_t>& keys);
 
@@ -123,8 +119,10 @@ class Shortcut
     // Function to return the action key
     DWORD GetActionKey() const;
 
+    // Function to return IsRunProgram
     bool Shortcut::IsRunProgram() const;
 
+    // Function to return IsOpenURI
     bool Shortcut::IsOpenURI() const;
 
     // Function to return the second key (of the chord)
@@ -166,6 +164,7 @@ class Shortcut
     // Function to set a key in the shortcut based on the passed key code argument. Returns false if it is already set to the same value. This can be used to avoid UI refreshing
     bool SetKey(const DWORD input);
 
+    // Function to SetSecondKey
     bool SetSecondKey(const DWORD input);
 
     // Function to reset the state of a shortcut key based on the passed key code argument
@@ -189,7 +188,7 @@ class Shortcut
     // Function to get the number of modifiers that are common between the current shortcut and the shortcut in the argument
     int GetCommonModifiersCount(const Shortcut& input) const;
 
-    int GetModifiersCount() const;
+    //int GetModifiersCount() const;
 };
 
 using KeyShortcutTextUnion = std::variant<DWORD, Shortcut, std::wstring>;
diff --git a/src/settings-ui/Settings.UI/ViewModels/DashboardViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/DashboardViewModel.cs
index 25f0e2e4269f..954458a4c730 100644
--- a/src/settings-ui/Settings.UI/ViewModels/DashboardViewModel.cs
+++ b/src/settings-ui/Settings.UI/ViewModels/DashboardViewModel.cs
@@ -5,7 +5,6 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Diagnostics;
 using System.IO.Abstractions;
 using System.Linq;
 using System.Windows.Threading;