diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a74a06e..b940257 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest]
         emacs-version:
           - 28.1
           - snapshot
@@ -26,13 +26,22 @@ jobs:
       with:
         version: ${{ matrix.emacs-version }}
 
-    - uses: emacs-eask/setup-eask@master
+    - name: Set up Python 3.10
+      uses: actions/setup-python@v4
       with:
-        version: 'snapshot'
+        python-version: '3.10'
 
-    - name: Set workaround env var
+    - name: Install melpazoid
       run: |
-        echo "ACTIONS_ALLOW_UNSECURE_COMMANDS=true" >> $GITHUB_ENV
+        python -m pip install --upgrade pip
+        git clone https://github.com/riscy/melpazoid.git ~/melpazoid
+        pip install ~/melpazoid
 
-    - name: Run tests
-      run: 'make ci'
+    - name: Run melpazoid
+      env:
+        LOCAL_REPO: ${{ github.workspace }}
+        # RECIPE is your recipe as written for MELPA:
+        RECIPE: (eca :fetcher github :repo "editor-code-assistant/eca-emacs")
+        # set this to false (or remove it) if the package isn't on MELPA:
+        EXIST_OK: false
+      run: echo $GITHUB_REF && make -C ~/melpazoid
diff --git a/Eask b/Eask
deleted file mode 100644
index 7b799b9..0000000
--- a/Eask
+++ /dev/null
@@ -1,22 +0,0 @@
-(package "eca" "0.0.1" "AI pair programming via ECA (Editor Code Assistant)")
-(website-url "https://github.com/editor-code-assistant/eca-emacs")
-(keywords "tools")
-
-(package-file "eca.el")
-
-(files "*.el")
-
-(source "gnu")
-(source "melpa")
-
-(depends-on "emacs" "28.1")
-(depends-on "compat" "30.1")
-(depends-on "dash" "2.18.0")
-(depends-on "f" "0.20.0")
-(depends-on "markdown-mode" "2.3")
-
-(development
- (depends-on "el-mock")
- (depends-on "ert-runner"))
-
-(setq network-security-level 'low)  ; see https://github.com/jcs090218/setup-emacs-windows/issues/156#issuecomment-932956432
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 2094363..0000000
--- a/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-EMACS ?= emacs
-EASK ?= eask
-
-build:
-	$(EASK) install-deps
-	$(EASK) package
-	$(EASK) install
-
-ci: clean build compile checkdoc lint
-
-compile:
-	@echo "Compiling..."
-	$(EASK) compile
-
-checkdoc:
-	$(EASK) lint checkdoc
-
-lint:
-	@echo "package linting..."
-	$(EASK) lint package
-
-clean:
-	$(EASK) clean all
-
-# Allow args to make commands
-%:
-	@:
-
-.PHONY : ci compile checkdoc lint clean
diff --git a/eca-chat.el b/eca-chat.el
index 2fb9e62..fc4aed6 100644
--- a/eca-chat.el
+++ b/eca-chat.el
@@ -283,7 +283,7 @@ Must be a valid model supported by server, check `eca-chat-select-model`."
   (interactive)
   (if-let ((ov (eca-chat--expandable-content-at-point)))
       (eca-chat--expandable-content-toggle (overlay-get ov 'eca-chat--expandable-content-id))
-    (call-interactively 'markdown-cycle)))
+    (call-interactively #'markdown-cycle)))
 
 (defun eca-chat--prompt-field-start-point ()
   "Return the metadata overlay for the prompt field start point."
diff --git a/eca-mcp.el b/eca-mcp.el
index 7624ace..260ee70 100644
--- a/eca-mcp.el
+++ b/eca-mcp.el
@@ -71,7 +71,7 @@
                 (insert (propertize (plist-get tool :name) 'font-lock-face 'eca-mcp-details-tool-face) " "))))
           (insert "\n")
           (insert (propertize "Command: " 'font-lock-face font-lock-doc-face))
-          (insert (concat command " " (string-join args " ")))
+          (insert command " " (string-join args " "))
           (when (string= "failed" status)
             (insert "\n")
             (insert (propertize (format "Failed to start, check %s for details"