diff --git a/.gitignore b/.gitignore
index dd06dea67c8..0b4ff7a98d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -150,7 +150,9 @@ packages/*/docs/
 .build
 
 packaging/dist
-!./.shadowenv.d/yarn.lisp
+
+# Shadowenv generates user-specific files that shouldn't be committed
+.shadowenv.d/
 
 cloudflared*
 function-runner*
diff --git a/.shadowenv.d/.gitignore b/.shadowenv.d/.gitignore
deleted file mode 100644
index 3535255961e..00000000000
--- a/.shadowenv.d/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!yarn.lisp
diff --git a/.shadowenv.d/yarn.lisp b/.shadowenv.d/yarn.lisp
deleted file mode 100644
index 05efd35c3b0..00000000000
--- a/.shadowenv.d/yarn.lisp
+++ /dev/null
@@ -1 +0,0 @@
-(env/prepend-to-pathlist "PATH" (expand-path "./bin/shadowenv/"))
diff --git a/bin/shadowenv/p b/bin/shadowenv/p
deleted file mode 100755
index 885a204f325..00000000000
--- a/bin/shadowenv/p
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-printf "\033[0;32mNote that p is an alias for pnpm activated by shadowenv in the CLI repository\n\033[0m"
-pnpm $@
diff --git a/bin/shadowenv/yarn b/bin/shadowenv/yarn
deleted file mode 100755
index fc92d48b7d1..00000000000
--- a/bin/shadowenv/yarn
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-printf "\033[1;32myarn \033[0;32mhas been superseded by \033[1;32mpnpm \033[0;32mso please use that instead.\n\033[0m"
-printf "\033[0;30mCheck out https://github.com/Shopify/cli/pull/870 to understand the rationale behind the move.\n"
-
-"$(brew --prefix)/bin/yarn" "$@"
-