stuff

33 files changed, 0 insertions, 2620 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/journalctl b/shell-completion/bash/journalctl
deleted file mode 100644
index 7c8a9ce361..0000000000
--- a/shell-completion/bash/journalctl
+++ /dev/null
@@ -1,133 +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
-}
-
-__get_machines() {
-        local a b
-        (machinectl list-images --no-legend --no-pager; machinectl list --no-legend --no-pager; echo ".host") | \
-		{ while read a b; do echo " $a"; done; } | sort -u;
-}
-
-__journal_fields=(MESSAGE{,_ID} PRIORITY CODE_{FILE,LINE,FUNC}
-                  ERRNO SYSLOG_{FACILITY,IDENTIFIER,PID} COREDUMP_EXE
-                  _{P,U,G}ID _COMM _EXE _CMDLINE
-                  _CAP_EFFECTIVE _AUDIT_{SESSION,LOGINUID}
-                  _SYSTEMD_{CGROUP,SESSION,{,USER_}UNIT,OWNER_UID,SLICE}
-                  _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 --rotate --sync'
-                       [ARG]='-b --boot --this-boot -D --directory --file -F --field
-                              -M --machine -o --output -u --unit --user-unit -p --priority
-                              --vacuum-size --vacuum-time'
-                [ARGUNKNOWN]='-c --cursor --interval -n --lines -S --since -U --until
-                              --after-cursor --verify-key -t --identifier
-                              --root'
-        )
-
-        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[*]}
-			;;
-                        --machine|-M)
-                                comps=$( __get_machines )
-                        ;;
-                        --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/loginctl b/shell-completion/bash/loginctl
deleted file mode 100644
index 776eca4e62..0000000000
--- a/shell-completion/bash/loginctl
+++ /dev/null
@@ -1,111 +0,0 @@
-# loginctl(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
-}
-
-__get_all_sessions () { loginctl --no-legend list-sessions | { while read -r a b; do printf "%s\n" "$a"; done; } ; }
-__get_all_users    () { loginctl --no-legend list-users    | { while read -r a b; do printf "%s\n" "$b"; done; } ; }
-__get_all_seats    () { loginctl --no-legend list-seats    | { while read -r a b; do printf "%s\n" "$a"; done; } ; }
-
-_loginctl () {
-        local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
-        local i verb comps
-
-        local -A OPTS=(
-               [STANDALONE]='--all -a --help -h --no-pager --privileged -P --version
-                             --no-legend --no-ask-password -l --full'
-                      [ARG]='--host -H --kill-who --property -p --signal -s --machine'
-                      )
-
-        if __contains_word "$prev" ${OPTS[ARG]}; then
-                case $prev in
-                        --signal|-s)
-                                _signals
-                                return
-                        ;;
-                        --kill-who)
-                                comps='all leader'
-                        ;;
-                        --host|-H)
-                                comps=$(compgen -A hostname)
-                        ;;
-                        --property|-p)
-                                comps=''
-                        ;;
-                esac
-                COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
-                return 0
-        fi
-
-
-        if [[ "$cur" = -* ]]; then
-                COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
-                return 0
-        fi
-
-        local -A VERBS=(
-                [SESSIONS]='session-status show-session activate lock-session unlock-session terminate-session kill-session'
-                [USERS]='user-status show-user enable-linger disable-linger terminate-user kill-user'
-                [SEATS]='seat-status show-seat terminate-seat'
-                [STANDALONE]='list-sessions list-users list-seats flush-devices'
-                [ATTACH]='attach'
-        )
-
-        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[SESSIONS]}; then
-                comps=$( __get_all_sessions )
-
-        elif __contains_word "$verb" ${VERBS[USERS]}; then
-                comps=$( __get_all_users )
-
-        elif __contains_word "$verb" ${VERBS[SEATS]}; then
-                comps=$( __get_all_seats )
-
-        elif __contains_word "$verb" ${VERBS[STANDALONE]}; then
-                comps=''
-
-        elif __contains_word "$verb" ${VERBS[ATTACH]}; then
-                if [[ $prev = $verb ]]; then
-                        comps=$( __get_all_seats )
-                else
-                        comps=$(compgen -A file -- "$cur" )
-                        compopt -o filenames
-                fi
-        fi
-
-        COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
-        return 0
-}
-
-complete -F _loginctl loginctl
diff --git a/shell-completion/bash/machinectl b/shell-completion/bash/machinectl
deleted file mode 100644
index e7829ca968..0000000000
--- a/shell-completion/bash/machinectl
+++ /dev/null
@@ -1,99 +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-images --no-legend --no-pager; machinectl list --no-legend --no-pager; echo ".host") | \
-		{ while read a b; do echo " $a"; done; } | sort -u;
-}
-
-_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 list-images pull-tar pull-raw import-tar import-raw export-tar export-raw list-transfers cancel-transfer'
-                 [MACHINES]='status show start login shell enable disable poweroff reboot terminate kill copy-to copy-from image-status show-image clone rename read-only remove set-limit'
-        )
-
-        _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)
-                                _signals
-                                return
-                        ;;
-                        --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/networkctl b/shell-completion/bash/networkctl
deleted file mode 100644
index 942c7e1c00..0000000000
--- a/shell-completion/bash/networkctl
+++ /dev/null
@@ -1,70 +0,0 @@
-# networkctl(1) completion                               -*- shell-script -*-
-#
-# This file is part of systemd.
-#
-# 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
-        return 1
-}
-
-__get_links() {
-        networkctl list --no-legend --no-pager --all | { while read -r a b c; do echo " $b"; done; };
-}
-
-_networkctl() {
-        local i verb comps
-        local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
-        local -A OPTS=(
-               [STANDALONE]='-a --all -h --help --version --no-pager --no-legend'
-                      [ARG]=''
-        )
-
-        local -A VERBS=(
-                [STANDALONE]='list lldp'
-                [LINKS]='status'
-        )
-
-        _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 [[ "$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[LINKS]}; then
-                comps=$( __get_links )
-        fi
-
-        COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
-        return 0
-}
-
-complete -F _networkctl networkctl
diff --git a/shell-completion/bash/systemd-analyze b/shell-completion/bash/systemd-analyze
deleted file mode 100644
index 7a5f46ba1d..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 --order --require --no-pager --man'
-                      [ARG]='-H --host -M --machine --fuzz --from-pattern --to-pattern '
-        )
-
-        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 --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 f1ed22fd55..0000000000
--- a/shell-completion/bash/systemd-cgtop
+++ /dev/null
@@ -1,62 +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
-}
-
-__get_machines() {
-        local a b
-        machinectl list --no-legend --no-pager | { while read a b; do echo " $a"; 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 -r --raw -k -P'
-               [ARG]='--cpu --depth -M --machine --recursive -n --iterations -d --delay --order'
-               )
-
-        _init_completion || return
-
-        if __contains_word "$prev" ${OPTS[ARG]}; then
-                case $prev in
-                        --machine|-M)
-                                comps=$( __get_machines )
-                        ;;
-                        --recursive)
-                                comps='yes no'
-                        ;;
-                        --order)
-                                comps='path tasks cpu memory io'
-                        ;;
-                esac
-                COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
-                return 0
-        fi
-
-        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 0cf249d8ce..0000000000
--- a/shell-completion/bash/systemd-nspawn
+++ /dev/null
@@ -1,150 +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(){
-        { cd /sys/class/net && echo *; } | \
-        while read -d' ' -r name; do
-                [[ "$name" != "lo" ]] && echo "$name"
-        done
-}
-
-_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 --kill-signal --template'
-        )
-
-        _init_completion || return
-
-        if __contains_word "$prev" ${OPTS[ARG]}; then
-                case $prev in
-                        --directory|-D|--template)
-                                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 try-guest host try-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" )
-                        ;;
-                        --kill-signal)
-                                _signals
-                                return
-                        ;;
-                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-path b/shell-completion/bash/systemd-path
deleted file mode 100644
index 2f0c5f5bd7..0000000000
--- a/shell-completion/bash/systemd-path
+++ /dev/null
@@ -1,60 +0,0 @@
-# systemd-path(1) completion                               -*- shell-script -*-
-#
-# This file is part of systemd.
-#
-# 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
-        return 1
-}
-
-__get_names() {
-        systemd-path | { while IFS=: read -r a b; do echo " $a"; done; }
-}
-
-_systemd_path() {
-        local comps
-        local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
-        local -A OPTS=(
-               [STANDALONE]='-h --help --version'
-                      [ARG]='--suffix'
-        )
-
-        _init_completion || return
-
-        if __contains_word "$prev" ${OPTS[ARG]}; then
-                case $prev in
-                        --suffix)
-                                comps=''
-                        ;;
-                esac
-                COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
-                return 0
-        fi
-
-        if [[ "$cur" = -* ]]; then
-                COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
-                return 0
-        fi
-
-        comps=$( __get_names )
-        COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
-        return 0
-}
-
-complete -F _systemd_path systemd-path
diff --git a/shell-completion/bash/systemd-run b/shell-completion/bash/systemd-run
deleted file mode 100644
index 8152b021e7..0000000000
--- a/shell-completion/bash/systemd-run
+++ /dev/null
@@ -1,117 +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
-                --on-active --on-boot --on-startup --on-unit-active --on-unit-inactive
-                --on-calendar --timer-property -t --pty -q --quiet --no-block
-                --uid --gid --nice --setenv -p --property --no-ask-password'
-
-    local mode=--system
-    local i
-    local opts_with_values=(
-        --unit --description --slice --service-type -H --host -M --machine -p --property --on-active
-        --on-boot --on-startup --on-unit-active --on-unit-inactive --on-calendar --timer-property
-    )
-    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 && " ${opts_with_values[@]} " =~ " ${COMP_WORDS[i]} " ]] && ((i++))
-    done
-
-    case "$prev" in
-        --unit|--description|--on-active|--on-boot|--on-startup|--on-unit-active|--on-unit-inactive|--on-calendar)
-            # 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= PrivateTmp= PrivateDevices=
-                         PrivateNetwork= NoNewPrivileges= WorkingDirectory= RootDirectory=
-                         TTYPath= SyslogIdentifier= SyslogLevelPrefix= SyslogLevel=
-                         SyslogFacility= TimerSlackNSec= OOMScoreAdjust= ReadWriteDirectories=
-                         ReadOnlyDirectories= InaccessibleDirectories= EnvironmentFile=
-                         ProtectSystem= ProtectHome= RuntimeDirectory= PassEnvironment='
-
-            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
-            ;;
-        --timer-property)
-            local comps='AccuracySec= WakeSystem='
-            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/bash/udevadm b/shell-completion/bash/udevadm
deleted file mode 100644
index b828b8dd7c..0000000000
--- a/shell-completion/bash/udevadm
+++ /dev/null
@@ -1,97 +0,0 @@
-# udevadm(8) 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
-}
-
-__get_all_sysdevs() {
-        local -a devs=(/sys/bus/*/devices/*/ /sys/class/*/*/)
-        printf '%s\n' "${devs[@]%/}"
-}
-
-_udevadm() {
-        local i verb comps
-        local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
-        local OPTS='-h --help --version --debug'
-
-        local verbs=(info trigger settle control monitor hwdb test-builtin test)
-
-        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
-                COMPREPLY=( $(compgen -W '${OPTS[*]} ${verbs[*]}' -- "$cur") )
-                return 0
-        fi
-
-        case $verb in
-                'info')
-                        if [[ $cur = -* ]]; then
-                                comps='--help --query= --path= --name= --root --attribute-walk --export-db --cleanup-db'
-                        else
-                                comps=$( __get_all_sysdevs )
-                        fi
-                        ;;
-                'trigger')
-                        comps='--help --verbose --dry-run --type= --action= --subsystem-match=
-                               --subsystem-nomatch= --attr-match= --attr-nomatch= --property-match=
-                               --tag-match= --sysname-match= --parent-match='
-                        ;;
-                'settle')
-                        comps='--help --timeout= --seq-start= --seq-end= --exit-if-exists= --quiet'
-                        ;;
-                'control')
-                        comps='--help --exit --log-priority= --stop-exec-queue --start-exec-queue
-                               --reload --property= --children-max= --timeout='
-                        ;;
-                'monitor')
-                        comps='--help --kernel --udev --property --subsystem-match= --tag-match='
-                        ;;
-                'hwdb')
-                        comps='--help --update --test='
-                        ;;
-                'test')
-                        if [[ $cur = -* ]]; then
-                                comps='--help --action='
-                        else
-                                comps=$( __get_all_sysdevs )
-                        fi
-                        ;;
-                'test-builtin')
-                        comps='blkid btrfs hwdb input_id keyboard kmod net_id net_setup_link path_id usb_id uaccess'
-                        ;;
-                *)
-                        comps=${VERBS[*]}
-                        ;;
-        esac
-
-        COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
-        return 0
-}
-
-complete -F _udevadm udevadm
diff --git a/shell-completion/zsh/_bootctl b/shell-completion/zsh/_bootctl
deleted file mode 100644
index 0e1b0a5562..0000000000
--- a/shell-completion/zsh/_bootctl
+++ /dev/null
@@ -1,30 +0,0 @@
-#compdef bootctl
-
-(( $+functions[_bootctl_command] )) || _bootctl_command()
-{
-    local -a _bootctl_cmds
-    _bootctl_cmds=(
-        "status:Show status of installed systemd-boot and EFI variables"
-        "install:Install systemd-boot to the ESP and EFI variables"
-        "update:Update systemd-boot in the ESP and EFI variables"
-        "remove:Remove systemd-boot from the ESP and EFI variables"
-    )
-    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.]' \
-    '--path=[Path to the EFI System Partition (ESP)]:path:_directories' \
-    '--no-variables[Do not touch EFI variables]' \
-    '*::bootctl command:_bootctl_command'
diff --git a/shell-completion/zsh/_busctl b/shell-completion/zsh/_busctl
deleted file mode 100644
index a425b8c700..0000000000
--- a/shell-completion/zsh/_busctl
+++ /dev/null
@@ -1,72 +0,0 @@
-#compdef busctl
-
-# busctl(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"
-        "status:Show bus service, process or bus owner credentials"
-        "monitor:Show bus traffic"
-        "capture:Capture bus traffix as pcap"
-        "tree:Show object tree of service"
-        "introspect:Introspect object"
-        "call:Call a method"
-        "get-property:Get property value"
-        "set-property:Set property value"
-    )
-    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' \
-    '--list[Do not show tree, but simple object path list]' \
-    '--quiet[Do not show method call reply]'\
-    '--verbose[Show result values in long format]' \
-    '--expect-reply=[Expect a method call reply]:boolean:(1 0)' \
-    '--auto-start=[Auto-start destination service]:boolean:(1 0)' \
-    '--allow-interactive-authorization=[Allow interactive authorization for operation]:boolean:(1 0)' \
-    '--timeout=[Maximum time to wait for method call completion]:timeout (seconds)' \
-    '--augment-creds=[Extend credential data with data read from /proc/$PID]:boolean:(1 0)' \
-    '*::busctl command:_busctl_command'
diff --git a/shell-completion/zsh/_coredumpctl b/shell-completion/zsh/_coredumpctl
deleted file mode 100644
index e4c04a697f..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 --no-legend | awk 'BEGIN{OFS=":"} {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/_journalctl b/shell-completion/zsh/_journalctl
deleted file mode 100644
index 2bee23b6d3..0000000000
--- a/shell-completion/zsh/_journalctl
+++ /dev/null
@@ -1,98 +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=$(_call_program fields $cmd[@])
-    _fields=${_fields//'\'/'\\'}
-    _fields=${_fields//':'/'\:'}
-    _fields=( ${(f)_fields} )
-    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' \
-    {-t+,--identifier=}'[Show only messages with the specified syslog identifier]:identifier:_journal_fields SYSLOG_IDENTIFIER' \
-    {-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]' \
-    {-M+,--machine=}'[Operate on local container]:machines:_sd_machines' \
-    {-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/_loginctl b/shell-completion/zsh/_loginctl
deleted file mode 100644
index 6f6ff6e314..0000000000
--- a/shell-completion/zsh/_loginctl
+++ /dev/null
@@ -1,172 +0,0 @@
-#compdef loginctl
-
-_loginctl_all_sessions() {
-  local session description
-  loginctl --no-legend list-sessions | while read -r session description; do
-    _sys_all_sessions+=( "$session" )
-    _sys_all_sessions_descr+=( "${session}:$description" )
-  done
-}
-
-_loginctl_all_users() {
-  local uid description
-  loginctl --no-legend list-users | while read -r uid description; do
-    _sys_all_users+=( "$uid" )
-    _sys_all_users_descr+=( "${uid}:$description" )
-  done
-}
-
-_loginctl_all_seats() {
-  local seat description
-  loginctl --no-legend list-seats | while read -r seat description; do
-    _sys_all_seats+=( "$seat" )
-    _sys_all_seats_descr+=( "${seat}:$description" )
-  done
-}
-
-local fun
-# Completion functions for SESSIONS
-for fun in session-status show-session activate lock-session unlock-session terminate-session kill-session ; do
-  (( $+functions[_loginctl_$fun] )) || _loginctl_$fun()
-  {
-    local -a _sys_all_sessions{,_descr}
-
-    _loginctl_all_sessions
-    for _ignore in $words[2,-1]; do
-      _sys_all_sessions[(i)$_ignore]=()
-      _sys_all_sessions_descr[(i)$_ignore:*]=()
-    done
-
-    if zstyle -T ":completion:${curcontext}:systemd-sessions" verbose; then
-      _describe -t systemd-sessions session _sys_all_sessions_descr _sys_all_sessions "$@"
-    else
-      local expl
-      _wanted systemd-sessions expl session compadd "$@" -a _sys_all_sessions
-    fi
-  }
-done
-
-# Completion functions for USERS
-for fun in user-status show-user enable-linger disable-linger terminate-user kill-user ; do
-  (( $+functions[_loginctl_$fun] )) || _loginctl_$fun()
-  {
-    local -a _sys_all_users{,_descr}
-    zstyle -a ":completion:${curcontext}:users" users _sys_all_users
-
-    if ! (( $#_sys_all_users )); then
-      _loginctl_all_users
-    fi
-
-    for _ignore in $words[2,-1]; do
-      _sys_all_users[(i)$_ignore]=()
-      _sys_all_users_descr[(i)$_ignore:*]=()
-    done
-
-    # using the common tag `users' here, not rolling our own `systemd-users' tag
-    if zstyle -T ":completion:${curcontext}:users" verbose; then
-      _describe -t users user ${_sys_all_users_descr:+_sys_all_users_descr} _sys_all_users "$@"
-    else
-      local expl
-      _wanted users expl user compadd "$@" -a _sys_all_users
-    fi
-  }
-done
-
-# Completion functions for SEATS
-(( $+functions[_loginctl_seats] )) || _loginctl_seats()
-{
-  local -a _sys_all_seats{,_descr}
-
-  _loginctl_all_seats
-  for _ignore in $words[2,-1]; do
-    _sys_all_seats[(i)$_ignore]=()
-    _sys_all_seats_descr[(i)$_ignore:*]=()
-  done
-
-  if zstyle -T ":completion:${curcontext}:systemd-seats" verbose; then
-    _describe -t systemd-seats seat _sys_all_seats_descr _sys_all_seats "$@"
-  else
-    local expl
-    _wanted systemd-seats expl seat compadd "$@" -a _sys_all_seats
-  fi
-}
-for fun in seat-status show-seat terminate-seat ; do
-  (( $+functions[_loginctl_$fun] )) || _loginctl_$fun()
-  { _loginctl_seats }
-done
-
-# Completion functions for ATTACH
-(( $+functions[_loginctl_attach] )) || _loginctl_attach()
-{
-  _arguments -w -C -S -s \
-    ':seat:_loginctl_seats' \
-    '*:device:_files'
-}
-
-# no loginctl completion for:
-# [STANDALONE]='list-sessions list-users list-seats flush-devices'
-
-(( $+functions[_loginctl_command] )) || _loginctl_command()
-{
-  local -a _loginctl_cmds
-  _loginctl_cmds=(
-    "list-sessions:List sessions"
-    "session-status:Show session status"
-    "show-session:Show properties of one or more sessions"
-    "activate:Activate a session"
-    "lock-session:Screen lock one or more sessions"
-    "unlock-session:Screen unlock one or more sessions"
-    "lock-sessions:Screen lock all current sessions"
-    "unlock-sessions:Screen unlock all current sessions"
-    "terminate-session:Terminate one or more sessions"
-    "kill-session:Send signal to processes of a session"
-    "list-users:List users"
-    "user-status:Show user status"
-    "show-user:Show properties of one or more users"
-    "enable-linger:Enable linger state of one or more users"
-    "disable-linger:Disable linger state of one or more users"
-    "terminate-user:Terminate all sessions of one or more users"
-    "kill-user:Send signal to processes of a user"
-    "list-seats:List seats"
-    "seat-status:Show seat status"
-    "show-seat:Show properties of one or more seats"
-    "attach:Attach one or more devices to a seat"
-    "flush-devices:Flush all device associations"
-    "terminate-seat:Terminate all sessions on one or more seats"
-  )
-
-  if (( CURRENT == 1 )); then
-    _describe -t commands 'loginctl command' _loginctl_cmds || compadd "$@"
-  else
-    local curcontext="$curcontext" _ignore
-
-    cmd="${${_loginctl_cmds[(r)$words[1]:*]%%:*}}"
-
-    if (( $#cmd )); then
-      curcontext="${curcontext%:*:*}:loginctl-${cmd}:"
-
-      _call_function ret _loginctl_$cmd || _message 'no more arguments'
-    else
-      _message "unknown loginctl command: $words[1]"
-    fi
-    return ret
-  fi
-}
-
-
-_arguments -s \
-    {-h,--help}'[Show help]' \
-    '--version[Show package version]' \
-    \*{-p+,--property=}'[Show only properties by this name]:unit property' \
-    {-a,--all}'[Show all properties, including empty ones]' \
-    '--kill-who=[Who to send signal to]:killwho:(main control all)' \
-    {-s+,--signal=}'[Which signal to send]:signal:_signals' \
-    {-H+,--host=}'[Operate on remote host]:userathost:_sd_hosts_or_user_at_host' \
-    {-M+,--machine=}'[Operate on local container]:machine:_sd_machines' \
-    {-l,--full}'[Do not ellipsize output]' \
-    '--no-pager[Do not pipe output into a pager]' \
-    '--no-legend[Do not show the headers and footers]' \
-    '--no-ask-password[Do not ask for system passwords]' \
-    {-n+,--lines=}'[Number of journal entries to show]' \
-    {-o+,--output=}'[Change journal output mode]:output modes:_sd_outputmodes' \
-    '*::loginctl command:_loginctl_command'
diff --git a/shell-completion/zsh/_machinectl b/shell-completion/zsh/_machinectl
deleted file mode 100644
index 198fa28f7b..0000000000
--- a/shell-completion/zsh/_machinectl
+++ /dev/null
@@ -1,99 +0,0 @@
-#compdef machinectl
-
-__get_available_machines () {
-    machinectl --no-legend list-images | {while read -r a b; do echo $a; done;}
-}
-
-_available_machines() {
-    local -a _machines
-    _machines=("${(fo)$(__get_available_machines)}")
-    typeset -U _machines
-    if [[ -n "$_machines" ]]; then
-        _describe 'machines' _machines
-    else
-        _message 'no machines'
-    fi
-}
-
-(( $+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"
-    "start:Start container as a service"
-    "login:Get a login prompt on a VM/container"
-    "enable:Enable automatic container start at boot"
-    "disable:Disable automatic container start at boot"
-    "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"
-    "copy-to:Copy files from the host to a container"
-    "copy-from:Copy files from a container to the host"
-    "bind:Bind mount a path from the host into a container"
-
-    "list-images:Show available container and VM images"
-    "image-status:Show image details"
-    "show-image:Show properties of image"
-    "clone:Clone an image"
-    "rename:Rename an image"
-    "read-only:Mark or unmark image read-only"
-    "remove:Remove an image"
-
-    "pull-tar:Download a TAR container image"
-    "pull-raw:Download a RAW container or VM image"
-    "list-transfers:Show list of downloads in progress"
-    "cancel-transfer:Cancel a download"
-  )
-
-  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
-      if (( CURRENT == 2 )); then
-        case $cmd in
-          list*|cancel-transfer|pull-tar|pull-raw)
-            msg="no options" ;;
-          start)
-            _available_machines ;;
-          *)
-            _sd_machines
-        esac
-      else
-        case $cmd in
-          copy-to|copy-from|bind)
-            _files ;;
-          *) msg="no options"
-        esac
-      fi
-    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.]' \
-  '--no-ask-password[Do not ask for system passwords.]' \
-  {-H+,--host=}'[Operate on remote host.]:userathost:_sd_hosts_or_user_at_host' \
-  {-M+,--machine=}'[Operate on local container.]:machine:_sd_machines' \
-  {-p+,--property=}'[Limit output to specified property.]:property:(Name Id Timestamp TimestampMonotonic Service Scope Leader Class State RootDirectory)' \
-  {-a,--all}'[Show all proerties.]' \
-  {-q,--quiet}'[Suppress output.]' \
-  {-l,--full}'[Do not ellipsize cgroup members.]' \
-  '--kill-who=[Who to send signal to.]:killwho:(leader all)' \
-  {-s+,--signal=}'[Which signal to send.]:signal:_signals' \
-  '--read-only[Create read-only bind mount.]' \
-  '--mkdir[Create directory before bind mounting, if missing.]' \
-  {-n+,--lines=}'[Number of journal entries to show.]:integer' \
-  {-o+,--output=}'[Change journal output mode.]:output modes:_sd_outputmodes' \
-  '--verify=[Verification mode for downloaded images.]:verify:(no checksum signature)' \
-  '--force[Download image even if already exists.]' \
-  '*::machinectl command:_machinectl_command'
diff --git a/shell-completion/zsh/_networkctl b/shell-completion/zsh/_networkctl
deleted file mode 100644
index 61f173b78e..0000000000
--- a/shell-completion/zsh/_networkctl
+++ /dev/null
@@ -1,35 +0,0 @@
-#compdef networkctl
-
-_networkctl_command(){
-    local -a _networkctl_cmds
-    _networkctl_cmds=(
-            'list:List existing links'
-	    'status:Show information about the specified links'
-	    'lldp:Show Link Layer Discovery Protocol status'
-    )
-    if (( CURRENT == 1 )); then
-        _describe -t commands 'networkctl command' _networkctl_cmds
-    else
-        local curcontext="$curcontext"
-        local -a _links
-        cmd="${${_networkctl_cmds[(r)$words[1]:*]%%:*}}"
-        if [ $cmd = "status" ]; then
-            _links=( "${(foa)$(networkctl list --no-legend | awk 'BEGIN{OFS=":"} {sub(/[[ \t]+/, ""); print $2,$0}' 2>/dev/null)}" )
-            if [[ -n "$_links" ]]; then
-                _describe -t links 'links' _links
-            else
-                _message "no links"
-            fi
-        else
-            _message "no more options"
-        fi
-    fi
-}
-
-_arguments \
-    {-a,--all}'[Show all links with status]' \
-    '--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]' \
-    '*::networkctl commands:_networkctl_command'
diff --git a/shell-completion/zsh/_systemd-analyze b/shell-completion/zsh/_systemd-analyze
deleted file mode 100644
index efafddc686..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:_sd_machines' \
-    '*::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 1b3247b2cd..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]:who is inhibiting:' \
-    '--why=[A descriptive string why is being inhibited]:reason for the lock:' \
-    '--mode=[One of block or delay]:lock mode:( block 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 3e0f667909..0000000000
--- a/shell-completion/zsh/_systemd-nspawn
+++ /dev/null
@@ -1,49 +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.]' \
-    '--version[Print a short version string and exit.]' \
-    {--quiet,-q}'[Turns off any status output by the tool itself.]' \
-    {--directory=,-D+}'[Directory to use as file system root for the namespace container. If omitted the current directory will be used.]:directories:_directories' \
-    '--template=[Initialize root directory from template directory, if missing.]:template:_directories' \
-    {--ephemeral,-x}'[Run container with snapshot of root directory, and remove it after exit.]' \
-    {--image=,-i+}'[Disk image to mount the root directory for the container from.]:disk image: _files' \
-    {--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.]:user:_users' \
-    {--machine=,-M+}'[Sets the machine name for this container.]: : _message "container name"' \
-    '--uuid=[Set the specified uuid for the container.]: : _message "container UUID"' \
-    {--slice=,-S+}'[Make the container part of the specified slice, instead of the default machine.slice.]: : _message slice' \
-    '--private-network[Disconnect networking of the container from the host.]' \
-    '--network-interface=[Assign the specified network interface to the container.]: : _net_interfaces' \
-    '--network-macvlan=[Create a "macvlan" interface of the specified Ethernet network interface and add it to the container.]: : _net_interfaces' \
-    '--network-ipvlan=[Create a ipvlan network interface based on an existing network interface to the container.]: : _net_interfaces' \
-    {--network-veth,-n}'[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.]: : _net_interfaces' \
-    {--port=,-p+}'[Expose a container IP port on the host.]: : _message port' \
-    {--selinux-context=,-Z+}'[Sets the SELinux security context to be used to label processes in the container.]: : _message "SELinux context"' \
-    {--selinux-apifs-context=,-L+}'[Sets the SELinux security context to be used to label files in the virtual API file systems in the container.]: : _message "SELinux context"' \
-    '--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 containerm]:capabilities:_nspawn-caps' \
-    "--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.]: : _files' \
-    '--bind-ro=[Bind mount a file or directory from the host into the container (read-only).]: : _files' \
-    '--tmpfs=[Mount an empty tmpfs to the specified directory.]: : _files' \
-    '--setenv=[Specifies an environment variable assignment to pass to the init process in the container, in the format "NAME=VALUE".]: : _message "environment variables"' \
-    '--share-system[Allows the container to share certain system facilities with the host.]' \
-    '--register=[Controls whether the container is registered with systemd-machined(8).]:systemd-machined registration:( yes no )' \
-    '--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.]:architecture:(x86 x86-64)' \
-    '--volatile=[Run the system in volatile mode.]:volatile:(no yes state)' \
-    '*:: : _normal'
diff --git a/shell-completion/zsh/_systemd-run b/shell-completion/zsh/_systemd-run
deleted file mode 100644
index c425085cd8..0000000000
--- a/shell-completion/zsh/_systemd-run
+++ /dev/null
@@ -1,60 +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:(( \
-                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= PrivateTmp= PrivateDevices= \
-                PrivateNetwork= NoNewPrivileges= WorkingDirectory= RootDirectory= \
-                TTYPath= SyslogIdentifier= SyslogLevelPrefix= SyslogLevel= \
-                SyslogFacility= TimerSlackNSec= OOMScoreAdjust= ReadWriteDirectories= \
-                ReadOnlyDirectories= InaccessibleDirectories= EnvironmentFile= \
-                ProtectSystem= ProtectHome= RuntimeDirectory= PassEnvironment= \
-                ))' \
-        '--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'
diff --git a/shell-completion/zsh/_udevadm b/shell-completion/zsh/_udevadm
deleted file mode 100644
index bb23e64d24..0000000000
--- a/shell-completion/zsh/_udevadm
+++ /dev/null
@@ -1,141 +0,0 @@
-#compdef udevadm
-
-_udevadm_info(){
-    _arguments \
-        '--query=[Query the database for specified type of device data. It needs the --path or --name to identify the specified device.]:type:(name symlink path property all)' \
-        '--path=[The devpath of the device to query.]:sys files:_files -P /sys/ -W /sys' \
-        '--name=[The name of the device node or a symlink to query]:device files:_files -P /dev/ -W /dev' \
-        '--root[Print absolute paths in name or symlink query.]' \
-        '--attribute-walk[Print all sysfs properties of the specified device that can be used in udev rules to match the specified device]' \
-        '--export[Print output as key/value pairs.]' \
-        '--export-prefix=[Add a prefix to the key name of exported values.]:prefix' \
-        '--device-id-of-file=[Print major/minor numbers of the underlying device, where the file lives on.]:files:_udevadm_mounts' \
-        '--export-db[Export the content of the udev database.]' \
-        '--cleanup-db[Cleanup the udev database.]'
-}
-
-_udevadm_trigger(){
-    _arguments \
-        '--verbose[Print the list of devices which will be triggered.]' \
-        '--dry-run[Do not actually trigger the event.]' \
-        '--type=[Trigger a specific type of devices.]:types:(devices subsystems failed)' \
-        '--action=[Type of event to be triggered.]:actions:(add change remove)' \
-        '--subsystem-match=[Trigger events for devices which belong to a matching subsystem.]' \
-        '--subsystem-nomatch=[Do not trigger events for devices which belong to a matching subsystem.]' \
-        '--attr-match=attribute=[Trigger events for devices with a matching sysfs attribute.]' \
-        '--attr-nomatch=attribute=[Do not trigger events for devices with a matching sysfs attribute.]' \
-        '--property-match=[Trigger events for devices with a matching property value.]' \
-        '--tag-match=property[Trigger events for devices with a matching tag.]' \
-        '--sysname-match=[Trigger events for devices with a matching sys device name.]' \
-        '--parent-match=[Trigger events for all children of a given device.]'
-}
-
-_udevadm_settle(){
-    _arguments \
-       '--timeout=[Maximum number of seconds to wait for the event queue to become empty.]' \
-       '--seq-start=[Wait only for events after the given sequence number.]' \
-       '--seq-end=[Wait only for events before the given sequence number.]' \
-       '--exit-if-exists=[Stop waiting if file exists.]:files:_files' \
-       '--quiet[Do not print any output, like the remaining queue entries when reaching the timeout.]' \
-       '--help[Print help text.]'
-}
-
-_udevadm_control(){
-    _arguments \
-        '--exit[Signal and wait for systemd-udevd to exit.]' \
-        '--log-priority=[Set the internal log level of systemd-udevd.]:priorities:(err info debug)' \
-        '--stop-exec-queue[Signal systemd-udevd to stop executing new events. Incoming events will be queued.]' \
-        '--start-exec-queue[Signal systemd-udevd to enable the execution of events.]' \
-        '--reload[Signal systemd-udevd to reload the rules files and other databases like the kernel module index.]' \
-        '--property=[Set a global property for all events.]' \
-        '--children-max=[Set the maximum number of events.]' \
-        '--timeout=[The maximum number of seconds to wait for a reply from systemd-udevd.]' \
-        '--help[Print help text.]'
-}
-
-_udevadm_monitor(){
-    _arguments \
-        '--kernel[Print the kernel uevents.]' \
-        '--udev[Print the udev event after the rule processing.]' \
-        '--property[Also print the properties of the event.]' \
-        '--subsystem-match=[Filter events by subsystem/\[devtype\].]' \
-        '--tag-match=[Filter events by property.]' \
-        '--help[Print help text.]'
-}
-
-_udevadm_test(){
-    _arguments \
-        '--action=[The action string.]:actions:(add change remove)' \
-        '--subsystem=[The subsystem string.]' \
-        '--help[Print help text.]' \
-        '*::devpath:_files -P /sys/ -W /sys'
-}
-
-_udevadm_test-builtin(){
-    if (( CURRENT == 2 )); then
-    _arguments \
-        '--help[Print help text]' \
-        '*::builtins:(blkid btrfs hwdb input_id net_id net_setup_link kmod path_id usb_id uaccess)'
-    elif  (( CURRENT == 3 )); then
-        _arguments \
-            '--help[Print help text]' \
-            '*::syspath:_files -P /sys -W /sys'
-    else
-        _arguments \
-            '--help[Print help text]'
-    fi
-}
-
-_udevadm_mounts(){
-  local dev_tmp dpath_tmp mp_tmp mline
-
-    tmp=( "${(@f)$(< /proc/self/mounts)}" )
-    dev_tmp=( "${(@)${(@)tmp%% *}:#none}" )
-    mp_tmp=( "${(@)${(@)tmp#* }%% *}" )
-
-  local MATCH
-  mp_tmp=("${(@q)mp_tmp//(#m)\\[0-7](#c3)/${(#)$(( 8#${MATCH[2,-1]} ))}}")
-  dpath_tmp=( "${(@Mq)dev_tmp:#/*}" )
-  dev_tmp=( "${(@q)dev_tmp:#/*}" )
-
-  _alternative \
-    'device-paths: device path:compadd -a dpath_tmp' \
-    'directories:mount point:compadd -a mp_tmp'
-}
-
-
-_udevadm_command(){
-    local -a _udevadm_cmds
-    _udevadm_cmds=(
-        'info:query sysfs or the udev database'
-        'trigger:request events from the kernel'
-        'settle:wait for the event queue to finish'
-        'control:control the udev daemon'
-        'monitor:listen to kernel and udev events'
-        'test:test an event run'
-        'test-builtin:test a built-in command'
-    )
-
-    if ((CURRENT == 1)); then
-        _describe -t commands 'udevadm commands' _udevadm_cmds
-    else
-        local curcontext="$curcontext"
-        cmd="${${_udevadm_cmds[(r)$words[1]:*]%%:*}}"
-        if (($#cmd)); then
-            if (( $+functions[_udevadm_$cmd] )); then
-                _udevadm_$cmd
-            else
-                _message "no options for $cmd"
-            fi
-        else
-            _message "no more options"
-        fi
-    fi
-}
-
-
-_arguments \
-    '--debug[Print debug messages to stderr]' \
-    '--version[Print version number]' \
-    '--help[Print help text]' \
-    '*::udevadm commands:_udevadm_command'