diff --git a/.gitignore b/.gitignore
index 04eefe5..b63587b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,6 @@ devtools-*.tar.gz*
 archbuild
 archco
 archrelease
-archrm
 bash_completion
 checkpkg
 commitpkg
diff --git a/Makefile b/Makefile
index e812936..7ce33f7 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,6 @@ BINPROGS = \
 	commitpkg \
 	archco \
 	archrelease \
-	archrm \
 	archbuild \
 	lddd \
 	finddeps \
diff --git a/archrm.in b/archrm.in
deleted file mode 100644
index 6f4dfc3..0000000
--- a/archrm.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-# License: Unspecified
-
-m4_include(lib/common.sh)
-
-if [[ -z $1 ]]; then
-	echo 'Usage: archrm <path to checkout>'
-	exit 1
-fi
-
-# FIXME: Check if there are uncommited changes
-#pushd $1
-#
-#popd
-
-rm -rf "$1"
diff --git a/zsh_completion.in b/zsh_completion.in
index 3bd4c4d..45429bd 100644
--- a/zsh_completion.in
+++ b/zsh_completion.in
@@ -1,4 +1,4 @@
-#compdef archbuild archco arch-nspawn archrelease archrm commitpkg finddeps makechrootpkg mkarchroot rebuildpkgs extrapkg=commitpkg corepkg=commitpkg testingpkg=commitpkg stagingpkg=commitpkg communitypkg=commitpkg community-testingpkg=commitpkg community-stagingpkg=commitpkg multilibpkg=commitpkg multilib-testingpkg=commitpkg extra-x86_64-build=archbuild testing-x86_64-build=archbuild staging-x86_64-build=archbuild multilib-build=archbuild multilib-testing-build=archbuild multilib-staging-build=archbuild kde-unstable-x86_64-build=archbuild gnome-unstable-x86_64-build=archbuild communityco=archco
+#compdef archbuild archco arch-nspawn archrelease commitpkg finddeps makechrootpkg mkarchroot rebuildpkgs extrapkg=commitpkg corepkg=commitpkg testingpkg=commitpkg stagingpkg=commitpkg communitypkg=commitpkg community-testingpkg=commitpkg community-stagingpkg=commitpkg multilibpkg=commitpkg multilib-testingpkg=commitpkg extra-x86_64-build=archbuild testing-x86_64-build=archbuild staging-x86_64-build=archbuild multilib-build=archbuild multilib-testing-build=archbuild multilib-staging-build=archbuild kde-unstable-x86_64-build=archbuild gnome-unstable-x86_64-build=archbuild communityco=archco
 # License: Unspecified
 
 m4_include(lib/valid-tags.sh)
@@ -23,10 +23,6 @@ _archrelease_args=(
 	"*:arch:($_tags[*])"
 )
 
-_archrm_args=(
-	'1:path:_files -/'
-)
-
 _commitpkg_args=(
 	"-a[Release to a specific architecture only]:arch:($_arch[*])"
 	'-l[Set bandwidth limit]:limit'