remove shell completion

39 files changed, 0 insertions, 2944 deletions

diff --git a/shell-completion/bash/bootctl b/shell-completion/bash/bootctl
deleted file mode 100644
index c86ec7edc9..0000000000
--- a/shell-completion/bash/bootctl
+++ /dev/null
@@ -1,60 +0,0 @@
-# bootctl(1) completion                               -*- shell-script -*-
-#
-# This file is part of systemd.
-#
-# Copyright 2014 Thomas H.P. Andersen
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# systemd is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with systemd; If not, see <http://www.gnu.org/licenses/>.
-
-__contains_word () {
-        local w word=$1; shift
-        for w in "$@"; do
-                [[ $w = "$word" ]] && return
-        done
-}
-
-_bootctl() {
-        local i verb comps
-        local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
-        local -A OPTS=(
-               [STANDALONE]='-h --help --version'
-        )
-
-        if [[ "$cur" = -* ]]; then
-                COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
-                return 0
-        fi
-
-        local -A VERBS=(
-                [STANDALONE]='status'
-        )
-
-        for ((i=0; i < COMP_CWORD; i++)); do
-                if __contains_word "${COMP_WORDS[i]}" ${VERBS[*]}; then
-                        verb=${COMP_WORDS[i]}
-                        break
-                fi
-        done
-
-        if [[ -z $verb ]]; then
-                comps=${VERBS[*]}
-        elif __contains_word "$verb" ${VERBS[STANDALONE]}; then
-                comps=''
-        fi
-
-        COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
-        return 0
-}
-
-complete -F _bootctl bootctl
diff --git a/shell-completion/bash/busctl b/shell-completion/bash/busctl
deleted file mode 100644
index 6a770b1b84..0000000000
--- a/shell-completion/bash/busctl
+++ /dev/null
@@ -1,189 +0,0 @@
-# busctl(1) completion                               -*- shell-script -*-
-#
-# This file is part of systemd.
-#
-# Copyright 2013 Zbigniew Jędrzejewski-Szmek
-# Copyright 2014 Thomas H.P. Andersen
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# systemd is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with systemd; If not, see <http://www.gnu.org/licenses/>.
-
-__contains_word () {
-        local w word=$1; shift
-        for w in "$@"; do
-                [[ $w = "$word" ]] && return
-        done
-}
-
-__get_machines() {
-        local a b
-        machinectl list --no-legend --no-pager | { while read a b; do echo " $a"; done; };
-}
-
-__get_busnames() {
-        local mode=$1
-        local a b
-        busctl $mode list --no-legend --no-pager | { while read a b; do echo " $a"; done; };
-}
-
-__get_objects() {
-        local mode=$1
-        local busname=$2
-        local a b
-        busctl $mode tree --list --no-legend --no-pager $busname | { while read a b; do echo " $a"; done; };
-}
-
-__get_interfaces() {
-        local mode=$1
-        local busname=$2
-        local path=$3
-        local a b
-        busctl $mode introspect --list --no-legend --no-pager $busname $path | { while read a b c; do [[ "$b" == "interface" ]] && echo " $a"; done; };
-}
-
-__get_members() {
-        local mode=$1
-        local busname=$2
-        local path=$3
-        local interface=$4
-        local type=$5
-        local a b
-        busctl $mode introspect --list --no-legend --no-pager $busname $path $interface | sed -e 's/^\.//' | { while read a b c; do [[ "$b" == "$type" ]] && echo " $a"; done; };
-}
-
-__get_signature() {
-        local mode=$1
-        local busname=$2
-        local path=$3
-        local interface=$4
-        local member=$5
-        local a b
-        busctl $mode introspect --list --no-legend --no-pager $busname $path $interface | sed -e 's/^\.//' | { while read a b c d; do [[ "$a" == "$member" ]] && echo " \"$c\""; done; };
-}
-
-_busctl() {
-        local i verb comps mode
-        local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
-        local -A OPTS=(
-               [STANDALONE]='-h --help --version --no-pager --no-legend --system --user
-                             --show-machine --unique --acquired --activatable --list
-                             --quiet --verbose --expect-reply=no --auto-start=no
-                             --allow-interactive-authorization=yes --augment-creds=no'
-                      [ARG]='-H --host -M --machine --address --match --timeout'
-        )
-
-        if __contains_word "--user" ${COMP_WORDS[*]}; then
-                mode=--user
-        else
-                mode=--system
-        fi
-
-        if __contains_word "$prev" ${OPTS[ARG]}; then
-                case $prev in
-                        --host|-H)
-                                comps=$(compgen -A hostname)
-                        ;;
-                        --machine|-M)
-                                comps=$( __get_machines )
-                esac
-                COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
-                return 0
-        fi
-
-        if [[ "$cur" = -* ]]; then
-                COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
-                return 0
-        fi
-
-        local -A VERBS=(
-                [STANDALONE]='list help'
-                [BUSNAME]='status monitor capture tree'
-                [OBJECT]='introspect'
-                [METHOD]='call'
-                [PROPERTY_GET]='get-property'
-                [PROPERTY_SET]='set-property'
-        )
-
-        for ((i=0; i < COMP_CWORD; i++)); do
-                if __contains_word "${COMP_WORDS[i]}" ${VERBS[*]} &&
-                 ! __contains_word "${COMP_WORDS[i-1]}" ${OPTS[ARG]}; then
-                        verb=${COMP_WORDS[i]}
-                        break
-                fi
-        done
-
-        n=$(($COMP_CWORD - $i))
-
-        if [[ -z $verb ]]; then
-                comps=${VERBS[*]}
-        elif __contains_word "$verb" ${VERBS[STANDALONE]}; then
-                comps=''
-        elif __contains_word "$verb" ${VERBS[BUSNAME]}; then
-                comps=$( __get_busnames $mode)
-        elif __contains_word "$verb" ${VERBS[OBJECT]}; then
-                if [[ $n -eq 1 ]] ; then
-                        comps=$( __get_busnames $mode)
-                elif [[ $n -eq 2 ]] ; then
-                        comps=$( __get_objects $mode ${COMP_WORDS[COMP_CWORD-1]})
-                elif [[ $n -eq 3 ]] ; then
-                        comps=$( __get_interfaces $mode ${COMP_WORDS[COMP_CWORD-2]} ${COMP_WORDS[COMP_CWORD-1]})
-                else
-                        comps=''
-                fi
-        elif __contains_word "$verb" ${VERBS[METHOD]}; then
-                if [[ $n -eq 1 ]] ; then
-                        comps=$( __get_busnames $mode)
-                elif [[ $n -eq 2 ]] ; then
-                        comps=$( __get_objects $mode ${COMP_WORDS[COMP_CWORD-1]})
-                elif [[ $n -eq 3 ]] ; then
-                        comps=$( __get_interfaces $mode ${COMP_WORDS[COMP_CWORD-2]} ${COMP_WORDS[COMP_CWORD-1]})
-                elif [[ $n -eq 4 ]] ; then
-                        comps=$( __get_members $mode ${COMP_WORDS[COMP_CWORD-3]} ${COMP_WORDS[COMP_CWORD-2]} ${COMP_WORDS[COMP_CWORD-1]} method)
-                elif [[ $n -eq 5 ]] ; then
-                        comps=$( __get_signature $mode ${COMP_WORDS[COMP_CWORD-4]} ${COMP_WORDS[COMP_CWORD-3]} ${COMP_WORDS[COMP_CWORD-2]} ${COMP_WORDS[COMP_CWORD-1]})
-                else
-                        comps=''
-                fi
-        elif __contains_word "$verb" ${VERBS[PROPERTY_GET]}; then
-                if [[ $n -eq 1 ]] ; then
-                        comps=$( __get_busnames $mode)
-                elif [[ $n -eq 2 ]] ; then
-                        comps=$( __get_objects $mode ${COMP_WORDS[COMP_CWORD-1]})
-                elif [[ $n -eq 3 ]] ; then
-                        comps=$( __get_interfaces $mode ${COMP_WORDS[COMP_CWORD-2]} ${COMP_WORDS[COMP_CWORD-1]})
-                elif [[ $n -eq 4 ]] ; then
-                        comps=$( __get_members $mode ${COMP_WORDS[COMP_CWORD-3]} ${COMP_WORDS[COMP_CWORD-2]} ${COMP_WORDS[COMP_CWORD-1]} property)
-                else
-                        comps=''
-                fi
-        elif __contains_word "$verb" ${VERBS[PROPERTY_SET]}; then
-                if [[ $n -eq 1 ]] ; then
-                        comps=$( __get_busnames $mode)
-                elif [[ $n -eq 2 ]] ; then
-                        comps=$( __get_objects $mode ${COMP_WORDS[COMP_CWORD-1]})
-                elif [[ $n -eq 3 ]] ; then
-                        comps=$( __get_interfaces $mode ${COMP_WORDS[COMP_CWORD-2]} ${COMP_WORDS[COMP_CWORD-1]})
-                elif [[ $n -eq 4 ]] ; then
-                        comps=$( __get_members $mode ${COMP_WORDS[COMP_CWORD-3]} ${COMP_WORDS[COMP_CWORD-2]} ${COMP_WORDS[COMP_CWORD-1]} property)
-                elif [[ $n -eq 5 ]] ; then
-                        comps=$( __get_signature $mode ${COMP_WORDS[COMP_CWORD-4]} ${COMP_WORDS[COMP_CWORD-3]} ${COMP_WORDS[COMP_CWORD-2]} ${COMP_WORDS[COMP_CWORD-1]})
-                else
-                        comps=''
-                fi
-        fi
-
-        COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
-        return 0
-}
-
-complete -F _busctl busctl
diff --git a/shell-completion/bash/coredumpctl b/shell-completion/bash/coredumpctl
deleted file mode 100644
index 6091677506..0000000000
--- a/shell-completion/bash/coredumpctl
+++ /dev/null
@@ -1,85 +0,0 @@
-# coredumpctl(1) completion                       -*- shell-script -*-
-#
-# This file is part of systemd.
-#
-# Copyright 2010 Ran Benita
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# systemd is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with systemd; If not, see <http://www.gnu.org/licenses/>.
-
-__contains_word () {
-        local w word=$1; shift
-        for w in "$@"; do
-                [[ $w = "$word" ]] && return
-        done
-}
-
-__journal_fields=(MESSAGE{,_ID} PRIORITY CODE_{FILE,LINE,FUNC}
-                  ERRNO SYSLOG_{FACILITY,IDENTIFIER,PID} COREDUMP_EXE
-                  _{P,U,G}ID _COMM _EXE _CMDLINE
-                  _AUDIT_{SESSION,LOGINUID}
-                  _SYSTEMD_{CGROUP,SESSION,UNIT,OWNER_UID}
-                  _SELINUX_CONTEXT _SOURCE_REALTIME_TIMESTAMP
-                  _{BOOT,MACHINE}_ID _HOSTNAME _TRANSPORT
-                  _KERNEL_{DEVICE,SUBSYSTEM}
-                  _UDEV_{SYSNAME,DEVNODE,DEVLINK}
-                  __CURSOR __{REALTIME,MONOTONIC}_TIMESTAMP)
-_coredumpctl() {
-        local i verb comps
-        local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
-        local OPTS='-h --help --version --no-pager --no-legend -o --output -F --field -1'
-
-        local -A VERBS=(
-            [LIST]='list'
-            [DUMP]='dump gdb'
-        )
-
-        if __contains_word "$prev" '--output -o'; then
-                comps=$( compgen -A file -- "$cur" )
-                compopt -o filenames
-        elif __contains_word "$prev" '--FIELD -F'; then
-                comps=$( compgen -W '${__journal_fields[*]}' -- "$cur" )
-        elif [[ $cur = -* ]]; then
-                comps=${OPTS}
-        elif __contains_word "$prev" ${VERBS[*]} &&
-           ! __contains_word ${COMP_WORDS[COMP_CWORD-2]} '--output -o -F --field'; then
-                compopt -o nospace
-                COMPREPLY=( $(compgen -W '${__journal_fields[*]}' -S= -- "$cur") )
-               return 0
-        elif [[ $cur = *=* ]]; then
-                mapfile -t field_vals < <(coredumpctl -F "${prev%=}" 2>/dev/null)
-                COMPREPLY=( $(compgen -W '${field_vals[*]}' -- "${cur#=}") )
-                return 0
-        elif [[ $prev = '=' ]]; then
-                mapfile -t field_vals < <(coredumpctl -F "${COMP_WORDS[COMP_CWORD-2]}" 2>/dev/null)
-                comps=${field_vals[*]}
-        else
-                for ((i=0; i <= COMP_CWORD; i++)); do
-                        if __contains_word "${COMP_WORDS[i]}" ${VERBS[*]}; then
-                                verb=${COMP_WORDS[i]}
-                                break
-                        fi
-                done
-
-                if [[ -z $verb ]]; then
-                        comps=${VERBS[*]}
-                elif __contains_word "$verb" ${VERBS[LIST]} ${VERBS[DUMP]}; then
-                        comps=''
-                fi
-        fi
-
-        COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
-        return 0
-}
-
-complete -F _coredumpctl coredumpctl
diff --git a/shell-completion/bash/hostnamectl b/shell-completion/bash/hostnamectl
deleted file mode 100644
index 9ad52e03b4..0000000000
--- a/shell-completion/bash/hostnamectl
+++ /dev/null
@@ -1,64 +0,0 @@
-# hostnamectl(1) completion                               -*- shell-script -*-
-#
-# This file is part of systemd.
-#
-# Copyright 2010 Ran Benita
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# systemd is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with systemd; If not, see <http://www.gnu.org/licenses/>.
-
-__contains_word () {
-        local w word=$1; shift
-        for w in "$@"; do
-                [[ $w = "$word" ]] && return
-        done
-}
-
-_hostnamectl() {
-        local i verb comps
-        local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
-        local OPTS='-h --help --version --transient --static --pretty
-                    --no-ask-password -H --host --machine'
-
-        if [[ $cur = -* ]]; then
-                COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
-                return 0
-        fi
-
-        local -A VERBS=(
-                [STANDALONE]='status'
-                     [ICONS]='set-icon-name'
-                      [NAME]='set-hostname set-deployment'
-                   [CHASSIS]='set-chassis'
-        )
-
-        for ((i=0; i < COMP_CWORD; i++)); do
-                if __contains_word "${COMP_WORDS[i]}" ${VERBS[*]}; then
-                        verb=${COMP_WORDS[i]}
-                        break
-                fi
-        done
-
-        if [[ -z $verb ]]; then
-                comps=${VERBS[*]}
-        elif __contains_word "$verb" ${VERBS[CHASSIS]}; then
-                comps='desktop laptop server tablet handset watch embedded vm container'
-        elif __contains_word "$verb" ${VERBS[STANDALONE]} ${VERBS[ICONS]} ${VERBS[NAME]}; then
-                comps=''
-        fi
-
-        COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
-        return 0
-}
-
-complete -F _hostnamectl hostnamectl
diff --git a/shell-completion/bash/journalctl b/shell-completion/bash/journalctl
deleted file mode 100644
index 1387524a85..0000000000
--- a/shell-completion/bash/journalctl
+++ /dev/null
@@ -1,123 +0,0 @@
-# journalctl(1) completion                                -*- shell-script -*-
-#
-# This file is part of systemd.
-#
-# Copyright 2010 Ran Benita
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# systemd is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with systemd; If not, see <http://www.gnu.org/licenses/>.
-
-__contains_word () {
-        local w word=$1; shift
-        for w in "$@"; do
-                [[ $w = "$word" ]] && return
-        done
-}
-
-__journal_fields=(MESSAGE{,_ID} PRIORITY CODE_{FILE,LINE,FUNC}
-                  ERRNO SYSLOG_{FACILITY,IDENTIFIER,PID} COREDUMP_EXE
-                  _{P,U,G}ID _COMM _EXE _CMDLINE
-                  _AUDIT_{SESSION,LOGINUID}
-                  _SYSTEMD_{CGROUP,SESSION,UNIT,OWNER_UID}
-                  _SELINUX_CONTEXT _SOURCE_REALTIME_TIMESTAMP
-                  _{BOOT,MACHINE}_ID _HOSTNAME _TRANSPORT
-                  _KERNEL_{DEVICE,SUBSYSTEM}
-                  _UDEV_{SYSNAME,DEVNODE,DEVLINK}
-                  __CURSOR __{REALTIME,MONOTONIC}_TIMESTAMP)
-
-__syslog_priorities=(emerg alert crit err warning notice info debug)
-
-_journalctl() {
-        local field_vals= cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
-        local -A OPTS=(
-                [STANDALONE]='-a --all --full --system --user
-                              --disk-usage -f --follow --header
-                              -h --help -l --local --new-id128 -m --merge --no-pager
-                              --no-tail -q --quiet --setup-keys --this-boot --verify
-                              --version --list-catalog --update-catalog --list-boots
-                              --show-cursor --dmesg -k --pager-end -e -r --reverse
-                              --utc -x --catalog --no-full --force --dump-catalog
-                              --flush'
-                       [ARG]='-b --boot --this-boot -D --directory --file -F --field
-                              -o --output -u --unit --user-unit -p --priority'
-                [ARGUNKNOWN]='-c --cursor --interval -n --lines --since --until
-                              --after-cursor --verify-key --identifier
-                              --root --machine'
-        )
-
-        if __contains_word "$prev" ${OPTS[ARG]} ${OPTS[ARGUNKNOWN]}; then
-                case $prev in
-                        --boot|--this-boot|-b)
-                                comps=$(journalctl -F '_BOOT_ID' 2>/dev/null)
-                        ;;
-                        --directory|-D)
-                                comps=$(compgen -d -- "$cur")
-                                compopt -o filenames
-                        ;;
-                        --file)
-                                comps=$(compgen -f -- "$cur")
-                                compopt -o filenames
-                        ;;
-                        --output|-o)
-                                comps='short short-iso short-precise short-monotonic verbose export json json-pretty json-sse cat'
-                        ;;
-                        --field|-F)
-                                comps=${__journal_fields[*]}
-                        ;;
-                        --priority|-p)
-                                comps=${__syslog_priorities[*]}
-                        ;;
-                        --unit|-u)
-                                comps=$(journalctl -F '_SYSTEMD_UNIT' 2>/dev/null)
-                        ;;
-                        --user-unit)
-                                comps=$(journalctl -F '_SYSTEMD_USER_UNIT' 2>/dev/null)
-                        ;;
-                        *)
-                                return 0
-                        ;;
-                esac
-                COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
-                return 0
-        fi
-
-        if [[ $cur = -* ]]; then
-                COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
-                return 0
-        elif [[ $cur = *=* ]]; then
-                mapfile -t field_vals < <(journalctl -F "${prev%=}" 2>/dev/null)
-                COMPREPLY=( $(compgen -W '${field_vals[*]}' -- "${cur#=}") )
-        elif [[ $cur = /dev* ]]; then
-                compopt -o filenames
-                COMPREPLY=( $(compgen -f -- "${cur}") )
-        elif [[ $cur = /* ]]; then
-                # Append /dev/ to the list of completions, so that
-                # after typing /<TAB><TAB> the user sees /dev/ as one
-                # of the alternatives. Later on the rule above will
-                # take care of showing device files in /dev/.
-                mapfile -t field_vals < <(journalctl -F "_EXE" 2>/dev/null; echo '/dev/')
-                COMPREPLY=( $(compgen -W '${field_vals[*]}' -- "${cur}") )
-                if [[ "${COMPREPLY[@]}" = '/dev/' ]]; then
-                    compopt -o filenames
-                    COMPREPLY=( $(compgen -f -- "${cur}") )
-                fi
-        elif [[ $prev = '=' ]]; then
-                mapfile -t field_vals < <(journalctl -F "${COMP_WORDS[COMP_CWORD-2]}" 2>/dev/null)
-                COMPREPLY=( $(compgen -W '${field_vals[*]}' -- "$cur") )
-        else
-                compopt -o nospace
-                COMPREPLY=( $(compgen -W '${__journal_fields[*]}' -S= -- "$cur") )
-        fi
-}
-
-complete -F _journalctl journalctl
diff --git a/shell-completion/bash/kernel-install b/shell-completion/bash/kernel-install
deleted file mode 100644
index 7cd2494cf7..0000000000
--- a/shell-completion/bash/kernel-install
+++ /dev/null
@@ -1,50 +0,0 @@
-# kernel-install(8) completion                                   -*- shell-script -*-
-#
-# This file is part of systemd.
-#
-# Copyright 2013 Kay Sievers
-# Copyright 2013 Harald Hoyer
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# systemd is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with systemd; If not, see <http://www.gnu.org/licenses/>.
-
-_kernel_install() {
-        local comps
-        local MACHINE_ID
-        local cur=${COMP_WORDS[COMP_CWORD]}
-
-        case $COMP_CWORD in
-            1)
-                comps="add remove"
-                ;;
-            2)
-                comps=$(cd /lib/modules; echo [0-9]*)
-                if [[ ${COMP_WORDS[1]} == "remove" ]] && [[ -f /etc/machine-id ]]; then
-                    read MACHINE_ID < /etc/machine-id
-                    if [[ $MACHINE_ID ]] && ( [[ -d /boot/$MACHINE_ID ]] || [[ -L /boot/$MACHINE_ID ]] ); then
-                        comps=$(cd "/boot/$MACHINE_ID"; echo [0-9]*)
-                    fi
-                fi
-                ;;
-            3)
-                [[ "$cur" ]] || cur=/boot/vmlinuz-${COMP_WORDS[2]}
-                comps=$(compgen -f -- "$cur")
-                compopt -o filenames
-                ;;
-        esac
-
-        COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
-        return 0
-}
-
-complete -F _kernel_install kernel-install
diff --git a/shell-completion/bash/localectl b/shell-completion/bash/localectl
deleted file mode 100644
index e0c06a794e..0000000000
--- a/shell-completion/bash/localectl
+++ /dev/null
@@ -1,92 +0,0 @@
-# localectl(1) completion                                 -*- shell-script -*-
-#
-# This file is part of systemd.
-#
-# Copyright 2010 Ran Benita
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# systemd is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with systemd; If not, see <http://www.gnu.org/licenses/>.
-
-__contains_word () {
-        local w word=$1; shift
-        for w in "$@"; do
-                [[ $w = "$word" ]] && return
-        done
-}
-
-__locale_fields=( LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME \
-                  LC_COLLATE LC_MONETARY LC_MESSAGES LC_PAPER \
-                  LC_NAME LC_ADDRESS LC_TELEPHONE \
-                  LC_MEASUREMENT LC_IDENTIFICATION )
-# LC_ALL is omitted on purpose
-
-_localectl() {
-        local i verb comps locale_vals
-        local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
-        local OPTS='-h --help --version --no-convert --no-pager --no-ask-password
-                    -H --host --machine'
-
-        if __contains_word "$prev" $OPTS; then
-                case $prev in
-                        --host|-H)
-                                comps=''
-                        ;;
-                esac
-                COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
-                return 0
-        fi
-
-        if [[ $cur = -* ]]; then
-                COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
-                return 0
-        fi
-
-        local -A VERBS=(
-               [STANDALONE]='status list-locales list-keymaps'
-                  [LOCALES]='set-locale'
-                  [KEYMAPS]='set-keymap'
-                      [X11]='set-x11-keymap'
-        )
-
-        for ((i=0; i < COMP_CWORD; i++)); do
-                if __contains_word "${COMP_WORDS[i]}" ${VERBS[*]}; then
-                        verb=${COMP_WORDS[i]}
-                        break
-                fi
-        done
-
-        if [[ -z $verb ]]; then
-                comps=${VERBS[*]}
-        elif __contains_word "$verb" ${VERBS[LOCALES]}; then
-                if [[ $cur = *=* ]]; then
-                        mapfile -t locale_vals < <(command localectl list-locales 2>/dev/null)
-                        COMPREPLY=( $(compgen -W '${locale_vals[*]}' -- "${cur#=}") )
-                elif [[ $prev = "=" ]]; then
-                        mapfile -t locale_vals < <(command localectl list-locales 2>/dev/null)
-                        COMPREPLY=( $(compgen -W '${locale_vals[*]}' -- "$cur") )
-                else
-                        compopt -o nospace
-                        COMPREPLY=( $(compgen -W '${__locale_fields[*]}' -S= -- "$cur") )
-                fi
-                return 0
-        elif __contains_word "$verb" ${VERBS[KEYMAPS]}; then
-                comps=$(command localectl list-keymaps)
-        elif __contains_word "$verb" ${VERBS[STANDALONE]} ${VERBS[X11]}; then
-                comps=''
-        fi
-
-        COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
-        return 0
-}
-
-complete -F _localectl localectl
diff --git a/shell-completion/bash/machinectl b/shell-completion/bash/machinectl
deleted file mode 100644
index 3789492d72..0000000000
--- a/shell-completion/bash/machinectl
+++ /dev/null
@@ -1,97 +0,0 @@
-# machinectl(1) completion                      -*- shell-script -*-
-#
-# This file is part of systemd.
-#
-# Copyright 2014 Thomas H.P. Andersen
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# systemd is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with systemd; If not, see <http://www.gnu.org/licenses/>.
-
-__contains_word() {
-        local w word=$1; shift
-        for w in "$@"; do
-                [[ $w = "$word" ]] && return
-        done
-}
-
-__get_machines() {
-        local a b
-        machinectl list --no-legend --no-pager | { while read a b; do echo " $a"; done; };
-}
-
-_machinectl() {
-        local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
-        local i verb comps
-
-        local -A OPTS=(
-               [STANDALONE]='--all -a --full --help -h --no-ask-password --no-legend --no-pager --version'
-                      [ARG]='--host -H --kill-who -M --machine --property -p --signal -s'
-        )
-
-        local -A VERBS=(
-               [STANDALONE]='list'
-                 [MACHINES]='status show terminate kill reboot login'
-        )
-
-        _init_completion || return
-
-        for ((i=0; i <= COMP_CWORD; i++)); do
-                if __contains_word "${COMP_WORDS[i]}" ${VERBS[*]} &&
-                 ! __contains_word "${COMP_WORDS[i-1]}" ${OPTS[ARG]}; then
-                        verb=${COMP_WORDS[i]}
-                        break
-                fi
-        done
-
-        if __contains_word "$prev" ${OPTS[ARG]}; then
-                case $prev in
-                        --signal|-s)
-                                comps=$(compgen -A signal)
-                        ;;
-                        --kill-who)
-                                comps='all leader'
-                        ;;
-                        --host|-H)
-                                comps=$(compgen -A hostname)
-                        ;;
-                        --machine|-M)
-                                comps=$( __get_machines )
-                        ;;
-                        --property|-p)
-                                comps=''
-                        ;;
-                esac
-                COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
-                return 0
-        fi
-
-        if [[ "$cur" = -* ]]; then
-                COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
-                return 0
-        fi
-
-        if [[ -z $verb ]]; then
-                comps=${VERBS[*]}
-
-        elif __contains_word "$verb" ${VERBS[STANDALONE]}; then
-                comps=''
-
-        elif __contains_word "$verb" ${VERBS[MACHINES]}; then
-                comps=$( __get_machines )
-        fi
-
-        COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
-        return 0
-}
-
-complete -F _machinectl machinectl
diff --git a/shell-completion/bash/systemctl.in b/shell-completion/bash/systemctl.in
deleted file mode 100644
index 8063316ec6..0000000000
--- a/shell-completion/bash/systemctl.in
+++ /dev/null
@@ -1,267 +0,0 @@
-# systemctl(1) completion                                 -*- shell-script -*-
-#
-# This file is part of systemd.
-#
-# Copyright 2010 Ran Benita
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# systemd is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with systemd; If not, see <http://www.gnu.org/licenses/>.
-
-__systemctl() {
-        local mode=$1; shift 1
-        systemctl $mode --full --no-legend "$@"
-}
-
-__systemd_properties() {
-        local mode=$1
-        { __systemctl $mode show --all;
-         @rootlibexecdir@/systemd --dump-configuration-items; } |
-        while IFS='=' read -r key value; do
-            [[ $value ]] && echo "$key"
-        done
-}
-
-__contains_word () {
-        local w word=$1; shift
-        for w in "$@"; do
-                [[ $w = "$word" ]] && return
-        done
-}
-
-__filter_units_by_property () {
-        local mode=$1 property=$2 value=$3 ; shift 3
-        local units=("$@")
-        local props
-        IFS=$'\n' read -rd '' -a props < \
-            <(__systemctl $mode show --property "$property" -- "${units[@]}")
-        for ((i=0; $i < ${#units[*]}; i++)); do
-                if [[ "${props[i]}" = "$property=$value" ]]; then
-                        echo " ${units[i]}"
-                fi
-        done
-}
-
-__get_all_units      () { { __systemctl $1 list-unit-files; __systemctl $1 list-units --all; } \
-        | { while read -r a b; do [[ $a =~ @\. ]] || echo " $a"; done; }; }
-__get_template_names () { __systemctl $1 list-unit-files \
-        | { while read -r a b; do [[ $a =~ @\. ]] && echo " ${a%%@.*}@"; done; }; }
-
-__get_active_units   () { __systemctl $1 list-units       \
-        | { while read -r a b; do echo " $a"; done; }; }
-__get_startable_units () {
-        # find startable inactive units
-        __filter_units_by_property $mode ActiveState inactive $(
-            __filter_units_by_property $mode CanStart yes $(
-                __systemctl $mode list-unit-files --state enabled,disabled,static | \
-                    { while read -r a b; do [[ $a =~ @\. ]] || echo " $a"; done; }
-                __systemctl $mode list-units --state inactive,failed | \
-                    { while read -r a b; do echo " $a"; done; } ))
-}
-__get_restartable_units () {
-        # filter out masked and not-found
-        __filter_units_by_property $mode CanStart yes $(
-            __systemctl $mode list-unit-files --state enabled,disabled,static | \
-                    { while read -r a b; do [[ $a =~ @\. ]] || echo " $a"; done; }
-            __systemctl $mode list-units | \
-                    { while read -r a b; do echo " $a"; done; } )
-}
-__get_failed_units   () { __systemctl $1 list-units       \
-        | { while read -r a b c d; do [[ $c == "failed"   ]] && echo " $a"; done; }; }
-__get_enabled_units  () { __systemctl $1 list-unit-files  \
-        | { while read -r a b c  ; do [[ $b == "enabled"  ]] && echo " $a"; done; }; }
-__get_disabled_units () { __systemctl $1 list-unit-files  \
-        | { while read -r a b c  ; do [[ $b == "disabled" ]] && echo " $a"; done; }; }
-__get_masked_units   () { __systemctl $1 list-unit-files  \
-        | { while read -r a b c  ; do [[ $b == "masked"   ]] && echo " $a"; done; }; }
-__get_all_unit_files () { { __systemctl $1 list-unit-files; } | { while read -r a b; do echo " $a"; done; }; }
-
-_systemctl () {
-        local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
-        local i verb comps mode
-
-        local -A OPTS=(
-               [STANDALONE]='--all -a --reverse --after --before --defaults --fail --ignore-dependencies --failed --force -f --full -l --global
-                             --help -h --no-ask-password --no-block --no-legend --no-pager --no-reload --no-wall
-                             --quiet -q --privileged -P --system --user --version --runtime --recursive -r'
-                      [ARG]='--host -H --kill-who --property -p --signal -s --type -t --state --root'
-        )
-
-        if __contains_word "--user" ${COMP_WORDS[*]}; then
-            mode=--user
-        else
-            mode=--system
-        fi
-
-        if __contains_word "$prev" ${OPTS[ARG]}; then
-                case $prev in
-                        --signal|-s)
-                                comps=$(compgen -A signal)
-                        ;;
-                        --type|-t)
-                                comps='automount busname device mount path service snapshot socket swap target timer'
-                        ;;
-                        --state)
-                                comps='loaded not-found stub
-                                       active inactive
-                                       dead elapsed exited listening mounted plugged running waiting'
-                        ;;
-                        --kill-who)
-                                comps='all control main'
-                        ;;
-                        --root)
-                                comps=$(compgen -A directory -- "$cur" )
-                                compopt -o filenames
-                        ;;
-                        --host|-H)
-                                comps=$(compgen -A hostname)
-                        ;;
-                        --property|-p)
-                                comps=$(__systemd_properties $mode)
-                        ;;
-                esac
-                COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
-                return 0
-        fi
-
-        if [[ "$cur" = -* ]]; then
-                COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
-                return 0
-        fi
-
-        local -A VERBS=(
-                [ALL_UNITS]='is-active is-failed is-enabled status show cat mask preset help list-dependencies edit'
-            [ENABLED_UNITS]='disable'
-           [DISABLED_UNITS]='enable'
-        [REENABLABLE_UNITS]='reenable'
-             [FAILED_UNITS]='reset-failed'
-          [STARTABLE_UNITS]='start'
-          [STOPPABLE_UNITS]='stop condstop kill try-restart condrestart'
-         [ISOLATABLE_UNITS]='isolate'
-         [RELOADABLE_UNITS]='reload condreload reload-or-try-restart force-reload'
-        [RESTARTABLE_UNITS]='restart reload-or-restart'
-         [TARGET_AND_UNITS]='add-wants add-requires'
-             [MASKED_UNITS]='unmask'
-                     [JOBS]='cancel'
-                [SNAPSHOTS]='delete'
-                     [ENVS]='set-environment unset-environment'
-               [STANDALONE]='daemon-reexec daemon-reload default
-                             emergency exit halt hibernate hybrid-sleep kexec list-jobs
-                             list-sockets list-timers list-units list-unit-files poweroff
-                             reboot rescue show-environment suspend get-default
-                             is-system-running'
-                     [NAME]='snapshot'
-                     [FILE]='link'
-                  [TARGETS]='set-default'
-        )
-
-        for ((i=0; i < COMP_CWORD; i++)); do
-                if __contains_word "${COMP_WORDS[i]}" ${VERBS[*]} &&
-                 ! __contains_word "${COMP_WORDS[i-1]}" ${OPTS[ARG]}; then
-                        verb=${COMP_WORDS[i]}
-                        break
-                fi
-        done
-
-        if [[ -z $verb ]]; then
-                comps="${VERBS[*]}"
-
-        elif __contains_word "$verb" ${VERBS[ALL_UNITS]}; then
-                comps=$( __get_all_units $mode )
-                compopt -o filenames
-
-        elif __contains_word "$verb" ${VERBS[ENABLED_UNITS]}; then
-                comps=$( __get_enabled_units $mode )
-                compopt -o filenames
-
-        elif __contains_word "$verb" ${VERBS[DISABLED_UNITS]}; then
-                comps=$( __get_disabled_units $mode;
-                        __get_template_names $mode)
-                compopt -o filenames
-
-        elif __contains_word "$verb" ${VERBS[REENABLABLE_UNITS]}; then
-                comps=$( __get_disabled_units $mode;
-                         __get_enabled_units $mode;
-                         __get_template_names $mode)
-                compopt -o filenames
-
-        elif __contains_word "$verb" ${VERBS[STARTABLE_UNITS]}; then
-                comps=$( __get_startable_units $mode;
-                         __get_template_names $mode)
-                compopt -o filenames
-
-        elif __contains_word "$verb" ${VERBS[RESTARTABLE_UNITS]}; then
-                comps=$( __get_restartable_units $mode;
-                         __get_template_names $mode)
-                compopt -o filenames
-
-        elif __contains_word "$verb" ${VERBS[STOPPABLE_UNITS]}; then
-                comps=$( __filter_units_by_property $mode CanStop yes \
-                      $( __get_active_units $mode ) )
-                compopt -o filenames
-
-        elif __contains_word "$verb" ${VERBS[RELOADABLE_UNITS]}; then
-                comps=$( __filter_units_by_property $mode CanReload yes \
-                      $( __get_active_units $mode ) )
-                compopt -o filenames
-
-        elif __contains_word "$verb" ${VERBS[ISOLATABLE_UNITS]}; then
-                comps=$( __filter_units_by_property $mode AllowIsolate yes \
-                      $( __get_all_units $mode ) )
-                compopt -o filenames
-
-        elif __contains_word "$verb" ${VERBS[FAILED_UNITS]}; then
-                comps=$( __get_failed_units $mode )
-                compopt -o filenames
-
-        elif __contains_word "$verb" ${VERBS[MASKED_UNITS]}; then
-                comps=$( __get_masked_units $mode )
-                compopt -o filenames
-
-        elif __contains_word "$verb" ${VERBS[TARGET_AND_UNITS]}; then
-                if __contains_word "$prev" ${VERBS[TARGET_AND_UNITS]} \
-                || __contains_word "$prev" ${OPTS[STANDALONE]}; then
-                        comps=$( __systemctl $mode list-unit-files --type target --all \
-                        | { while read -r a b; do echo " $a"; done; } )
-                else
-                        comps=$( __get_all_unit_files $mode )
-                fi
-                compopt -o filenames
-
-        elif __contains_word "$verb" ${VERBS[STANDALONE]} ${VERBS[NAME]}; then
-                comps=''
-
-        elif __contains_word "$verb" ${VERBS[JOBS]}; then
-                comps=$( __systemctl $mode list-jobs | { while read -r a b; do echo " $a"; done; } )
-
-        elif __contains_word "$verb" ${VERBS[SNAPSHOTS]}; then
-                comps=$( __systemctl $mode list-units --type snapshot --full --all \
-                        | { while read -r a b; do echo " $a"; done; } )
-
-        elif __contains_word "$verb" ${VERBS[ENVS]}; then
-                comps=$( __systemctl $mode show-environment \
-                    | while read -r line; do echo " ${line%%=*}=";done )
-                compopt -o nospace
-
-        elif __contains_word "$verb" ${VERBS[FILE]}; then
-                comps=$( compgen -A file -- "$cur" )
-                compopt -o filenames
-        elif __contains_word "$verb" ${VERBS[TARGETS]}; then
-                comps=$( __systemctl $mode list-unit-files --type target --full --all \
-                        | { while read -r a b; do echo " $a"; done; } )
-        fi
-
-        COMPREPLY=( $(compgen -o filenames -W '$comps' -- "$cur") )
-        return 0
-}
-
-complete -F _systemctl systemctl
diff --git a/shell-completion/bash/systemd-analyze b/shell-completion/bash/systemd-analyze
deleted file mode 100644
index 00947029c6..0000000000
--- a/shell-completion/bash/systemd-analyze
+++ /dev/null
@@ -1,117 +0,0 @@
-# systemd-analyze(1) completion                      -*- shell-script -*-
-#
-# This file is part of systemd.
-#
-# Copyright 2010 Ran Benita
-# Copyright 2013 Harald Hoyer
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# systemd is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with systemd; If not, see <http://www.gnu.org/licenses/>.
-
-__contains_word () {
-        local w word=$1; shift
-        for w in "$@"; do
-                [[ $w = "$word" ]] && return
-        done
-}
-
-__get_machines() {
-        local a b
-        machinectl list --no-legend --no-pager | { while read a b; do echo " $a"; done; };
-}
-
-_systemd_analyze() {
-        local i verb comps
-        local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
-
-        local -A OPTS=(
-               [STANDALONE]='--help --version --system --user --from-pattern --to-pattern --order --require --no-pager'
-                      [ARG]='-H --host -M --machine --fuzz --man'
-        )
-
-        local -A VERBS=(
-                [STANDALONE]='time blame plot dump'
-                [CRITICAL_CHAIN]='critical-chain'
-                [DOT]='dot'
-                [LOG_LEVEL]='set-log-level'
-                [VERIFY]='verify'
-        )
-
-        _init_completion || return
-
-        for ((i=0; i < COMP_CWORD; i++)); do
-                if __contains_word "${COMP_WORDS[i]}" ${VERBS[*]} &&
-                 ! __contains_word "${COMP_WORDS[i-1]}" ${OPTS[ARG]}; then
-                        verb=${COMP_WORDS[i]}
-                        break
-                fi
-        done
-
-        if __contains_word "$prev" ${OPTS[ARG]}; then
-                case $prev in
-                        --host|-H)
-                                comps=$(compgen -A hostname)
-                        ;;
-                        --machine|-M)
-                                comps=$( __get_machines )
-                        ;;
-                esac
-                COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
-                return 0
-        fi
-
-        if [[ -z $verb  && $cur = -* ]]; then
-                COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
-                return 0
-        fi
-
-        if [[ -z $verb ]]; then
-                comps=${VERBS[*]}
-
-        elif __contains_word "$verb" ${VERBS[STANDALONE]}; then
-                if [[ $cur = -* ]]; then
-                        comps='--help --version --system --user'
-                fi
-
-        elif __contains_word "$verb" ${VERBS[CRITICAL_CHAIN]}; then
-                if [[ $cur = -* ]]; then
-                        comps='--help --version --system --user --fuzz'
-                fi
-
-        elif __contains_word "$verb" ${VERBS[DOT]}; then
-                if [[ $cur = -* ]]; then
-                        comps='--help --version --system --user --from-pattern --to-pattern --order --require'
-                fi
-
-        elif __contains_word "$verb" ${VERBS[LOG_LEVEL]}; then
-                if [[ $cur = -* ]]; then
-                        comps='--help --version --system --user'
-                else
-                        comps='debug info notice warning err crit alert emerg'
-                fi
-
-        elif __contains_word "$verb" ${VERBS[VERIFY]}; then
-                if [[ $cur = -* ]]; then
-                        comps='--help --version --system --user --no-man'
-                else
-                        comps=$( compgen -A file -- "$cur" )
-                        compopt -o filenames
-                fi
-
-        fi
-
-        COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
-        return 0
-}
-
-complete -F _systemd_analyze systemd-analyze
diff --git a/shell-completion/bash/systemd-cat b/shell-completion/bash/systemd-cat
deleted file mode 100644
index 8d84042af1..0000000000
--- a/shell-completion/bash/systemd-cat
+++ /dev/null
@@ -1,57 +0,0 @@
-# systemd-cat(1) completion                  -*- shell-script -*-
-#
-# This file is part of systemd.
-#
-# Copyright 2014 Thomas H.P. Andersen
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# systemd is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with systemd; If not, see <http://www.gnu.org/licenses/>.
-
-__contains_word() {
-        local w word=$1; shift
-        for w in "$@"; do
-                [[ $w = "$word" ]] && return
-        done
-}
-
-_systemd_cat() {
-        local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
-        local i verb comps
-
-        local -A OPTS=(
-               [STANDALONE]='-h --help --version'
-                      [ARG]='-t --identifier -p --priority --level-prefix'
-        )
-
-        _init_completion || return
-
-        if __contains_word "$prev" ${OPTS[ARG]}; then
-                case $prev in
-                        --identifier|-t)
-                                comps=''
-                        ;;
-                        --priority|-p)
-                                comps='emerg alert crit err warning notice info debug'
-                        ;;
-                        --level-prefix)
-                                comps='yes no'
-                        ;;
-                esac
-                COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
-                return 0
-        fi
-
-        COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
-}
-
-complete -F _systemd_cat systemd-cat
diff --git a/shell-completion/bash/systemd-cgls b/shell-completion/bash/systemd-cgls
deleted file mode 100644
index 0570438660..0000000000
--- a/shell-completion/bash/systemd-cgls
+++ /dev/null
@@ -1,56 +0,0 @@
-# systemd-cgls(1) completion                  -*- shell-script -*-
-#
-# This file is part of systemd.
-#
-# Copyright 2014 Thomas H.P. Andersen
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# systemd is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with systemd; If not, see <http://www.gnu.org/licenses/>.
-
-__contains_word() {
-        local w word=$1; shift
-        for w in "$@"; do
-                [[ $w = "$word" ]] && return
-        done
-}
-
-__get_machines() {
-        local a b
-        machinectl list --no-legend --no-pager | { while read a b; do echo " $a"; done; };
-}
-
-_systemd_cgls() {
-        local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
-        local i verb comps
-
-        local -A OPTS=(
-               [STANDALONE]='-h --help --version --all -l --full -k --no-pager'
-                      [ARG]='-M --machine'
-        )
-
-        _init_completion || return
-
-        if __contains_word "$prev" ${OPTS[ARG]}; then
-                case $prev in
-                        --machine|-M)
-                                comps=$( __get_machines )
-                        ;;
-                esac
-                COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
-                return 0
-        fi
-
-        COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
-}
-
-complete -F _systemd_cgls systemd-cgls
diff --git a/shell-completion/bash/systemd-cgtop b/shell-completion/bash/systemd-cgtop
deleted file mode 100644
index 50464990ab..0000000000
--- a/shell-completion/bash/systemd-cgtop
+++ /dev/null
@@ -1,41 +0,0 @@
-# systemd-cgtop(1) completion                  -*- shell-script -*-
-#
-# This file is part of systemd.
-#
-# Copyright 2014 Thomas H.P. Andersen
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# systemd is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with systemd; If not, see <http://www.gnu.org/licenses/>.
-
-__contains_word() {
-        local w word=$1; shift
-        for w in "$@"; do
-                [[ $w = "$word" ]] && return
-        done
-}
-
-_systemd_cgtop() {
-        local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
-        local comps
-
-        local -A OPTS=(
-               [STANDALONE]='-h --help --version -p -t -c -m -i -b --batch -n --iterations -d --delay'
-               [ARG]='--cpu --depth'
-               )
-
-        _init_completion || return
-
-        COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
-}
-
-complete -F _systemd_cgtop systemd-cgtop
diff --git a/shell-completion/bash/systemd-delta b/shell-completion/bash/systemd-delta
deleted file mode 100644
index cb1732895f..0000000000
--- a/shell-completion/bash/systemd-delta
+++ /dev/null
@@ -1,61 +0,0 @@
-# systemd-delta(1) completion                      -*- shell-script -*-
-#
-# This file is part of systemd.
-#
-# Copyright 2014 Thomas H.P. Andersen
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# systemd is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with systemd; If not, see <http://www.gnu.org/licenses/>.
-
-__contains_word() {
-        local w word=$1; shift
-        for w in "$@"; do
-                [[ $w = "$word" ]] && return
-        done
-}
-
-_systemd-delta() {
-        local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
-        local comps
-
-        local -A OPTS=(
-               [STANDALONE]='--help -h --no-pager --version'
-                      [ARG]='--diff --type -t'
-        )
-
-        _init_completion || return
-
-
-        if __contains_word "$prev" ${OPTS[ARG]}; then
-                case $prev in
-                        --diff)
-                                comps='yes no'
-                        ;;
-                        --type|-t)
-                                comps='masked equivalent redirected overridden unchanged extended default'
-                        ;;
-                esac
-                COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
-                return 0
-        fi
-
-        if [[ "$cur" = -* ]]; then
-                COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
-                return 0
-        fi
-
-        COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
-        return 0
-}
-
-complete -F _systemd-delta systemd-delta
diff --git a/shell-completion/bash/systemd-detect-virt b/shell-completion/bash/systemd-detect-virt
deleted file mode 100644
index df06c29841..0000000000
--- a/shell-completion/bash/systemd-detect-virt
+++ /dev/null
@@ -1,40 +0,0 @@
-# systemd-detect-virt(1) completion             -*- shell-script -*-
-#
-# This file is part of systemd.
-#
-# Copyright 2014 Thomas H.P. Andersen
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# systemd is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with systemd; If not, see <http://www.gnu.org/licenses/>.
-
-__contains_word() {
-        local w word=$1; shift
-        for w in "$@"; do
-                [[ $w = "$word" ]] && return
-        done
-}
-
-_systemd_detect_virt() {
-        local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
-        local i verb comps
-
-        local -A OPTS=(
-               [STANDALONE]='-h --help --version -c --container -v --vm -q --quiet'
-        )
-
-        _init_completion || return
-
-        COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
-}
-
-complete -F _systemd_detect_virt systemd-detect-virt
diff --git a/shell-completion/bash/systemd-nspawn b/shell-completion/bash/systemd-nspawn
deleted file mode 100644
index 83e34ef02e..0000000000
--- a/shell-completion/bash/systemd-nspawn
+++ /dev/null
@@ -1,143 +0,0 @@
-# systemd-nspawn(1) completion                  -*- shell-script -*-
-#
-# This file is part of systemd.
-#
-# Copyright 2014 Thomas H.P. Andersen
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# systemd is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with systemd; If not, see <http://www.gnu.org/licenses/>.
-
-__contains_word() {
-        local w word=$1; shift
-        for w in "$@"; do
-                [[ $w = "$word" ]] && return
-        done
-}
-
-__get_users() {
-        local a b
-        loginctl list-users --no-legend --no-pager | { while read a b; do echo " $b"; done; };
-}
-
-__get_slices() {
-        local a b
-        systemctl list-units -t slice --no-legend --no-pager | { while read a b; do echo " $a"; done; };
-}
-
-__get_machines() {
-        local a b
-        machinectl list --no-legend --no-pager | { while read a b; do echo " $a"; done; };
-}
-
-__get_env() {
-        local a
-        env | { while read a; do echo " ${a%%=*}"; done; };
-}
-
-__get_interfaces(){
-    cut -f 1 -d ' ' /proc/net/dev | tail -n +3 | tr -s '\n' | tr -d ':' | xargs
-}
-
-_systemd_nspawn() {
-        local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
-        local i verb comps
-
-        local -A OPTS=(
-               [STANDALONE]='-h --help --version --private-network -b --boot --read-only -q --quiet --share-system --keep-unit --network-veth -j'
-                      [ARG]='-D --directory -u --user --uuid --capability --drop-capability --link-journal --bind --bind-ro -M --machine
-                             -S --slice --setenv -Z --selinux-context -L --selinux-apifs-context --register --network-interface --network-bridge
-                             --personality -i --image --tmpfs --volatile
-                             --network-macvlan'
-        )
-
-        _init_completion || return
-
-        if __contains_word "$prev" ${OPTS[ARG]}; then
-                case $prev in
-                        --directory|-D)
-                                compopt -o nospace
-                                comps=$(compgen -S/ -A directory -- "$cur" )
-                        ;;
-                        --user|-u)
-                                comps=$( __get_users )
-                        ;;
-                        --uuid)
-                                comps=''
-                        ;;
-                        --capability)
-                                comps='CAP_BLOCK_SUSPEND CAP_IPC_LOCK CAP_MAC_ADMIN CAP_MAC_OVERRIDE CAP_SYS_MODULE CAP_SYS_PACCT CAP_SYS_RAWIO
-                                       CAP_SYS_TIME CAP_SYSLOG CAP_WAKE_ALARM CAP_NET_ADMIN'
-                        ;;
-                        --drop-capability)
-                                comps='CAP_AUDIT_CONTROL CAP_AUDIT_WRITE CAP_CHOWN CAP_DAC_OVERRIDE CAP_DAC_READ_SEARCH CAP_FOWNER CAP_FSETID
-                                       CAP_IPC_OWNER CAP_KILL CAP_LEASE CAP_LINUX_IMMUTABLE CAP_MKNOD CAP_NET_ADMIN CAP_NET_BIND_SERVICE
-                                       CAP_NET_BROADCAST CAP_NET_RAW CAP_SETFCAP CAP_SETGID CAP_SETPCAP CAP_SETUID CAP_SYS_ADMIN CAP_SYS_BOOT
-                                       CAP_SYS_CHROOT CAP_SYS_NICE CAP_SYS_PTRACE CAP_SYS_RESOURCE CAP_SYS_TTY_CONFIG'
-                        ;;
-                        --link-journal)
-                                comps='no auto guest host'
-                        ;;
-                        --bind|--bind-ro)
-                                compopt -o nospace
-                                comps=$(compgen -S/ -A directory -- "$cur" )
-                        ;;
-                        --tmpfs)
-                                compopt -o nospace
-                                comps=$(compgen -S/ -A directory -- "$cur" )
-                        ;;
-                        --machine|-M)
-                                comps=$( __get_machines )
-                        ;;
-                        --slice|-S)
-                                comps=$( __get_slices )
-                        ;;
-                        --setenv)
-                                comps=$( __get_env )
-                        ;;
-                        --selinux-context|-Z)
-                                comps=''
-                        ;;
-                        --selinux-apifs-context|-L)
-                                comps=''
-                        ;;
-                        --register)
-                                comps='yes no'
-                        ;;
-                        --network-interface)
-                                comps=$(__get_interfaces)
-                        ;;
-                        --network-bridge)
-                                comps=''
-                        ;;
-                        --network-macvlan)
-                                comps=''
-                        ;;
-                        --personality)
-                                comps='x86 x86-64'
-                        ;;
-                        --volatile)
-                                comps='yes state no'
-                        ;;
-                        --image|-i)
-                                compopt -o nospace
-                                comps=$( compgen -A file -- "$cur" )
-                        ;;
-                esac
-                COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
-                return 0
-        fi
-
-        COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
-}
-
-complete -F _systemd_nspawn systemd-nspawn
diff --git a/shell-completion/bash/systemd-run b/shell-completion/bash/systemd-run
deleted file mode 100644
index 712655caf4..0000000000
--- a/shell-completion/bash/systemd-run
+++ /dev/null
@@ -1,101 +0,0 @@
-# systemd-run(1) completion                       -*- shell-script -*-
-#
-# This file is part of systemd.
-#
-# Copyright 2013 Zbigniew Jędrzejewski-Szmek
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# systemd is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with systemd; If not, see <http://www.gnu.org/licenses/>.
-
-__systemctl() {
-        local mode=$1; shift 1
-        systemctl $mode --full --no-legend "$@"
-}
-
-__get_slice_units () { __systemctl $1 list-units --all -t slice \
-        | { while read -r a b c d; do echo " $a"; done; }; }
-
-__get_machines() {
-        local a b
-        machinectl list --no-legend --no-pager | { while read a b; do echo " $a"; done; };
-}
-
-_systemd_run() {
-    local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
-    local OPTS='-h --help --version --user --system --scope --unit --description --slice
-                -r --remain-after-exit --send-sighup -H --host -M --machine --service-type
-                --uid --gid --nice --setenv -p --property'
-
-    local mode=--system
-    local i
-    for (( i=1; i <= COMP_CWORD; i++ )); do
-        if [[ ${COMP_WORDS[i]} != -* ]]; then
-            local root_command=${COMP_WORDS[i]}
-            _command_offset $i
-            return
-        fi
-
-        [[ ${COMP_WORDS[i]} == "--user" ]] && mode=--user
-
-        [[ $i -lt $COMP_CWORD && ${COMP_WORDS[i]} == @(--unit|--description|--slice|--service-type|-H|--host|-M|--machine|-p|--property) ]] && ((i++))
-    done
-
-    case "$prev" in
-        --unit|--description)
-            # argument required but no completions available
-            return
-            ;;
-        --slice)
-            local comps=$(__get_slice_units $mode)
-
-            COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
-            return 0
-            ;;
-        --service-type)
-            local comps='simple forking oneshot dbus notify idle'
-
-            COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
-            return 0
-            ;;
-        -p|--property)
-            local comps='CPUAccounting= MemoryAccounting= BlockIOAccounting= SendSIGHUP=
-                         SendSIGKILL= MemoryLimit= CPUShares= BlockIOWeight= User= Group=
-                         DevicePolicy= KillMode= DeviceAllow= BlockIOReadBandwidth=
-                         BlockIOWriteBandwidth= BlockIODeviceWeight= Nice= Environment=
-                         KillSignal= LimitCPU= LimitFSIZE= LimitDATA= LimitSTACK=
-                         LimitCORE= LimitRSS= LimitNOFILE= LimitAS= LimitNPROC=
-                         LimitMEMLOCK= LimitLOCKS= LimitSIGPENDING= LimitMSGQUEUE=
-                         LimitNICE= LimitRTPRIO= LimitRTTIME='
-
-            COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
-            return 0
-            ;;
-        -H|--host)
-            local comps=$(compgen -A hostname)
-
-            COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
-            return 0
-            ;;
-        -M|--machine)
-            local comps=$( __get_machines )
-
-            COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
-            return 0
-            ;;
-    esac
-
-    COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
-    return 0
-}
-
-complete -F _systemd_run systemd-run
diff --git a/shell-completion/bash/timedatectl b/shell-completion/bash/timedatectl
deleted file mode 100644
index a57fbd2546..0000000000
--- a/shell-completion/bash/timedatectl
+++ /dev/null
@@ -1,76 +0,0 @@
-# timedatectl(1) completion                               -*- shell-script -*-
-#
-# This file is part of systemd.
-#
-# Copyright 2010 Ran Benita
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# systemd is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with systemd; If not, see <http://www.gnu.org/licenses/>.
-
-__contains_word () {
-        local w word=$1; shift
-        for w in "$@"; do
-                [[ $w = "$word" ]] && return
-        done
-}
-
-_timedatectl() {
-        local i verb comps
-        local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
-        local OPTS='-h --help --version --adjust-system-clock --no-pager
-                    --no-ask-password -H --host --machine'
-
-        if __contains_word "$prev" $OPTS; then
-                case $prev in
-                        --host|-H)
-                                comps=''
-                        ;;
-                esac
-                COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
-                return 0
-        fi
-
-        if [[ $cur = -* ]]; then
-                COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
-                return 0
-        fi
-
-        local -A VERBS=(
-                  [BOOLEAN]='set-local-rtc set-ntp'
-               [STANDALONE]='status set-time list-timezones'
-                [TIMEZONES]='set-timezone'
-                     [TIME]='set-time'
-        )
-
-        for ((i=0; i < COMP_CWORD; i++)); do
-                if __contains_word "${COMP_WORDS[i]}" ${VERBS[*]}; then
-                        verb=${COMP_WORDS[i]}
-                        break
-                fi
-        done
-
-        if [[ -z $verb ]]; then
-                comps=${VERBS[*]}
-        elif __contains_word "$verb" ${VERBS[BOOLEAN]}; then
-                comps='true false'
-        elif __contains_word "$verb" ${VERBS[TIMEZONES]}; then
-                comps=$(command timedatectl list-timezones)
-        elif __contains_word "$verb" ${VERBS[STANDALONE]} ${VERBS[TIME]}; then
-                comps=''
-        fi
-
-        COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
-        return 0
-}
-
-complete -F _timedatectl timedatectl
diff --git a/shell-completion/zsh/_bootctl b/shell-completion/zsh/_bootctl
deleted file mode 100644
index 7d2453cc2c..0000000000
--- a/shell-completion/zsh/_bootctl
+++ /dev/null
@@ -1,25 +0,0 @@
-#compdef bootctl
-
-(( $+functions[_bootctl_command] )) || _bootctl_command()
-{
-    local -a _bootctl_cmds
-    _bootctl_cmds=(
-        "status:Show current firmware and boot settings"
-    )
-    if (( CURRENT == 1 )); then
-        _describe -t commands 'bootctl command' _bootctl_cmds || compadd "$@"
-    else
-        local curcontext="$curcontext"
-        cmd="${${_bootctl_cmds[(r)$words[1]:*]%%:*}}"
-        if (( $+functions[_bootctl_$cmd] )); then
-            _bootctl_$cmd
-        else
-            _message "no more options"
-        fi
-    fi
-}
-
-_arguments \
-    {-h,--help}'[Prints a short help text and exits.]' \
-    '--version[Prints a short version string and exits.]' \
-    '*::bootctl command:_bootctl_command'
diff --git a/shell-completion/zsh/_busctl b/shell-completion/zsh/_busctl
deleted file mode 100644
index fb1841341e..0000000000
--- a/shell-completion/zsh/_busctl
+++ /dev/null
@@ -1,57 +0,0 @@
-#compdef busctl
-
-# hostnamectl(1) completion                               -*- shell-script -*-
-#
-# This file is part of systemd.
-#
-# Copyright 2013 Zbigniew Jędrzejewski-Szmek
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# systemd is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with systemd; If not, see <http://www.gnu.org/licenses/>.
-
-(( $+functions[_busctl_command] )) || _busctl_command()
-{
-    local -a _busctl_cmds
-    _busctl_cmds=(
-        "list:List bus names"
-        "monitor:Show bus traffic"
-    )
-    if (( CURRENT == 1 )); then
-        _describe -t commands 'busctl command' _busctl_cmds || compadd "$@"
-    else
-        local curcontext="$curcontext"
-        cmd="${${_busctl_cmds[(r)$words[1]:*]%%:*}}"
-        if (( $+functions[_busctl_$cmd] )); then
-            _busctl_$cmd
-        else
-            _message "no more options"
-        fi
-    fi
-}
-
-_arguments \
-    {-h,--help}'[Prints a short help text and exits.]' \
-    '--version[Prints a short version string and exits.]' \
-    '--no-pager[Do not pipe output into a pager]' \
-    '--no-legend[Do not show the headers and footers]' \
-    '--system[Connect to system manager]' \
-    '--user[Connect to user service manager]' \
-    {-H+,--host=}'[Operate on remote host]:userathost:_sd_hosts_or_user_at_host' \
-    {-M+,--machine=}'[Operate on local container]:machines:_sd_machines' \
-    '--address=[Connect to the bus specified by address]:address' \
-    '--show-machine[Show machine ID column in list]' \
-    '--unique[Only show unique names]' \
-    '--acquired[Only show acquired names]' \
-    '--activatable[Only show activatable names]' \
-    '--match=[Only show matching messages]:match' \
-    '*::busctl command:_busctl_command'
diff --git a/shell-completion/zsh/_coredumpctl b/shell-completion/zsh/_coredumpctl
deleted file mode 100644
index 833c7e2bb1..0000000000
--- a/shell-completion/zsh/_coredumpctl
+++ /dev/null
@@ -1,39 +0,0 @@
-#compdef coredumpctl
-
-_coredumpctl_command(){
-    local -a _coredumpctl_cmds
-    _coredumpctl_cmds=(
-            'list:List available coredumps'
-            'info:Show detailed information about one or more coredumps'
-            'dump:Print coredump to stdout'
-            'gdb:Start gdb on a coredump'
-    )
-    if (( CURRENT == 1 )); then
-        _describe -t commands 'coredumpctl command' _coredumpctl_cmds
-    else
-        local curcontext="$curcontext"
-        local -a _dumps
-        cmd="${${_coredumpctl_cmds[(r)$words[1]:*]%%:*}}"
-        if (( $#cmd  )); then
-            # user can set zstyle ':completion:*:*:coredumpctl:*' sort no for coredumps to be ordered by date, otherwise they get ordered by pid
-            _dumps=( "${(foa)$(coredumpctl list | awk 'BEGIN{OFS=":"} /^\s/ {sub(/[[ \t]+/, ""); print $5,$0}' 2>/dev/null)}" )
-            if [[ -n "$_dumps" ]]; then
-                _describe -t pids 'coredumps' _dumps
-            else
-                _message "no coredumps"
-            fi
-        else
-            _message "no more options"
-        fi
-    fi
-}
-
-_arguments \
-    {-o+,--output=}'[Write output to FILE]:output file:_files' \
-    {-F+,--field=}'[Show field in list output]:field' \
-    '-1[Show information about most recent entry only]' \
-    '--no-pager[Do not pipe output into a pager]' \
-    '--no-legend[Do not print the column headers]' \
-    {-h,--help}'[Show this help]' \
-    '--version[Show package version]' \
-    '*::coredumpctl commands:_coredumpctl_command'
diff --git a/shell-completion/zsh/_hostnamectl b/shell-completion/zsh/_hostnamectl
deleted file mode 100644
index a7217a1999..0000000000
--- a/shell-completion/zsh/_hostnamectl
+++ /dev/null
@@ -1,70 +0,0 @@
-#compdef hostnamectl
-
-_hostnamectl_set-hostname() {
-    if (( CURRENT <= 3 )); then
-        _message "new hostname"
-    else
-        _message "no more options"
-    fi
-}
-
-_hostnamectl_set-icon-name() {
-    if (( CURRENT <= 3 )); then
-        _message "new icon name"
-    else
-        _message "no more options"
-    fi
-}
-
-_hostnamectl_set-chassis() {
-    if (( CURRENT <= 3 )); then
-        _chassis=( desktop laptop server tablet handset watch embedded vm container )
-        _describe chassis _chassis
-    else
-        _message "no more options"
-    fi
-}
-
-_hostnamectl_set-deployment() {
-    if (( CURRENT <= 3 )); then
-        _message "new environment"
-    else
-        _message "no more options"
-    fi
-}
-
-_hostnamectl_command() {
-    local -a _hostnamectl_cmds
-    _hostnamectl_cmds=(
-        "status:Show current hostname settings"
-        "set-hostname:Set system hostname"
-        "set-icon-name:Set icon name for host"
-        "set-chassis:Set chassis type for host"
-        "set-deployment:Set deployment environment"
-    )
-    if (( CURRENT == 1 )); then
-        _describe -t commands 'hostnamectl commands' _hostnamectl_cmds || compadd "$@"
-    else
-        local curcontext="$curcontext"
-        cmd="${${_hostnamectl_cmds[(r)$words[1]:*]%%:*}}"
-        if (( $#cmd )); then
-            if [[ $cmd == status ]]; then
-                _message "no options"
-            else
-                _hostnamectl_$cmd
-            fi
-        else
-            _message "unknown hostnamectl command: $words[1]"
-        fi
-    fi
-}
-
-_arguments -s \
-    {-h,--help}'[Show this help]' \
-    '--version[Show package version]' \
-    '--transient[Only set transient hostname]' \
-    '--static[Only set static hostname]' \
-    '--pretty[Only set pretty hostname]' \
-    '--no-ask-password[Do not prompt for password]' \
-    {-H+,--host=}'[Operate on remote host]:userathost:_sd_hosts_or_user_at_host' \
-    '*::hostnamectl commands:_hostnamectl_command'
diff --git a/shell-completion/zsh/_journalctl b/shell-completion/zsh/_journalctl
deleted file mode 100644
index a469bbc9a7..0000000000
--- a/shell-completion/zsh/_journalctl
+++ /dev/null
@@ -1,93 +0,0 @@
-#compdef journalctl
-
-_list_fields() {
-    local -a journal_fields
-    journal_fields=(MESSAGE{,_ID} PRIORITY CODE_{FILE,LINE,FUNC}
-                    ERRNO SYSLOG_{FACILITY,IDENTIFIER,PID}
-                    _{P,U,G}ID _COMM _EXE _CMDLINE
-                    _AUDIT_{SESSION,LOGINUID}
-                    _SYSTEMD_{CGROUP,SESSION,UNIT,OWNER_UID}
-                    _SYSTEMD_USER_UNIT USER_UNIT
-                    _SELINUX_CONTEXT _SOURCE_REALTIME_TIMESTAMP
-                    _{BOOT,MACHINE}_ID _HOSTNAME _TRANSPORT
-                    _KERNEL_{DEVICE,SUBSYSTEM}
-                    _UDEV_{SYSNAME,DEVNODE,DEVLINK}
-                    __CURSOR __{REALTIME,MONOTONIC}_TIMESTAMP)
-    case $_jrnl_none in
-        yes) _values -s '=' 'possible fields' \
-                "${journal_fields[@]}:value:_journal_fields ${words[CURRENT]%%=*}" ;;
-        *)  _describe 'possible fields' journal_fields ;;
-    esac
-}
-
-_journal_none() {
-    local -a _commands _files _jrnl_none
-    # Setting use-cache will slow this down considerably
-    _commands=( ${"$(_call_program commands "$service" -F _EXE 2>/dev/null)"} )
-    _jrnl_none='yes'
-    _alternative : \
-        'files:/dev files:_files -W /dev -P /dev/' \
-        "commands:commands:($_commands[@])" \
-        'fields:fields:_list_fields'
-}
-
-_journal_fields() {
-    local -a _fields cmd
-    cmd=("journalctl" "-F ${@[-1]}" "2>/dev/null" )
-    _fields=( ${(f)"$(_call_program fields $cmd[@])"} )
-    typeset -U _fields
-    _describe 'possible values' _fields
-}
-
-_journal_boots() {
-  local -a _bootid _previousboots
-  _bootid=( ${(f)"$(_call_program bootid "$service -F _BOOT_ID")"}  )
-  _previousboots=( -{1..${#_bootid}} )
-  _alternative : \
-    "offsets:boot offsets:compadd -a '_previousboots[1,-2]'" \
-    "bootid:boot ids:compadd -a _bootid"
-}
-
-_arguments -s \
-    {-h,--help}'[Show this help]' \
-    '--version[Show package version]' \
-    '--no-pager[Do not pipe output into a pager]' \
-    {-l,--full}'[Show long fields in full]' \
-    {-a,--all}'[Show all fields, including long and unprintable]' \
-    {-f,--follow}'[Follow journal]' \
-    {-e,--pager-end}'[Jump to the end of the journal in the pager]' \
-    {-n+,--lines=}'[Number of journal entries to show]:integer' \
-    '--no-tail[Show all lines, even in follow mode]' \
-    {-r,--reverse}'[Reverse output]' \
-    {-o+,--output=}'[Change journal output mode]:output modes:_sd_outputmodes' \
-    {-x,--catalog}'[Show explanatory texts with each log line]' \
-    {-q,--quiet}"[Don't show privilege warning]" \
-    {-m,--merge}'[Show entries from all available journals]' \
-    {-b+,--boot=}'[Show data only from the specified boot or offset]::boot id or offset:_journal_boots' \
-    '--list-boots[List boots ordered by time]' \
-    {-k,--dmesg}'[Show only kernel messages from the current boot]' \
-    {-u+,--unit=}'[Show data only from the specified unit]:units:_journal_fields _SYSTEMD_UNIT' \
-    '--user-unit=[Show data only from the specified user session unit]:units:_journal_fields USER_UNIT' \
-    {-p+,--priority=}'[Show only messages within the specified priority range]:priority:_journal_fields PRIORITY' \
-    {-c+,--cursor=}'[Start showing entries from the specified cursor]:cursors:_journal_fields __CURSORS' \
-    '--after-cursor=[Start showing entries from after the specified cursor]:cursors:_journal_fields __CURSORS' \
-    '--since=[Start showing entries on or newer than the specified date]:YYYY-MM-DD HH\:MM\:SS' \
-    '--until=[Stop showing entries on or older than the specified date]:YYYY-MM-DD HH\:MM\:SS' \
-    {-F,--field=}'[List all values a certain field takes]:Fields:_list_fields' \
-    '--system[Show system and kernel messages]' \
-    '--user[Show messages from user services]' \
-    {-D+,--directory=}'[Show journal files from directory]:directories:_directories' \
-    '--file=[Operate on specified journal files]:file:_files' \
-    '--root=[Operate on catalog hierarchy under specified directory]:directories:_directories' \
-    '--new-id128[Generate a new 128 Bit ID]' \
-    '--header[Show journal header information]' \
-    '--disk-usage[Show total disk usage]' \
-    '--list-catalog[List messages in catalog]' \
-    '--dump-catalog[Dump messages in catalog]' \
-    '--update-catalog[Update binary catalog database]' \
-    '--setup-keys[Generate a new FSS key pair]' \
-    '--force[Force recreation of the FSS keys]' \
-    '--interval=[Time interval for changing the FSS sealing key]:time interval' \
-    '--verify[Verify journal file consistency]' \
-    '--verify-key=[Specify FSS verification key]:FSS key' \
-    '*::default: _journal_none'
diff --git a/shell-completion/zsh/_kernel-install b/shell-completion/zsh/_kernel-install
deleted file mode 100644
index 4fdd3a4ae7..0000000000
--- a/shell-completion/zsh/_kernel-install
+++ /dev/null
@@ -1,26 +0,0 @@
-#compdef kernel-install
-
-_images(){
-    if [[ "$words[2]" == "remove" ]]; then
-        _message 'No more options'
-    else
-        _path_files -W /boot/ -P /boot/ -g "vmlinuz-*"
-    fi
-}
-
-_kernels(){
-    read _MACHINE_ID < /etc/machine-id
-    _kernel=( /lib/modules/[0-9]* )
-    if [[ "$cmd" == "remove" && -n "$_MACHINE_ID" ]]; then
-        _kernel=( "/boot/$_MACHINE_ID"/[0-9]* )
-    fi
-    _kernel=( ${_kernel##*/} )
-    _describe "installed kernels" _kernel
-}
-
-_arguments \
-    '1::add or remove:(add remove)' \
-    '2::kernel versions:_kernels' \
-    '3::kernel images:_images'
-
-#vim: set ft=zsh sw=4 ts=4 et
diff --git a/shell-completion/zsh/_localectl b/shell-completion/zsh/_localectl
deleted file mode 100644
index d8af4d1863..0000000000
--- a/shell-completion/zsh/_localectl
+++ /dev/null
@@ -1,93 +0,0 @@
-#compdef localectl
-
-_localectl_set-locale() {
-    local -a _locales locale_fields
-    locale_fields=(LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME \
-                   LC_COLLATE LC_MONETARY LC_MESSAGES LC_PAPER \
-                   LC_NAME LC_ADDRESS LC_TELEPHONE \
-                   LC_MEASUREMENT LC_IDENTIFICATION)
-    # LC_ALL is omitted on purpose
-
-    local expl suf
-    _locales=( ${(f)"$(_call_program locales "$service" list-locales)"} )
-    compset -P1 '*='
-    if [[ -prefix 1 *\= ]]; then
-        local conf=${PREFIX%%\=*}
-        _wanted locales expl "locales configs" \
-            _combination localeconfs  confs=$conf locales "$@" -
-    else
-        compadd -S '=' $locale_fields
-    fi
-}
-
-_localectl_set-keymap() {
-    local -a _keymaps
-    if (( CURRENT <= 3 )); then
-        _keymaps=( ${(f)"$(_call_program locales "$service" list-keymaps)"} )
-        _describe keymaps _keymaps
-    else
-        _message "no more options"
-    fi
-}
-
-_localectl_set-x11-keymap() {
-    if (( $+commands[pkg-config] )); then
-        local -a _file _layout _model _variant _options
-        local _xorg_lst
-        _xorg_lst=${"$($commands[pkg-config] xkeyboard-config --variable=xkb_base)"}
-        _file=( ${(ps:\n\!:)"$(<$_xorg_lst/rules/xorg.lst)"} )
-        _layout=( ${${${(M)${(f)_file[1]}:#  *}#  }%% *} )
-        _model=( ${${${(M)${(f)_file[2]}:#  *}#  }%% *} )
-        _variant=( ${${${(M)${(f)_file[3]}:#  *}#  }%% *} )
-        _options=( ${${${(M)${(f)_file[4]}:#  *}#  }%% *} )
-        #_layout=( ${(f)"$( echo $_file[1] | awk '/^  / {print $1}' )"} )
-        #_model=( ${(f)"$(echo $_file[2] | awk '/^  / {print $1}')"} )
-        #_variant=( ${(f)"$(echo $_file[3] | awk '/^  / {print $1}')"} )
-        #_options=( ${(f)"$(echo ${_file[4]//:/\\:} | awk '/^  / {print $1}')"} )
-
-        case $CURRENT in
-            2) _describe layouts _layout ;;
-            3) _describe models _model;;
-            4) _describe variants _variant;;
-            5) _describe options _options;;
-            *) _message "no more options"
-        esac
-    fi
-}
-
-_localectl_command() {
-    local -a _localectl_cmds
-    _localectl_cmds=(
-        'status:Show current locale settings'
-        'set-locale:Set system locale'
-        'list-locales:Show known locales'
-        'set-keymap:Set virtual console keyboard mapping'
-        'list-keymaps:Show known virtual console keyboard mappings'
-        'set-x11-keymap:Set X11 keyboard mapping'
-        'list-x11-keymap-models:Show known X11 keyboard mapping models'
-        'list-x11-keymap-layouts:Show known X11 keyboard mapping layouts'
-        'list-x11-keymap-variants:Show known X11 keyboard mapping variants'
-        'list-x11-keymap-options:Show known X11 keyboard mapping options'
-    )
-    if (( CURRENT == 1 )); then
-        _describe -t commands 'localectl command' _localectl_cmds
-    else
-        local curcontext="$curcontext"
-        cmd="${${_localectl_cmds[(r)$words[1]:*]%%:*}}"
-        if (( $+functions[_localectl_$cmd] )); then
-            _localectl_$cmd
-        else
-            _message "unknown localectl command: $words[1]"
-        fi
-    fi
-}
-
-_arguments \
-    {-h,--help}'[Show this help]' \
-    '--version[Show package version]' \
-    "--no-convert[Don't convert keyboard mappings]" \
-    '--no-pager[Do not pipe output into a pager]' \
-    '--no-ask-password[Do not prompt for password]' \
-    {-H+,--host=}'[Operate on remote host]:userathost:_sd_hosts_or_user_at_host' \
-    {-M+,--machine=}'[Operate on local container]:machine' \
-    '*::localectl commands:_localectl_command'
diff --git a/shell-completion/zsh/_machinectl b/shell-completion/zsh/_machinectl
deleted file mode 100644
index c666b7eb43..0000000000
--- a/shell-completion/zsh/_machinectl
+++ /dev/null
@@ -1,45 +0,0 @@
-#compdef machinectl
-
-(( $+functions[_machinectl_command] )) || _machinectl_command()
-{
-  local -a _machinectl_cmds
-  _machinectl_cmds=(
-    "list:List currently running VMs/containers"
-    "status:Show VM/container status"
-    "show:Show properties of one or more VMs/containers"
-    "login:Get a login prompt on a VM/container"
-    "poweroff:Power off one or more VMs/containers"
-    "reboot:Reboot one or more VMs/containers"
-    "terminate:Terminate one or more VMs/containers"
-    "kill:Send signal to process or a VM/container"
-  )
-  if (( CURRENT == 1 )); then
-    _describe -t commands 'machinectl command' _machinectl_cmds || compadd "$@"
-  else
-    local curcontext="$curcontext"
-    cmd="${${_machinectl_cmds[(r)$words[1]:*]%%:*}}"
-    if (( $#cmd )); then
-      case $cmd in
-        list) msg="no options" ;;
-        *)
-          _sd_machines
-      esac
-    else
-      _message "no more options"
-    fi
-  fi
-}
-
-_arguments \
-  {-h,--help}'[Prints a short help text and exits.]' \
-  '--version[Prints a short version string and exits.]' \
-  \*{-p+,--property=}'[Limit output to specified property.]:property:(Name Id Timestamp TimestampMonotonic Service Scope Leader Class State RootDirectory)' \
-  {-a,--all}'[Show all proerties]' \
-  (-l,--full)'[Do not ellipsize cgroup members]' \
-  '--no-pager[Do not pipe output into a pager]' \
-  '--no-ask-password[Do not ask for system passwords]' \
-  '--kill-who=[Who to send signal to]:killwho:(leader all)' \
-  {-s+,--signal=}'[Which signal to send]:signal:_signals' \
-  {-H+,--host=}'[Operate on remote host]:userathost:_sd_hosts_or_user_at_host' \
-  {-P,--privileged}'[Acquire privileges before execution]' \
-  '*::machinectl command:_machinectl_command'
diff --git a/shell-completion/zsh/_sd_hosts_or_user_at_host b/shell-completion/zsh/_sd_hosts_or_user_at_host
deleted file mode 100644
index 282f7328e4..0000000000
--- a/shell-completion/zsh/_sd_hosts_or_user_at_host
+++ /dev/null
@@ -1,5 +0,0 @@
-#autoload
-
-_alternative \
-  'users-hosts:: _user_at_host' \
-  'hosts:: _hosts'
diff --git a/shell-completion/zsh/_sd_machines b/shell-completion/zsh/_sd_machines
deleted file mode 100644
index a0039ee0f8..0000000000
--- a/shell-completion/zsh/_sd_machines
+++ /dev/null
@@ -1,13 +0,0 @@
-#autoload
-__get_machines () {
-        machinectl --full --no-legend --no-pager list |  {while read -r a b; do echo $a; done;};
-}
-
-local -a _machines
-_machines=("${(fo)$(__get_machines)}")
-typeset -U _machines
-if [[ -n "$_machines" ]]; then
-        _describe 'machines' _machines
-else
-        _message 'no machines'
-fi
diff --git a/shell-completion/zsh/_sd_outputmodes b/shell-completion/zsh/_sd_outputmodes
deleted file mode 100644
index 3836f79b73..0000000000
--- a/shell-completion/zsh/_sd_outputmodes
+++ /dev/null
@@ -1,5 +0,0 @@
-#autoload
-
-local -a _output_opts
-_output_opts=(short short-iso short-precise short-monotonic verbose export json json-pretty json-sse cat)
-_describe -t output 'output mode' _output_opts || compadd "$@"
diff --git a/shell-completion/zsh/_sd_unit_files b/shell-completion/zsh/_sd_unit_files
deleted file mode 100644
index 4778a0420d..0000000000
--- a/shell-completion/zsh/_sd_unit_files
+++ /dev/null
@@ -1,9 +0,0 @@
-#autoload
-
-_sd_unit_files() {
-    local files expl
-    files=( '*:files:->files' )
-
-    _description files expl 'unit file'
-    _files "$expl[@]" -g '*.(automount|busname|device|mount|path|service|snapshot|socket|swap|target|timer)'
-}
diff --git a/shell-completion/zsh/_systemctl.in b/shell-completion/zsh/_systemctl.in
deleted file mode 100644
index 7f2d5ac0fa..0000000000
--- a/shell-completion/zsh/_systemctl.in
+++ /dev/null
@@ -1,388 +0,0 @@
-#compdef systemctl
-
-(( $+functions[_systemctl_command] )) || _systemctl_command()
-{
-  local -a _systemctl_cmds
-  _systemctl_cmds=(
-    "list-sockets:List sockets"
-    "list-timers:List timers"
-    "list-units:List units"
-    "start:Start (activate) one or more units"
-    "stop:Stop (deactivate) one or more units"
-    "reload:Reload one or more units"
-    "restart:Start or restart one or more units"
-    "condrestart:Restart one or more units if active"
-    "try-restart:Restart one or more units if active"
-    "reload-or-restart:Reload one or more units if possible, otherwise start or restart"
-    "force-reload:Reload one or more units if possible, otherwise restart if active"
-    "hibernate:Hibernate the system"
-    "hybrid-sleep:Hibernate and suspend the system"
-    "reload-or-try-restart:Reload one or more units if possible, otherwise restart if active"
-    "isolate:Start one unit and stop all others"
-    "kill:Send signal to processes of a unit"
-    "is-active:Check whether units are active"
-    "is-failed:Check whether units are failed"
-    "status:Show runtime status of one or more units"
-    "show:Show properties of one or more units/jobs or the manager"
-    "cat:Show the source unit files and drop-ins"
-    "reset-failed:Reset failed state for all, one, or more units"
-    "list-unit-files:List installed unit files"
-    "enable:Enable one or more unit files"
-    "disable:Disable one or more unit files"
-    "reenable:Reenable one or more unit files"
-    "preset:Enable/disable one or more unit files based on preset configuration"
-    "set-default:Set the default target"
-    "get-default:Query the default target"
-    "edit:Edit one or more unit files"
-    "is-system-running:Query overall status of the system"
-    "help:Show documentation for specified units"
-    "list-dependencies:Show unit dependency tree"
-    "mask:Mask one or more units"
-    "unmask:Unmask one or more units"
-    "link:Link one or more units files into the search path"
-    "is-enabled:Check whether unit files are enabled"
-    "list-jobs:List jobs"
-    "cancel:Cancel all, one, or more jobs"
-    "snapshot:Create a snapshot"
-    "delete:Remove one or more snapshots"
-    "show-environment:Dump environment"
-    "set-environment:Set one or more environment variables"
-    "unset-environment:Unset one or more environment variables"
-    "daemon-reload:Reload systemd manager configuration"
-    "daemon-reexec:Reexecute systemd manager"
-    "default:Enter system default mode"
-    "rescue:Enter system rescue mode"
-    "emergency:Enter system emergency mode"
-    "halt:Shut down and halt the system"
-    "suspend:Suspend the system"
-    "poweroff:Shut down and power-off the system"
-    "reboot:Shut down and reboot the system"
-    "kexec:Shut down and reboot the system with kexec"
-    "exit:Ask for user instance termination"
-  )
-
-  if (( CURRENT == 1 )); then
-    _describe -t commands 'systemctl command' _systemctl_cmds || compadd "$@"
-  else
-    local curcontext="$curcontext"
-
-    cmd="${${_systemctl_cmds[(r)$words[1]:*]%%:*}}"
-    # Deal with any aliases
-    case $cmd in
-      condrestart) cmd="try-restart";;
-      force-reload) cmd="reload-or-try-restart";;
-    esac
-
-    if (( $#cmd )); then
-      curcontext="${curcontext%:*:*}:systemctl-${cmd}:"
-
-      local update_policy
-      zstyle -s ":completion:${curcontext}:" cache-policy update_policy
-      if [[ -z "$update_policy" ]]; then
-        zstyle ":completion:${curcontext}:" cache-policy _systemctl_caching_policy
-      fi
-
-      _call_function ret _systemctl_$cmd || _message 'no more arguments'
-    else
-      _message "unknown systemctl command: $words[1]"
-    fi
-    return ret
-  fi
-}
-
-__systemctl()
-{
-  local -a _modes
-  _modes=("--user" "--system")
-  systemctl ${words:*_modes} --full --no-legend --no-pager "$@"
-}
-
-
-# Fills the unit list
-_systemctl_all_units()
-{
-  if ( [[ ${+_sys_all_units} -eq 0 ]] || _cache_invalid SYS_ALL_UNITS ) &&
-    ! _retrieve_cache SYS_ALL_UNITS;
-  then
-    _sys_all_units=( $(__systemctl list-units --all | { while read -r a b; do echo -E - " $a"; done; }) )
-    _store_cache SYS_ALL_UNITS _sys_all_units
-  fi
-}
-
-# Fills the unit list including all file units
-_systemctl_really_all_units()
-{
-  local -a all_unit_files;
-  local -a really_all_units;
-  if ( [[ ${+_sys_really_all_units} -eq 0 ]] || _cache_invalid SYS_REALLY_ALL_UNITS ) &&
-    ! _retrieve_cache SYS_REALLY_ALL_UNITS;
-  then
-    all_unit_files=( $(__systemctl list-unit-files | { while read -r a b; do echo -E - " $a"; done; }) )
-    _systemctl_all_units
-    really_all_units=($_sys_all_units $all_unit_files)
-    _sys_really_all_units=(${(u)really_all_units})
-    _store_cache SYS_REALLY_ALL_UNITS _sys_really_all_units
-  fi
-}
-
-_filter_units_by_property() {
-  local property=$1 value=$2 ; shift ; shift
-  local -a units ; units=($*)
-  local prop unit
-  for ((i=1; $i <= ${#units[*]}; i++)); do
-    # FIXME: "Failed to issue method call: Unknown unit" errors are ignored for
-    # now (related to DBUS_ERROR_UNKNOWN_OBJECT). in the future, we need to
-    # revert to calling 'systemctl show' once for all units, which is way
-    # faster
-    unit=${units[i]}
-    prop=${(f)"$(_call_program units "$service show --no-pager --property="$property" ${unit} 2>/dev/null")"}
-    if [[ "${prop}" = "$property=$value" ]]; then
-      echo -E - " ${unit}"
-    fi
-  done
-}
-
-_systemctl_get_template_names() { __systemctl list-unit-files | { while read -r a b; do  [[ $a =~ @\. ]] && echo -E - " ${a%%@.*}@"; done; } }
-
-
-_systemctl_active_units()  {_sys_active_units=(  $(__systemctl list-units          | { while read -r a b; do echo -E - " $a"; done; }) )}
-
-_systemctl_startable_units(){
-    _sys_startable_units=(_filter_units_by_property ActiveState inactive $(
-                          _filter_units_by_property CanStart yes $(
-                          __systemctl $mode list-unit-files --state enabled,disabled,static | \
-                               { while read -r a b; do [[ $a =~ @\. ]] || echo -E - " $a"; done; }
-                          __systemctl $mode list-units --state inactive,failed | \
-                               { while read -r a b; do echo -E - " $a"; done; } )))
-}
-
-_systemctl_restartable_units(){
-    _sys_restartable_units=(_filter_units_by_property CanStart yes $(
-                          __systemctl $mode list-unit-files --state enabled,disabled,static | \
-                               { while read -r a b; do [[ $a =~ @\. ]] || echo -E - " $a"; done; }
-                          __systemctl $mode list-units | \
-                               { while read -r a b; do echo -E - " $a"; done; } ))
-}
-
-_systemctl_failed_units()  {_sys_failed_units=(  $(__systemctl list-units --failed | { while read -r a b; do echo -E - " $a"; done; }) )}
-_systemctl_enabled_units() {_sys_enabled_units=( $(__systemctl list-unit-files     | { while read -r a b; do [[ $b == "enabled" ]] && echo -E - " $a"; done; }) )}
-_systemctl_disabled_units(){_sys_disabled_units=($(__systemctl list-unit-files     | { while read -r a b; do [[ $b == "disabled" ]] && echo -E - " $a"; done; }) )}
-_systemctl_masked_units()  {_sys_masked_units=(  $(__systemctl list-unit-files     | { while read -r a b; do [[ $b == "masked" ]] && echo -E - " $a"; done; }) )}
-
-# Completion functions for ALL_UNITS
-for fun in is-active is-failed is-enabled status show cat mask preset help list-dependencies edit ; do
-  (( $+functions[_systemctl_$fun] )) || _systemctl_$fun()
-  {
-    _systemctl_really_all_units
-    compadd "$@" -a - _sys_really_all_units
-  }
-done
-
-# Completion functions for ENABLED_UNITS
-(( $+functions[_systemctl_disable] )) || _systemctl_disable()
-{
-    _systemctl_enabled_units
-    compadd "$@" -a - _sys_enabled_units
-}
-
-(( $+functions[_systemctl_reenable] )) || _systemctl_reenable()
-{
-    _systemctl_enabled_units
-    _systemctl_disabled_units
-    compadd "$@" -a - _sys_enabled_units _sys_disabled_units $(_systemctl_get_template_names)
-}
-
-# Completion functions for DISABLED_UNITS
-(( $+functions[_systemctl_enable] )) || _systemctl_enable()
-{
-  _systemctl_disabled_units
-  compadd "$@" -a - _sys_disabled_units $(_systemctl_get_template_names)
-}
-
-# Completion functions for FAILED_UNITS
-(( $+functions[_systemctl_reset-failed] )) || _systemctl_reset-failed()
-{
-  _systemctl_failed_units
-  compadd "$@" -a - _sys_failed_units || _message "no failed unit found"
-}
-
-# Completion functions for STARTABLE_UNITS
-(( $+functions[_systemctl_start] )) || _systemctl_start()
-{
-   _systemctl_startable_units
-   compadd "$@" - ${_sys_startable_units[*]} $(_systemctl_get_template_names)
-}
-
-# Completion functions for STOPPABLE_UNITS
-for fun in stop kill try-restart condrestart ; do
-  (( $+functions[_systemctl_$fun] )) || _systemctl_$fun()
-  {
-    _systemctl_active_units
-    compadd "$@" - $( _filter_units_by_property CanStop yes \
-      ${_sys_active_units[*]} )
-  }
-done
-
-# Completion functions for ISOLATABLE_UNITS
-(( $+functions[_systemctl_isolate] )) || _systemctl_isolate()
-{
-  _systemctl_all_units
-  compadd "$@" - $( _filter_units_by_property AllowIsolate yes \
-    ${_sys_all_units[*]} )
-}
-
-# Completion functions for RELOADABLE_UNITS
-for fun in reload reload-or-try-restart force-reload ; do
-  (( $+functions[_systemctl_$fun] )) || _systemctl_$fun()
-  {
-    _systemctl_active_units
-    compadd "$@" - $( _filter_units_by_property CanReload yes \
-      ${_sys_active_units[*]} )
-  }
-done
-
-# Completion functions for RESTARTABLE_UNITS
-for fun in restart reload-or-restart ; do
-  (( $+functions[_systemctl_$fun] )) || _systemctl_$fun()
-  {
-    _systemctl_restartable_units
-    compadd "$@" - ${_sys_restartable_units[*]} $(_systemctl_get_template_names)
-  }
-done
-
-# Completion functions for MASKED_UNITS
-(( $+functions[_systemctl_unmask] )) || _systemctl_unmask()
-{
-  _systemctl_masked_units
-  compadd "$@" -a - _sys_masked_units || _message "no masked units found"
-}
-
-# Completion functions for JOBS
-(( $+functions[_systemctl_cancel] )) || _systemctl_cancel()
-{
-  compadd "$@" - $(__systemctl list-jobs \
-    | cut -d' ' -f1  2>/dev/null ) || _message "no jobs found"
-}
-
-# Completion functions for SNAPSHOTS
-(( $+functions[_systemctl_delete] )) || _systemctl_delete()
-{
-  compadd "$@" - $(__systemctl list-units --type snapshot --all \
-    | cut -d' ' -f1  2>/dev/null ) || _message "no snapshots found"
-}
-
-# Completion functions for TARGETS
-(( $+functions[_systemctl_set-default] )) || _systemctl_set-default()
-{
-  compadd "$@" - $(__systemctl list-unit-files --type target --all \
-    | cut -d' ' -f1  2>/dev/null ) || _message "no targets found"
-}
-
-# Completion functions for ENVS
-for fun in set-environment unset-environment ; do
-  (( $+functions[_systemctl_$fun] )) || _systemctl_$fun()
-  {
-    local fun=$0 ; fun=${fun##_systemctl_}
-    local suf
-    if [[ "${fun}" = "set-environment" ]]; then
-      suf='-S='
-    fi
-
-    compadd "$@" ${suf} - $(systemctl show-environment \
-      | while read line; do echo " ${line%%\=}";done )
-  }
-done
-
-(( $+functions[_systemctl_link] )) || _systemctl_link() {
-   _sd_unit_files
-}
-
-# no systemctl completion for:
-#    [STANDALONE]='daemon-reexec daemon-reload default
-#                  emergency exit halt kexec list-jobs list-units
-#                  list-unit-files poweroff reboot rescue show-environment'
-#         [NAME]='snapshot'
-
-_systemctl_caching_policy()
-{
-  local _sysunits
-  local -a oldcache
-
-  # rebuild if cache is more than a day old
-  oldcache=( "$1"(mh+1) )
-  (( $#oldcache )) && return 0
-
-  _sysunits=($(__systemctl --all | cut -d' ' -f1))
-
-  if (( $#_sysunits )); then
-    for unit in $_sysunits; do
-      [[ "$unit" -nt "$1" ]] && return 0
-    done
-  fi
-
-  return 1
-}
-
-_unit_states() {
-    local -a _states
-    _states=(loaded failed active inactive not-found listening running waiting plugged mounted exited dead masked)
-    _values -s , "${_states[@]}"
-}
-
-_unit_types() {
-    local -a _types
-    _types=(automount busname device mount path service snapshot socket swap target timer)
-    _values -s , "${_types[@]}"
-}
-
-_unit_properties() {
-  if ( [[ ${+_sys_all_properties} -eq 0 ]] || _cache_invalid SYS_ALL_PROPERTIES ) &&
-    ! _retrieve_cache SYS_ALL_PROPERTIES;
-  then
-    _sys_all_properties=( $( {__systemctl show --all;
-       @rootlibexecdir@/systemd --dump-configuration-items; } | {
-       while IFS='=' read -r a b; do [ -n "$b" ] && echo "$a"; done
-    }) )
-    _store_cache SYS_ALL_PROPRTIES _sys_all_properties
-  fi
-  _values -s , "${_sys_all_properties[@]}"
-}
-
-_arguments -s \
-    {-h,--help}'[Show help]' \
-    '--version[Show package version]' \
-    {-t+,--type=}'[List only units of a particular type]:unit type:_unit_types' \
-    '--state=[Display units in the specifyied state]:unit state:_unit_states' \
-    {-p+,--property=}'[Show only properties by specific name]:unit property:_unit_properties' \
-    {-a,--all}'[Show all units/properties, including dead/empty ones]' \
-    '--reverse[Show reverse dependencies]' \
-    '--after[Show units ordered after]' \
-    '--before[Show units ordered before]' \
-    '--failed[Show only failed units]' \
-    {-l,--full}"[Don't ellipsize unit names on output]" \
-    '--fail[When queueing a new job, fail if conflicting jobs are pending]' \
-    '--show-types[When showing sockets, show socket type]' \
-    '--irreversible[Mark transactions as irreversible]' \
-    '--ignore-dependencies[When queueing a new job, ignore all its dependencies]' \
-    {-i,--ignore-inhibitors}'[When executing a job, ignore jobs dependencies]' \
-    {-q,--quiet}'[Suppress output]' \
-    '--no-block[Do not wait until operation finished]' \
-    '--no-legend[Do not print a legend, i.e. the column headers and the footer with hints]' \
-    '--no-pager[Do not pipe output into a pager]' \
-    '--system[Connect to system manager]' \
-    '--user[Connect to user service manager]' \
-    "--no-wall[Don't send wall message before halt/power-off/reboot]" \
-    '--global[Enable/disable unit files globally]' \
-    "--no-reload[When enabling/disabling unit files, don't reload daemon configuration]" \
-    '--no-ask-password[Do not ask for system passwords]' \
-    '--kill-who=[Who to send signal to]:killwho:(main control all)' \
-    {-s+,--signal=}'[Which signal to send]:signal:_signals' \
-    {-f,--force}'[When enabling unit files, override existing symlinks. When shutting down, execute action immediately]' \
-    '--root=[Enable unit files in the specified root directory]:directory:_directories' \
-    '--runtime[Enable unit files only temporarily until next reboot]' \
-    {-H+,--host=}'[Operate on remote host]:userathost:_sd_hosts_or_user_at_host' \
-    {-P,--privileged}'[Acquire privileges before execution]' \
-    {-n+,--lines=}'[Journal entries to show]:number of entries' \
-    {-o+,--output=}'[Change journal output mode]:modes:_sd_outputmodes' \
-    '--plain[When used with list-dependencies, print output as a list]' \
-    '*::systemctl command:_systemctl_command'
diff --git a/shell-completion/zsh/_systemd b/shell-completion/zsh/_systemd
deleted file mode 100644
index 58b1c7b4e5..0000000000
--- a/shell-completion/zsh/_systemd
+++ /dev/null
@@ -1,82 +0,0 @@
-#compdef systemd-cat systemd-ask-password systemd-cgls systemd-cgtop systemd-detect-virt systemd-machine-id-setup systemd-notify systemd-tty-ask-password-agent
-
-local curcontext="$curcontext" state lstate line
-case "$service" in
-    systemd-ask-password)
-        _arguments \
-            {-h,--help}'[Show this help]' \
-            '--icon=[Icon name]' \
-            '--timeout=[Timeout in sec]' \
-            '--no-tty[Ask question via agent even on TTY]' \
-            '--accept-cached[Accept cached passwords]' \
-            '--multiple[List multiple passwords if available]'
-    ;;
-    systemd-cat)
-        _arguments \
-            {-h,--help}'[Show this help]' \
-            '--version[Show package version.]' \
-            {-t+,--identifier=}'[Set syslog identifier.]' \
-            {-p+,--priority=}'[Set priority value.]:value:({0..7})' \
-            '--level-prefix=[Control whether level prefix shall be parsed.]:boolean:(1 0)' \
-            ':Message'
-    ;;
-    systemd-cgls)
-        _arguments \
-            {-h,--help}'[Show this help]' \
-            '--version[Show package version]' \
-            '--no-pager[Do not pipe output into a pager]' \
-            {-a,--all}'[Show all groups, including empty]' \
-            '-k[Include kernel threads in output]' \
-            ':cgroups:(cpuset cpu cpuacct memory devices freezer net_cls blkio)'
-    ;;
-    systemd-cgtop)
-        _arguments \
-            {-h,--help}'[Show this help]' \
-            '--version[Print version and exit]' \
-            '(-c -m -i -t)-p[Order by path]' \
-            '(-c -p -m -i)-t[Order by number of tasks]' \
-            '(-m -p -i -t)-c[Order by CPU load]' \
-            '(-c -p -i -t)-m[Order by memory load]' \
-            '(-c -m -p -t)-i[Order by IO load]' \
-            {-d+,--delay=}'[Specify delay]' \
-            {-n+,--iterations=}'[Run for N iterations before exiting]' \
-            {-b,--batch}'[Run in batch mode, accepting no input]' \
-            '--depth=[Maximum traversal depth]'
-    ;;
-    systemd-detect-virt)
-        _arguments \
-            {-h,--help}'[Show this help]' \
-            '--version[Show package version]' \
-            {-c,--container}'[Only detect whether we are run in a container]' \
-            {-v,--vm}'[Only detect whether we are run in a VM]' \
-            {-q,--quiet}"[Don't output anything, just set return value]"
-    ;;
-    systemd-machine-id-setup)
-        _arguments \
-            {-h,--help}'[Show this help]' \
-            '--version[Show package version]'
-    ;;
-    systemd-notify)
-        _arguments \
-            {-h,--help}'[Show this help]' \
-            '--version[Show package version]' \
-            '--ready[Inform the init system about service start-up completion.]' \
-            '--pid=[Inform the init system about the main PID of the daemon]' \
-            '--status=[Send a free-form status string for the daemon to the init systemd]' \
-            '--booted[Returns 0 if the system was booted up with systemd]'
-    ;;
-    systemd-tty-ask-password-agent)
-        _arguments \
-            {-h,--help}'[Prints a short help text and exits.]' \
-            '--version[Prints a short version string and exits.]' \
-            '--list[Lists all currently pending system password requests.]' \
-            '--query[Process all currently pending system password requests by querying the user on the calling TTY.]' \
-            '--watch[Continuously process password requests.]' \
-            '--wall[Forward password requests to wall(1).]' \
-            '--plymouth[Ask question with plymouth(8).]' \
-            '--console[Ask question on /dev/console.]'
-    ;;
-    *) _message 'eh?' ;;
-esac
-
-#vim: set ft=zsh sw=4 ts=4 et
diff --git a/shell-completion/zsh/_systemd-analyze b/shell-completion/zsh/_systemd-analyze
deleted file mode 100644
index 2c0e5433eb..0000000000
--- a/shell-completion/zsh/_systemd-analyze
+++ /dev/null
@@ -1,58 +0,0 @@
-#compdef systemd-analyze
-
-_systemd_analyze_set-log-level() {
-    local -a _levels
-    _levels=(debug info notice warning err crit alert emerg)
-    _describe -t level 'logging level' _levels || compadd "$@"
-}
-
-_systemd_analyze_verify() {
-    _sd_unit_files
-}
-
-_systemd_analyze_command(){
-    local -a _systemd_analyze_cmds
-    # Descriptions taken from systemd-analyze --help.
-    _systemd_analyze_cmds=(
-        'time:Print time spent in the kernel before reaching userspace'
-        'blame:Print list of running units ordered by time to init'
-        'critical-chain:Print a tree of the time critical chain of units'
-        'plot:Output SVG graphic showing service initialization'
-        'dot:Dump dependency graph (in dot(1) format)'
-        'dump:Dump server status'
-        'set-log-level:Set systemd log threshold'
-        'verify:Check unit files for correctness'
-    )
-
-    if (( CURRENT == 1 )); then
-        _describe "options" _systemd_analyze_cmds
-    else
-        local curcontext="$curcontext"
-        cmd="${${_systemd_analyze_cmds[(r)$words[1]:*]%%:*}}"
-        if (( $#cmd )); then
-            if (( $+functions[_systemd_analyze_$cmd] )) && (( CURRENT == 2 )); then
-                _systemd_analyze_$cmd
-            else
-                _message "no more options"
-            fi
-        else
-            _message "unknown systemd-analyze command: $words[1]"
-        fi
-    fi
-}
-
-_arguments \
-    {-h,--help}'[Show help text]' \
-    '--version[Show package version]' \
-    '--system[Operate on system systemd instance]' \
-    '--user[Operate on user systemd instance]' \
-    '--no-pager[Do not pipe output into a pager]' \
-    '--man=[Do (not) check for existence of man pages]:boolean:(1 0)' \
-    '--order[When generating graph for dot, show only order]' \
-    '--require[When generating graph for dot, show only requirement]' \
-    '--fuzz=[When printing the tree of the critical chain, print also services, which finished TIMESPAN earlier, than the latest in the branch]:TIMESPAN' \
-    '--from-pattern=[When generating a dependency graph, filter only origins]:GLOB' \
-    '--to-pattern=[When generating a dependency graph, filter only destinations]:GLOB' \
-    {-H+,--host=}'[Operate on remote host]:userathost:_sd_hosts_or_user_at_host' \
-    {-M+,--machine=}'[Operate on local container]:machine' \
-    '*::systemd-analyze commands:_systemd_analyze_command'
diff --git a/shell-completion/zsh/_systemd-delta b/shell-completion/zsh/_systemd-delta
deleted file mode 100644
index 757f1b66fb..0000000000
--- a/shell-completion/zsh/_systemd-delta
+++ /dev/null
@@ -1,15 +0,0 @@
-#compdef systemd-delta
-
-_delta_type() {
-    local -a _delta_types
-    _delta_types=(masked equivalent redirected overridden unchanged)
-    _values -s , "${_delta_types[@]}"
-}
-
-_arguments \
-    {-h,--help}'[Show this help]' \
-    '--version[Show package version]' \
-    '--no-pager[Do not pipe output into a pager]' \
-    '--diff=[Show a diff when overridden files differ]:boolean:(1 0)' \
-    {-t+,--type=}'[Only display a selected set of override types]:types:_delta_type' \
-    ':SUFFIX:(tmpfiles.d sysctl.d systemd/system)'
diff --git a/shell-completion/zsh/_systemd-inhibit b/shell-completion/zsh/_systemd-inhibit
deleted file mode 100644
index 1ecb6dc7ee..0000000000
--- a/shell-completion/zsh/_systemd-inhibit
+++ /dev/null
@@ -1,33 +0,0 @@
-#compdef systemd-inhibit
-
-_systemd_inhibit_command(){
-    if (( CURRENT == 1 )); then
-        compset -q
-        _normal
-    else
-        local n=${words[(b:2:i)[^-]*]}
-        if (( n <= CURRENT )); then
-            compset -n $n
-            _alternative \
-                'files:file:_files' \
-                'commands:command:_normal' && return 0
-        fi
-        _default
-    fi
-}
-
-_inhibit_what() {
-    local _inhibit
-    _inhibit=(shutdown sleep idle handle-power-key handle-suspend-key handle-hibernate-key handle-lid-switch)
-    _values -s : "${_inhibit[@]}"
-}
-
-_arguments \
-    {-h,--help}'[Show this help]' \
-    '--version[Show package version]' \
-    '--what=[Operations to inhibit]:options:_inhibit_what' \
-    '--who=[A descriptive string who is inhibiting]' \
-    '--why=[A descriptive string why is being inhibited]' \
-    '--mode=[One of block or delay]' \
-    '--list[List active inhibitors]' \
-    '*:commands:_systemd_inhibit_command'
diff --git a/shell-completion/zsh/_systemd-nspawn b/shell-completion/zsh/_systemd-nspawn
deleted file mode 100644
index ceedb2c5a0..0000000000
--- a/shell-completion/zsh/_systemd-nspawn
+++ /dev/null
@@ -1,44 +0,0 @@
-#compdef systemd-nspawn
-
-_nspawn-caps(){
-    local -a _caps
-    _caps=( CAP_CHOWN CAP_DAC_OVERRIDE CAP_DAC_READ_SEARCH
-            CAP_FOWNER CAP_FSETID CAP_IPC_OWNER CAP_KILL CAP_LEASE CAP_LINUX_IMMUTABLE
-            CAP_NET_BIND_SERVICE CAP_NET_BROADCAST CAP_NET_RAW CAP_SETGID CAP_SETFCAP CAP_SETPCAP
-            CAP_SETUID CAP_SYS_ADMIN CAP_SYS_CHROOT CAP_SYS_NICE CAP_SYS_PTRACE CAP_SYS_TTY_CONFIG
-            CAP_SYS_RESOURCE CAP_SYS_BOOT )
-    _values -s , 'capabilities' "$_caps[@]"
-}
-
-_arguments \
-    {-h,--help}'[Show this help]' \
-    {--directory=,-D+}'[Directory to use as file system root for the namespace container. If omitted the current directory will be used.]:directories:_directories' \
-    {--image=,-i+}'[Disk image to mount the root directory for the container from.]' \
-    {--boot=,-b+}'[Automatically search for an init binary and invoke it instead of a shell or a user supplied program.]' \
-    {--user=,-u+}'[Run the command under specified user, create home directory and cd into it.]' \
-    {--machine=,-M+}'[Sets the machine name for this container.]' \
-    '--uuid=[Set the specified uuid for the container.]' \
-    '--slice=[Make the container part of the specified slice, instead of the default machine.slice.]' \
-    '--private-network[Turn off networking in the container. This makes all network interfaces unavailable in the container, with the exception of the loopback device.]' \
-    '--private-network[Disconnect networking of the container from the host.]' \
-    '--network-interface=[Assign the specified network interface to the container.]' \
-    '--network-macvlan=[Create a "macvlan" interface of the specified Ethernet network interface and add it to the container.]' \
-    '--network-veth[Create a virtual Ethernet link (veth) between host and container.]' \
-    '--network-bridge=[Adds the host side of the Ethernet link created with --network-veth to the specified bridge.]' \
-    {--selinux-context=,-Z+}'[Sets the SELinux security context to be used to label processes in the container.]' \
-    {--selinux-apifs-context=,-L+}'[Sets the SELinux security context to be used to label files in the virtual API file systems in the container.]' \
-    '--capability=[List one or more additional capabilities to grant the container.]:capabilities:_nspawn-caps' \
-    '--drop-capability=[Specify one or more additional capabilities to drop for the container]' \
-    "--link-journal=[Control whether the container's journal shall be made visible to the host system.]:options:(no, host, guest, auto)" \
-    '-j[Equivalent to --link-journal=guest.]' \
-    '--read-only[Mount the root file system read only for the container.]' \
-    '--bind=[Bind mount a file or directory from the host into the container.]' \
-    '--bind-ro=[Bind mount a file or directory from the host into the container (read-only).]' \
-    '--setenv=[Specifies an environment variable assignment to pass to the init process in the container, in the format "NAME=VALUE".]' \
-    '--share-system[Allows the container to share certain system facilities with the host.]' \
-    '--register=[Controls whether the container is registered with systemd-machined(8).]' \
-    '--keep-unit[Instead of creating a transient scope unit to run the container in, simply register the service or scope unit systemd-nspawn has been invoked in with systemd-machined(8).]' \
-    '--personality=[Control the architecture ("personality") reported by uname(2) in the container.]' \
-    {--quiet,-q}'[Turns off any status output by the tool itself.]' \
-    {--help,-h}'[Print a short help text and exit.]' \
-    '--version[Print a short version string and exit.]'
diff --git a/shell-completion/zsh/_systemd-run b/shell-completion/zsh/_systemd-run
deleted file mode 100644
index 8d6957fa9b..0000000000
--- a/shell-completion/zsh/_systemd-run
+++ /dev/null
@@ -1,46 +0,0 @@
-#compdef systemd-run
-
-__systemctl() {
-        local -a _modes
-        _modes=("--user" "--system")
-        systemctl ${words:*_modes} --full --no-legend --no-pager "$@" 2>/dev/null
-}
-
-__get_slices () {
-        __systemctl list-units --all -t slice \
-        | { while read -r a b; do echo $a; done; };
-}
-
-__slices () {
-        local -a _slices
-        _slices=(${(fo)"$(__get_slices)"})
-        typeset -U _slices
-        _describe 'slices' _slices
-}
-
-_arguments \
-        {-h,--help}'[Show help message]' \
-        '--version[Show package version]' \
-        '--user[Run as user unit]' \
-        {-H+,--host=}'[Operate on remote host]:[user@]host:_sd_hosts_or_user_at_host' \
-        {-M+,--machine=}'[Operate on local container]:machines:_sd_machines' \
-        '--scope[Run this as scope rather than service]' \
-        '--unit=[Run under the specified unit name]:unit name' \
-        {-p+,--property=}'[Set unit property]:NAME=VALUE' \
-        '--description=[Description for unit]:description' \
-        '--slice=[Run in the specified slice]:slices:__slices' \
-        {-r,--remain-after-exit}'[Leave service around until explicitly stopped]' \
-        '--send-sighup[Send SIGHUP when terminating]' \
-        '--service-type=[Service type]:type:(simple forking oneshot dbus notify idle)' \
-        '--uid=[Run as system user]:user:_users' \
-        '--gid=[Run as system group]:group:_groups' \
-        '--nice=[Nice level]:nice level' \
-        '--setenv=[Set environment]:NAME=VALUE' \
-        '--on-active=[Run after SEC seconds]:SEC' \
-        '--on-boot=[Run after SEC seconds from machine was booted up]:SEC' \
-        '--on-statup=[Run after SEC seconds from systemd was first started]:SEC' \
-        '--on-unit-active=[Run after SEC seconds from the last activation]:SEC' \
-        '--on-unit-inactive=[Run after SEC seconds from the last deactivation]:SEC' \
-        '--on-calendar=[Realtime timer]:SPEC' \
-        '--timer-property=[Set timer unit property]:NAME=VALUE' \
-        '*::command:_command'
diff --git a/shell-completion/zsh/_systemd-tmpfiles b/shell-completion/zsh/_systemd-tmpfiles
deleted file mode 100644
index 6ff02e5d98..0000000000
--- a/shell-completion/zsh/_systemd-tmpfiles
+++ /dev/null
@@ -1,13 +0,0 @@
-#compdef systemd-tmpfiles
-
-_arguments \
-    {-h,--help}'[Show help]' \
-    '--version[Show package version]' \
-    '--create[Create, set ownership/permissions based on the config files.]' \
-    '--clean[Clean up all files and directories with an age parameter configured.]' \
-    '--remove[All files and directories marked with r, R in the configuration files are removed.]' \
-    '--boot[Execute actions only safe at boot]' \
-    '--prefix=[Only apply rules that apply to paths with the specified prefix.]' \
-    '--exclude-prefix=[Ignore rules that apply to paths with the specified prefix.]' \
-    '--root=[Operate on an alternate filesystem root]:directory:_directories' \
-    '*::files:_files'
diff --git a/shell-completion/zsh/_timedatectl b/shell-completion/zsh/_timedatectl
deleted file mode 100644
index dfdcfebb3c..0000000000
--- a/shell-completion/zsh/_timedatectl
+++ /dev/null
@@ -1,66 +0,0 @@
-#compdef timedatectl
-
-_timedatectl_set-timezone(){
-    local -a _timezones
-    _timezones=( ${(f)"$(_call_program timezones "${service}" list-timezones)"} )
-    compadd "$_timezones[@]"
-}
-
-_timedatectl_set-time(){
-    _message "YYYY-MM-DD HH:MM:SS"
-}
-
-_timedatectl_set-local-rtc(){
-    local -a _options
-    _options=(
-        '0:Maintain RTC in universal time'
-        '1:Maintain RTC in local time'
-    )
-    _describe options _options
-}
-
-_timedatectl_set-ntp(){
-    local -a _options
-    _options=(
-        '0:Disable NTP based network time configuration'
-        '1:Enable NTP based network time configuration'
-    )
-    _describe options _options
-}
-
-_timedatectl_command(){
-    local -a _timedatectl_cmds
-    _timedatectl_cmds=(
-        'status:Show current time settings'
-        'set-time:Set system time'
-        'set-timezone:Set system timezone'
-        'list-timezones:Show known timezones'
-        'set-local-rtc:Control whether RTC is in local time'
-        'set-ntp:Control whether NTP is enabled'
-    )
-    if (( CURRENT == 1 )); then
-        _describe -t commands 'timedatectl command' _timedatectl_cmds
-    else
-        local curcontext="$curcontext"
-        cmd="${${_timedatectl_cmds[(r)$words[1]:*]%%:*}}"
-        if (( $#cmd )); then
-            if (( $+functions[_timedatectl_$cmd] )); then
-                _timedatectl_$cmd
-            else
-                _message "no more options"
-            fi
-        else
-            _message "unknown timedatectl command: $words[1]"
-        fi
-    fi
-}
-
-_arguments -s \
-    {-h,--help}'[Show this help]' \
-    '--version[Show package version]' \
-    '--adjust-system-clock[Adjust system clock when changing local RTC mode]' \
-    '--no-pager[Do not pipe output into a pager]' \
-    '--no-ask-password[Do not prompt for password]' \
-    {-H+,--host=}'[Operate on remote host]:userathost:_sd_hosts_or_user_at_host' \
-    {-M+,--machine=}'[Operate on local container]:machines:_sd_machines' \
-    '*::timedatectl commands:_timedatectl_command'