diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index dffea01a..c25a6240 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -369,7 +369,7 @@ jobs:
 
   macos_x86_64:
     name: macOS x86_64
-    runs-on: macos-latest
+    runs-on: macos-12
 
     steps:
       - uses: actions/checkout@v2
diff --git a/.github/workflows/feature-matrix.yml b/.github/workflows/feature-matrix.yml
index 76ca955b..a96e19ce 100644
--- a/.github/workflows/feature-matrix.yml
+++ b/.github/workflows/feature-matrix.yml
@@ -10,7 +10,6 @@ jobs:
       matrix:
         lua_addon: ["y", "n"]
         sdcc: ["y", "n"]
-        vcs: ["y", "n"]
     steps:
       - uses: actions/checkout@v2
         with:
@@ -28,8 +27,8 @@ jobs:
 
       - name: Build
         run: |
-          name="redpanda-cpp-${{ matrix.lua_addon }}-${{ matrix.sdcc }}-${{ matrix.vcs }}"
-          xmake f --qt=/usr --prefix=/ --lua-addon=${{ matrix.lua_addon }} --sdcc=${{ matrix.sdcc }} --vcs=${{ matrix.vcs }}
+          name="redpanda-cpp-${{ matrix.lua_addon }}-${{ matrix.sdcc }}"
+          xmake f --qt=/usr --prefix=/ --lua-addon=${{ matrix.lua_addon }} --sdcc=${{ matrix.sdcc }}
           xmake b
           xmake i -o "pkg/$name"
           tar -cf "pkg/$name.tar" -C pkg "$name"
@@ -37,7 +36,7 @@ jobs:
       - name: Upload
         uses: actions/upload-artifact@v2
         with:
-          name: Ubuntu 22.04 - lua-addon=${{ matrix.lua_addon }}, sdcc=${{ matrix.sdcc }}, vcs=${{ matrix.vcs }}
+          name: Ubuntu 22.04 - lua-addon=${{ matrix.lua_addon }}, sdcc=${{ matrix.sdcc }}
           path: pkg/*.tar
 
   windows_msvc_x64:
@@ -47,7 +46,6 @@ jobs:
       matrix:
         lua_addon: ["y", "n"]
         sdcc: ["y", "n"]
-        vcs: ["y", "n"]
     steps:
       - uses: actions/checkout@v2
         with:
@@ -69,8 +67,8 @@ jobs:
 
       - name: Build
         run: |
-          $install_dir = "pkg/redpanda-cpp-${{ matrix.lua_addon }}-${{ matrix.sdcc }}-${{ matrix.vcs }}"
-          xmake f -p windows -a x64 --qt="${env:QT_ROOT_DIR}" --lua-addon=${{ matrix.lua_addon }} --sdcc=${{ matrix.sdcc }} --vcs=${{ matrix.vcs }}
+          $install_dir = "pkg/redpanda-cpp-${{ matrix.lua_addon }}-${{ matrix.sdcc }}"
+          xmake f -p windows -a x64 --qt="${env:QT_ROOT_DIR}" --lua-addon=${{ matrix.lua_addon }} --sdcc=${{ matrix.sdcc }}
           xmake b
           xmake i -o $install_dir
           mv $install_dir/bin/* $install_dir/
@@ -80,5 +78,5 @@ jobs:
       - name: Upload
         uses: actions/upload-artifact@v2
         with:
-          name: Windows MSVC x64 - lua-addon=${{ matrix.lua_addon }}, sdcc=${{ matrix.sdcc }}, vcs=${{ matrix.vcs }}
+          name: Windows MSVC x64 - lua-addon=${{ matrix.lua_addon }}, sdcc=${{ matrix.sdcc }}
           path: pkg/*
diff --git a/RedPandaIDE/RedPandaIDE.pro b/RedPandaIDE/RedPandaIDE.pro
index 0e11f3bf..1ee7944e 100644
--- a/RedPandaIDE/RedPandaIDE.pro
+++ b/RedPandaIDE/RedPandaIDE.pro
@@ -612,10 +612,7 @@ RESOURCES += colorscheme_files
 
 macos: {
     # Add needed executables into the main app bundle
-    bundled_executable.files = \
-        $$OUT_PWD/../tools/astyle/astyle \
-        $$OUT_PWD/../tools/consolepauser/consolepauser \
-        $$OUT_PWD/../tools/redpanda-git-askpass/redpanda-git-askpass.app/Contents/MacOS/redpanda-git-askpass
+    bundled_executable.files = $$OUT_PWD/../tools/consolepauser/consolepauser
     bundled_executable.path = Contents/MacOS
 
     # Also bundled templates
diff --git a/RedPandaIDE/xmake.lua b/RedPandaIDE/xmake.lua
index 79bd5d11..f58e2e20 100644
--- a/RedPandaIDE/xmake.lua
+++ b/RedPandaIDE/xmake.lua
@@ -144,6 +144,7 @@ target("RedPandaIDE")
         "settingsdialog/executorgeneralwidget",
         "settingsdialog/executorproblemsetwidget",
         "settingsdialog/formattergeneralwidget",
+        "settingsdialog/formatterpathwidget",
         "settingsdialog/languageasmgenerationwidget",
         "settingsdialog/projectcompileparamaterswidget",
         "settingsdialog/projectcompilerwidget",
@@ -188,9 +189,6 @@ target("RedPandaIDE")
         add_ui_classes(
             "settingsdialog/environmentfileassociationwidget",
             "settingsdialog/projectversioninfowidget")
-    else
-        add_ui_classes(
-            "settingsdialog/formatterpathwidget")
     end
 
     if has_config("lua-addon") then
diff --git a/packages/appimage/01-in-docker.sh b/packages/appimage/01-in-docker.sh
index 64c5a3fc..5e8e60d7 100755
--- a/packages/appimage/01-in-docker.sh
+++ b/packages/appimage/01-in-docker.sh
@@ -25,8 +25,6 @@ make LINUX_STATIC_IME_PLUGIN=ON -j$(nproc)
 
 # install RedPanda C++ to AppDir
 make INSTALL_ROOT=/RedPandaIDE.AppDir install
-# remove unnecessary, huge files
-rm /RedPandaIDE.AppDir/usr/libexec/RedPandaCPP/redpanda-git-askpass
 
 # setup AppImage resource
 cd /RedPandaIDE.AppDir
diff --git a/packages/debian-static/01-in-docker.sh b/packages/debian-static/01-in-docker.sh
index 1185ffa7..ea8a8200 100755
--- a/packages/debian-static/01-in-docker.sh
+++ b/packages/debian-static/01-in-docker.sh
@@ -12,5 +12,3 @@ make LINUX_STATIC_IME_PLUGIN=ON -j$(nproc)
 
 # install RedPanda C++ to AppDir
 make INSTALL_ROOT=/out install
-# remove unnecessary, huge files
-rm /out/usr/libexec/RedPandaCPP/redpanda-git-askpass
diff --git a/xmake.lua b/xmake.lua
index 0192098d..47aa042c 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -189,7 +189,6 @@ if has_config("lua-addon") then
 end
 includes("libs/qsynedit")
 includes("libs/redpanda_qt_utils")
-includes("tools/astyle")
 includes("tools/consolepauser")
 if has_config("vcs") then
     if is_os("windows") then