diff --git a/defaults/main.yaml b/defaults/main.yaml
index 4a45e8b..d78a486 100644
--- a/defaults/main.yaml
+++ b/defaults/main.yaml
@@ -42,24 +42,12 @@ nodepool_file_secure_conf_mode: 0600
 nodepool_file_secure_conf_owner: "{{ nodepool_user_name }}"
 nodepool_file_secure_conf_src: etc/nodepool/secure.conf
 
-nodepool_file_logging_conf_dest: /etc/nodepool/logging.conf
-nodepool_file_logging_conf_group: "{{ nodepool_user_group }}"
-nodepool_file_logging_conf_mode: 0644
-nodepool_file_logging_conf_owner: "{{ nodepool_user_name }}"
-nodepool_file_logging_conf_src: etc/nodepool/logging.conf
-
 nodepool_file_builder_logging_conf_dest: /etc/nodepool/builder-logging.conf
 nodepool_file_builder_logging_conf_group: "{{ nodepool_user_group }}"
 nodepool_file_builder_logging_conf_mode: 0644
 nodepool_file_builder_logging_conf_owner: "{{ nodepool_user_name }}"
 nodepool_file_builder_logging_conf_src: etc/nodepool/builder-logging.conf
 
-nodepool_file_deleter_logging_conf_dest: /etc/nodepool/deleter-logging.conf
-nodepool_file_deleter_logging_conf_group: "{{ nodepool_user_group }}"
-nodepool_file_deleter_logging_conf_mode: 0644
-nodepool_file_deleter_logging_conf_owner: "{{ nodepool_user_name }}"
-nodepool_file_deleter_logging_conf_src: etc/nodepool/deleter-logging.conf
-
 nodepool_file_launcher_logging_conf_dest: /etc/nodepool/launcher-logging.conf
 nodepool_file_launcher_logging_conf_group: "{{ nodepool_user_group }}"
 nodepool_file_launcher_logging_conf_mode: 0644
@@ -69,8 +57,8 @@ nodepool_file_launcher_logging_conf_src: etc/nodepool/launcher-logging.conf
 # tasks/install.yaml
 nodepool_git_dest: /opt/ansible-role-nodepool/git/openstack-infra/nodepool
 nodepool_git_uri: https://git.openstack.org/openstack-infra/nodepool
+nodepool_git_version: feature/zuulv3
 # nodepool_git_refspec:
-# nodepool_git_version:
 
 nodepool_install_method: git
 
@@ -80,45 +68,23 @@ nodepool_pip_name: nodepool
 #nodepool_pip_virtualenv:
 
 # tasks/service.yaml
-nodepool_file_nodepool_service_group: root
-nodepool_file_nodepool_service_owner: root
-
-nodepool_file_nodepool_service_config_group: root
-nodepool_file_nodepool_service_config_owner: root
-
 nodepool_file_nodepool_builder_service_group: root
 nodepool_file_nodepool_builder_service_owner: root
 
 nodepool_file_nodepool_builder_service_config_group: root
 nodepool_file_nodepool_builder_service_config_owner: root
 
-nodepool_file_nodepool_deleter_service_group: root
-nodepool_file_nodepool_deleter_service_owner: root
-
-nodepool_file_nodepool_deleter_service_config_group: root
-nodepool_file_nodepool_deleter_service_config_owner: root
-
 nodepool_file_nodepool_launcher_service_group: root
 nodepool_file_nodepool_launcher_service_owner: root
 
 nodepool_file_nodepool_launcher_service_config_group: root
 nodepool_file_nodepool_launcher_service_config_owner: root
 
-nodepool_service_nodepool_enabled: yes
-nodepool_service_nodepool_manage: true
-nodepool_service_nodepool_name: nodepool
-nodepool_service_nodepool_state: started
-
 nodepool_service_nodepool_builder_enabled: yes
 nodepool_service_nodepool_builder_manage: true
 nodepool_service_nodepool_builder_name: nodepool-builder
 nodepool_service_nodepool_builder_state: started
 
-nodepool_service_nodepool_deleter_enabled: yes
-nodepool_service_nodepool_deleter_manage: true
-nodepool_service_nodepool_deleter_name: nodepool-deleter
-nodepool_service_nodepool_deleter_state: started
-
 nodepool_service_nodepool_launcher_enabled: yes
 nodepool_service_nodepool_launcher_manage: true
 nodepool_service_nodepool_launcher_name: nodepool-launcher
diff --git a/tasks/config.yaml b/tasks/config.yaml
index cff3384..2eb4e3a 100644
--- a/tasks/config.yaml
+++ b/tasks/config.yaml
@@ -45,16 +45,6 @@
     src: "{{ nodepool_file_secure_conf_src }}"
   register: nodepool_file_secure_conf
 
-- name: Install logging configuration file.
-  become: yes
-  template:
-    dest: "{{ nodepool_file_logging_conf_dest }}"
-    group: "{{ nodepool_file_logging_conf_group }}"
-    mode: "{{ nodepool_file_logging_conf_mode }}"
-    owner: "{{nodepool_file_logging_conf_owner }}"
-    src: "{{ nodepool_file_logging_conf_src }}"
-  register: nodepool_file_logging_conf
-
 - name: Install builder logging configuration file.
   become: yes
   template:
@@ -65,16 +55,6 @@
     src: "{{ nodepool_file_builder_logging_conf_src }}"
   register: nodepool_file_builder_logging_conf
 
-- name: Install deleter logging configuration file.
-  become: yes
-  template:
-    dest: "{{ nodepool_file_deleter_logging_conf_dest }}"
-    group: "{{ nodepool_file_deleter_logging_conf_group }}"
-    mode: "{{ nodepool_file_deleter_logging_conf_mode }}"
-    owner: "{{nodepool_file_deleter_logging_conf_owner }}"
-    src: "{{ nodepool_file_deleter_logging_conf_src }}"
-  register: nodepool_file_deleter_logging_conf
-
 - name: Install launcher logging configuration file.
   become: yes
   template:
diff --git a/tasks/service.yaml b/tasks/service.yaml
index 6d99165..4bc65e3 100644
--- a/tasks/service.yaml
+++ b/tasks/service.yaml
@@ -12,36 +12,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 ---
-- name: Define nodepool_file_nodepool_service_dest.
-  set_fact:
-    nodepool_file_nodepool_service_dest: "{{ __nodepool_file_nodepool_service_dest }}"
-  when: nodepool_file_nodepool_service_dest is not defined
-
-- name: Define nodepool_file_nodepool_service_mode.
-  set_fact:
-    nodepool_file_nodepool_service_mode: "{{ __nodepool_file_nodepool_service_mode }}"
-  when: nodepool_file_nodepool_service_mode is not defined
-
-- name: Define nodepool_file_nodepool_service_src.
-  set_fact:
-    nodepool_file_nodepool_service_src: "{{ __nodepool_file_nodepool_service_src }}"
-  when: nodepool_file_nodepool_service_src is not defined
-
-- name: Define nodepool_file_nodepool_service_config_dest.
-  set_fact:
-    nodepool_file_nodepool_service_config_dest: "{{ __nodepool_file_nodepool_service_config_dest  }}"
-  when: nodepool_file_nodepool_service_config_dest is not defined
-
-- name: Define nodepool_file_nodepool_service_config_mode.
-  set_fact:
-    nodepool_file_nodepool_service_config_mode: "{{ __nodepool_file_nodepool_service_config_mode  }}"
-  when: nodepool_file_nodepool_service_config_mode is not defined
-
-- name: Define nodepool_file_nodepool_service_config_src.
-  set_fact:
-    nodepool_file_nodepool_service_config_src: "{{ __nodepool_file_nodepool_service_config_src  }}"
-  when: nodepool_file_nodepool_service_config_src is not defined
-
 - name: Define nodepool_file_nodepool_builder_service_dest.
   set_fact:
     nodepool_file_nodepool_builder_service_dest: "{{ __nodepool_file_nodepool_builder_service_dest }}"
@@ -72,36 +42,6 @@
     nodepool_file_nodepool_builder_service_config_src: "{{ __nodepool_file_nodepool_builder_service_config_src  }}"
   when: nodepool_file_nodepool_builder_service_config_src is not defined
 
-- name: Define nodepool_file_nodepool_deleter_service_dest.
-  set_fact:
-    nodepool_file_nodepool_deleter_service_dest: "{{ __nodepool_file_nodepool_deleter_service_dest }}"
-  when: nodepool_file_nodepool_deleter_service_dest is not defined
-
-- name: Define nodepool_file_nodepool_deleter_service_mode.
-  set_fact:
-    nodepool_file_nodepool_deleter_service_mode: "{{ __nodepool_file_nodepool_deleter_service_mode }}"
-  when: nodepool_file_nodepool_deleter_service_mode is not defined
-
-- name: Define nodepool_file_nodepool_deleter_service_src.
-  set_fact:
-    nodepool_file_nodepool_deleter_service_src: "{{ __nodepool_file_nodepool_deleter_service_src }}"
-  when: nodepool_file_nodepool_deleter_service_src is not defined
-
-- name: Define nodepool_file_nodepool_deleter_service_config_dest.
-  set_fact:
-    nodepool_file_nodepool_deleter_service_config_dest: "{{ __nodepool_file_nodepool_deleter_service_config_dest  }}"
-  when: nodepool_file_nodepool_deleter_service_config_dest is not defined
-
-- name: Define nodepool_file_nodepool_deleter_service_config_mode.
-  set_fact:
-    nodepool_file_nodepool_deleter_service_config_mode: "{{ __nodepool_file_nodepool_deleter_service_config_mode  }}"
-  when: nodepool_file_nodepool_deleter_service_config_mode is not defined
-
-- name: Define nodepool_file_nodepool_deleter_service_config_src.
-  set_fact:
-    nodepool_file_nodepool_deleter_service_config_src: "{{ __nodepool_file_nodepool_deleter_service_config_src  }}"
-  when: nodepool_file_nodepool_deleter_service_config_src is not defined
-
 - name: Define nodepool_file_nodepool_launcher_service_dest.
   set_fact:
     nodepool_file_nodepool_launcher_service_dest: "{{ __nodepool_file_nodepool_launcher_service_dest }}"
@@ -132,28 +72,6 @@
     nodepool_file_nodepool_launcher_service_config_src: "{{ __nodepool_file_nodepool_launcher_service_config_src  }}"
   when: nodepool_file_nodepool_launcher_service_config_src is not defined
 
-- name: Install nodepool service script into place.
-  become: yes
-  template:
-    dest: "{{ nodepool_file_nodepool_service_dest }}"
-    group: "{{ nodepool_file_nodepool_service_group }}"
-    mode: "{{ nodepool_file_nodepool_service_mode }}"
-    owner: "{{ nodepool_file_nodepool_service_owner }}"
-    src: "{{ nodepool_file_nodepool_service_src }}"
-  register: nodepool_file_nodepool_service
-  when: nodepool_service_nodepool_manage
-
-- name: Install nodepool service config into place.
-  become: yes
-  template:
-    dest: "{{ nodepool_file_nodepool_service_config_dest  }}"
-    group: "{{ nodepool_file_nodepool_service_config_group  }}"
-    mode: "{{ nodepool_file_nodepool_service_config_mode  }}"
-    owner: "{{ nodepool_file_nodepool_service_config_owner  }}"
-    src: "{{ nodepool_file_nodepool_service_config_src  }}"
-  register: nodepool_file_nodepool_service_config
-  when: nodepool_service_nodepool_manage
-
 - name: Install nodepool-builder service script into place.
   become: yes
   template:
@@ -176,28 +94,6 @@
   register: nodepool_file_nodepool_builder_service_config
   when: nodepool_service_nodepool_builder_manage
 
-- name: Install nodepool-deleter service script into place.
-  become: yes
-  template:
-    dest: "{{ nodepool_file_nodepool_deleter_service_dest }}"
-    group: "{{ nodepool_file_nodepool_deleter_service_group }}"
-    mode: "{{ nodepool_file_nodepool_deleter_service_mode }}"
-    owner: "{{ nodepool_file_nodepool_deleter_service_owner }}"
-    src: "{{ nodepool_file_nodepool_deleter_service_src }}"
-  register: nodepool_file_nodepool_deleter_service
-  when: nodepool_service_nodepool_deleter_manage
-
-- name: Install nodepool-deleter service config into place.
-  become: yes
-  template:
-    dest: "{{ nodepool_file_nodepool_deleter_service_config_dest  }}"
-    group: "{{ nodepool_file_nodepool_deleter_service_config_group  }}"
-    mode: "{{ nodepool_file_nodepool_deleter_service_config_mode  }}"
-    owner: "{{ nodepool_file_nodepool_deleter_service_config_owner  }}"
-    src: "{{ nodepool_file_nodepool_deleter_service_config_src  }}"
-  register: nodepool_file_nodepool_deleter_service_config
-  when: nodepool_service_nodepool_deleter_manage
-
 - name: Install nodepool-launcher service script into place.
   become: yes
   template:
@@ -220,15 +116,6 @@
   register: nodepool_file_nodepool_launcher_service_config
   when: nodepool_service_nodepool_launcher_manage
 
-- name: Enable nodepool service.
-  become: yes
-  service:
-    enabled: "{{ nodepool_service_nodepool_enabled }}"
-    name: "{{ nodepool_service_nodepool_name }}"
-    state: "{{ nodepool_service_nodepool_state }}"
-  register: nodepool_service_nodepool
-  when: nodepool_service_nodepool_manage
-
 - name: Enable nodepool-builder service.
   become: yes
   service:
@@ -238,15 +125,6 @@
   register: nodepool_service_nodepool_builder
   when: nodepool_service_nodepool_builder_manage
 
-- name: Enable nodepool-deleter service.
-  become: yes
-  service:
-    enabled: "{{ nodepool_service_nodepool_deleter_enabled }}"
-    name: "{{ nodepool_service_nodepool_deleter_name }}"
-    state: "{{ nodepool_service_nodepool_deleter_state }}"
-  register: nodepool_service_nodepool_deleter
-  when: nodepool_service_nodepool_deleter_manage
-
 - name: Enable nodepool-launcher service.
   become: yes
   service:
diff --git a/templates/etc/default/nodepool b/templates/etc/default/nodepool
deleted file mode 100644
index 411b7fe..0000000
--- a/templates/etc/default/nodepool
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is generated by Ansible
-#  DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
-#
-
-# The prefix used when nodepool was installed. Be sure to update this value
-# if you are using a virtualenv.
-PREFIX=/usr/local
-
-# Options to pass to nodepoold.
-ARGS="-l /etc/nodepool/logging.conf --no-launches"
-
-# The user used to nodepool service.
-RUNASUSER=nodepool
-
-DIB_IMAGE_CACHE=/opt/nodepool/cache
diff --git a/templates/etc/default/nodepool-deleter b/templates/etc/default/nodepool-deleter
deleted file mode 100644
index be6da8a..0000000
--- a/templates/etc/default/nodepool-deleter
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is generated by Ansible
-#  DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
-#
-
-# The prefix used when nodepool-deleter was installed. Be sure to update this
-# value if you are using a virtualenv.
-PREFIX=/usr/local
-
-# Options to pass to nodepool-deleter.
-ARGS="-l /etc/nodepool/deleter-logging.conf --no-launches --no-webapp"
-
-# The user used to nodepool-deleter service.
-RUNASUSER=nodepool
-
-DIB_IMAGE_CACHE=/opt/nodepool/cache
diff --git a/templates/etc/default/nodepool-launcher b/templates/etc/default/nodepool-launcher
index 50b769e..ed71f0d 100644
--- a/templates/etc/default/nodepool-launcher
+++ b/templates/etc/default/nodepool-launcher
@@ -7,7 +7,7 @@
 PREFIX=/usr/local
 
 # Options to pass to nodepool-launcher.
-ARGS="-l /etc/nodepool/launcher-logging.conf --no-deletes --no-webapp"
+ARGS="-l /etc/nodepool/launcher-logging.conf --no-webapp"
 
 # The user used to nodepool-launcher service.
 RUNASUSER=nodepool
diff --git a/templates/etc/init.d/nodepool b/templates/etc/init.d/nodepool
deleted file mode 100644
index fdf8b78..0000000
--- a/templates/etc/init.d/nodepool
+++ /dev/null
@@ -1,157 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          nodepool
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Nodepool
-# Description:       Trunk gating system
-### END INIT INFO
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin
-DESC="Nodepool"
-NAME=nodepool
-PIDFILE=/var/run/$NAME/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Read configuration variable file if it is present
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-DAEMON=$PREFIX/bin/nodepoold
-USER=${RUNASUSER:-nodepool}
-
-# Exit if the package is not installed
-if ! [ -x "$DAEMON" ]; then
-    echo "$DAEMON: command not found"
-    exit 5
-fi
-
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
-. /lib/lsb/init-functions
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
-    # Return
-    #   0 if daemon has been started
-    #   1 if daemon was already running
-    #   2 if daemon could not be started
-    mkdir -p /var/run/$NAME
-    chown $USER /var/run/$NAME
-    start-stop-daemon --start --quiet --pidfile $PIDFILE -c $USER \
-        --exec $DAEMON --test > /dev/null || return 1
-    start-stop-daemon --start --quiet --pidfile $PIDFILE -c $USER \
-        --exec $DAEMON -- $ARGS -p $PIDFILE || return 2
-    # Add code here, if necessary, that waits for the process to be ready
-    # to handle requests from services started subsequently which depend
-    # on this one.  As a last resort, sleep for some time.
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
-    # Return
-    #   0 if daemon has been stopped
-    #   1 if daemon was already stopped
-    #   2 if daemon could not be stopped
-    #   other if a failure occurred
-    start-stop-daemon --stop --signal 9 --pidfile $PIDFILE
-    RETVAL="$?"
-    [ "$RETVAL" = 2 ] && return 2
-    rm -f /var/run/$NAME/*
-    return "$RETVAL"
-}
-
-#
-# Function that stops the daemon/service
-#
-do_graceful_stop()
-{
-    PID=`cat $PIDFILE`
-    kill -INT $PID
-
-    # wait until really stopped
-    if [ -n "${PID:-}" ]; then
-        i=0
-        while kill -0 "${PID:-}" 2> /dev/null;  do
-            if [ $i -eq '0' ]; then
-                echo -n " ... waiting "
-            else
-                echo -n "."
-            fi
-            i=$(($i+1))
-            sleep 1
-        done
-    fi
-
-    rm -f /var/run/$NAME/*
-}
-
-#
-# Function that sends a SIGHUP to the daemon/service
-#
-do_reload() {
-    #
-    # If the daemon can reload its configuration without
-    # restarting (for example, when it is sent a SIGHUP),
-    # then implement that here.
-    #
-    start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
-    return 0
-}
-
-case "$1" in
-    start)
-        [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
-        do_start
-        case "$?" in
-            0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-            2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-        esac
-        ;;
-    stop)
-        [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
-        do_stop
-        case "$?" in
-            0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-            2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-        esac
-        ;;
-    status)
-        status_of_proc -p $PIDFILE "$DAEMON" "$NAME" && exit 0 || exit $?
-        ;;
-    reload|force-reload)
-        #
-        # If do_reload() is not implemented then leave this commented out
-        # and leave 'force-reload' as an alias for 'restart'.
-        #
-        log_daemon_msg "Reloading $DESC" "$NAME"
-        do_reload
-        log_end_msg $?
-        ;;
-    restart)
-        #
-        # If the "reload" option is implemented then remove the
-        # 'force-reload' alias
-        #
-        log_daemon_msg "Restarting $DESC" "$NAME"
-        do_graceful_stop
-        do_start
-        ;;
-    *)
-        echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
-        exit 3
-        ;;
-esac
-
-:
diff --git a/templates/etc/init.d/nodepool-deleter b/templates/etc/init.d/nodepool-deleter
deleted file mode 100644
index e897e28..0000000
--- a/templates/etc/init.d/nodepool-deleter
+++ /dev/null
@@ -1,157 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          nodepool-deleter
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Nodepool
-# Description:       Trunk gating system
-### END INIT INFO
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin
-DESC="Nodepool Deleter"
-NAME=nodepool-deleter
-PIDFILE=/var/run/$NAME/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Read configuration variable file if it is present
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-DAEMON=$PREFIX/bin/nodepoold
-USER=${RUNASUSER:-nodepool}
-
-# Exit if the package is not installed
-if ! [ -x "$DAEMON" ]; then
-    echo "$DAEMON: command not found"
-    exit 5
-fi
-
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
-. /lib/lsb/init-functions
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
-    # Return
-    #   0 if daemon has been started
-    #   1 if daemon was already running
-    #   2 if daemon could not be started
-    mkdir -p /var/run/$NAME
-    chown $USER /var/run/$NAME
-    start-stop-daemon --start --quiet --pidfile $PIDFILE -c $USER \
-        --exec $DAEMON --test > /dev/null || return 1
-    start-stop-daemon --start --quiet --pidfile $PIDFILE -c $USER \
-        --exec $DAEMON -- $ARGS -p $PIDFILE || return 2
-    # Add code here, if necessary, that waits for the process to be ready
-    # to handle requests from services started subsequently which depend
-    # on this one.  As a last resort, sleep for some time.
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
-    # Return
-    #   0 if daemon has been stopped
-    #   1 if daemon was already stopped
-    #   2 if daemon could not be stopped
-    #   other if a failure occurred
-    start-stop-daemon --stop --signal 9 --pidfile $PIDFILE
-    RETVAL="$?"
-    [ "$RETVAL" = 2 ] && return 2
-    rm -f /var/run/$NAME/*
-    return "$RETVAL"
-}
-
-#
-# Function that stops the daemon/service
-#
-do_graceful_stop()
-{
-    PID=`cat $PIDFILE`
-    kill -INT $PID
-
-    # wait until really stopped
-    if [ -n "${PID:-}" ]; then
-        i=0
-        while kill -0 "${PID:-}" 2> /dev/null;  do
-            if [ $i -eq '0' ]; then
-                echo -n " ... waiting "
-            else
-                echo -n "."
-            fi
-            i=$(($i+1))
-            sleep 1
-        done
-    fi
-
-    rm -f /var/run/$NAME/*
-}
-
-#
-# Function that sends a SIGHUP to the daemon/service
-#
-do_reload() {
-    #
-    # If the daemon can reload its configuration without
-    # restarting (for example, when it is sent a SIGHUP),
-    # then implement that here.
-    #
-    start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
-    return 0
-}
-
-case "$1" in
-    start)
-        [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
-        do_start
-        case "$?" in
-            0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-            2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-        esac
-        ;;
-    stop)
-        [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
-        do_stop
-        case "$?" in
-            0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-            2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-        esac
-        ;;
-    status)
-        status_of_proc -p $PIDFILE "$DAEMON" "$NAME" && exit 0 || exit $?
-        ;;
-    reload|force-reload)
-        #
-        # If do_reload() is not implemented then leave this commented out
-        # and leave 'force-reload' as an alias for 'restart'.
-        #
-        log_daemon_msg "Reloading $DESC" "$NAME"
-        do_reload
-        log_end_msg $?
-        ;;
-    restart)
-        #
-        # If the "reload" option is implemented then remove the
-        # 'force-reload' alias
-        #
-        log_daemon_msg "Restarting $DESC" "$NAME"
-        do_graceful_stop
-        do_start
-        ;;
-    *)
-        echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
-        exit 3
-        ;;
-esac
-
-:
diff --git a/templates/etc/init.d/nodepool-launcher b/templates/etc/init.d/nodepool-launcher
index 8ea0319..dc7f066 100644
--- a/templates/etc/init.d/nodepool-launcher
+++ b/templates/etc/init.d/nodepool-launcher
@@ -19,7 +19,7 @@ SCRIPTNAME=/etc/init.d/$NAME
 # Read configuration variable file if it is present
 [ -r /etc/default/$NAME ] && . /etc/default/$NAME
 
-DAEMON=$PREFIX/bin/nodepoold
+DAEMON=$PREFIX/bin/nodepool-launcher
 USER=${RUNASUSER:-nodepool}
 
 # Exit if the package is not installed
diff --git a/templates/etc/nodepool/deleter-logging.conf b/templates/etc/nodepool/deleter-logging.conf
deleted file mode 100644
index 8b0d4c8..0000000
--- a/templates/etc/nodepool/deleter-logging.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-[loggers]
-keys=root,nodepool,requests,shade
-
-[handlers]
-keys=console,debug,normal
-
-[formatters]
-keys=simple
-
-[logger_root]
-level=WARNING
-handlers=console
-
-[logger_requests]
-level=WARNING
-handlers=debug,normal
-qualname=requests
-
-[logger_shade]
-level=DEBUG
-handlers=debug,normal
-qualname=shade
-
-[logger_nodepool]
-level=DEBUG
-handlers=debug,normal
-qualname=nodepool
-
-[handler_console]
-level=WARNING
-class=StreamHandler
-formatter=simple
-args=(sys.stdout,)
-
-[handler_debug]
-level=DEBUG
-class=logging.handlers.WatchedFileHandler
-formatter=simple
-args=('/var/log/nodepool/deleter-debug.log',)
-
-[handler_normal]
-level=INFO
-class=logging.handlers.WatchedFileHandler
-formatter=simple
-args=('/var/log/nodepool/nodepool-deleter.log',)
-
-[formatter_simple]
-format=%(asctime)s %(levelname)s %(name)s: %(message)s
-datefmt=
diff --git a/templates/etc/nodepool/logging.conf b/templates/etc/nodepool/logging.conf
deleted file mode 100644
index a7e7515..0000000
--- a/templates/etc/nodepool/logging.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-[loggers]
-keys=root,nodepool,requests,shade
-
-[handlers]
-keys=console,debug,normal
-
-[formatters]
-keys=simple
-
-[logger_root]
-level=WARNING
-handlers=console
-
-[logger_requests]
-level=WARNING
-handlers=debug,normal
-qualname=requests
-
-[logger_shade]
-level=DEBUG
-handlers=debug,normal
-qualname=shade
-
-[logger_nodepool]
-level=DEBUG
-handlers=debug,normal
-qualname=nodepool
-
-[handler_console]
-level=WARNING
-class=StreamHandler
-formatter=simple
-args=(sys.stdout,)
-
-[handler_debug]
-level=DEBUG
-class=logging.handlers.WatchedFileHandler
-formatter=simple
-args=('/var/log/nodepool/debug.log',)
-
-[handler_normal]
-level=INFO
-class=logging.handlers.WatchedFileHandler
-formatter=simple
-args=('/var/log/nodepool/nodepool.log',)
-
-[formatter_simple]
-format=%(asctime)s %(levelname)s %(name)s: %(message)s
-datefmt=
diff --git a/templates/etc/nodepool/nodepool.yaml b/templates/etc/nodepool/nodepool.yaml
index 4a2c83c..78329c2 100644
--- a/templates/etc/nodepool/nodepool.yaml
+++ b/templates/etc/nodepool/nodepool.yaml
@@ -7,8 +7,6 @@ zookeeper-servers:
   - host: localhost
     port: 2181
 
-gearman-servers: []
-
 zmq-publishers: []
 
 diskimages: []
@@ -16,5 +14,3 @@ diskimages: []
 labels: []
 
 providers: []
-
-targets: []
diff --git a/templates/etc/sysconfig/nodepool b/templates/etc/sysconfig/nodepool
deleted file mode 100644
index 30cac77..0000000
--- a/templates/etc/sysconfig/nodepool
+++ /dev/null
@@ -1,12 +0,0 @@
-# This file is generated by Ansible
-#  DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
-#
-
-# The prefix used when nodepool was installed. Be sure to update this value
-# if you are using a virtualenv.
-PREFIX=/usr
-
-# Options to pass to nodepoold.
-ARGS="-l /etc/nodepool/logging.conf --no-launches"
-
-DIB_IMAGE_CACHE=/opt/nodepool/cache
diff --git a/templates/etc/sysconfig/nodepool-deleter b/templates/etc/sysconfig/nodepool-deleter
deleted file mode 100644
index 5ade4f9..0000000
--- a/templates/etc/sysconfig/nodepool-deleter
+++ /dev/null
@@ -1,12 +0,0 @@
-# This file is generated by Ansible
-#  DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
-#
-
-# The prefix used when nodepool-deleter was installed. Be sure to update this
-# value if you are using a virtualenv.
-PREFIX=/usr
-
-# Options to pass to nodepool-deleter.
-ARGS="-l /etc/nodepool/deleter-logging.conf --no-launches --no-webapp"
-
-DIB_IMAGE_CACHE=/opt/nodepool/cache
diff --git a/templates/etc/sysconfig/nodepool-launcher b/templates/etc/sysconfig/nodepool-launcher
index 910d583..0de2cc5 100644
--- a/templates/etc/sysconfig/nodepool-launcher
+++ b/templates/etc/sysconfig/nodepool-launcher
@@ -7,6 +7,6 @@
 PREFIX=/usr
 
 # Options to pass to nodepool-launcher.
-ARGS="-l /etc/nodepool/launcher-logging.conf --no-deletes --no-webapp"
+ARGS="-l /etc/nodepool/launcher-logging.conf --no-webapp"
 
 DIB_IMAGE_CACHE=/opt/nodepool/cache
diff --git a/templates/etc/systemd/system/nodepool-deleter.service.centos-7 b/templates/etc/systemd/system/nodepool-deleter.service.centos-7
deleted file mode 100644
index 0351829..0000000
--- a/templates/etc/systemd/system/nodepool-deleter.service.centos-7
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Nodepool Deleter Service
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=nodepool
-Group=nodepool
-EnvironmentFile=-/etc/sysconfig/nodepool-deleter
-ExecStart=/bin/sh -c "${PREFIX}/bin/nodepoold -d ${ARGS}"
-
-[Install]
-WantedBy=multi-user.target
diff --git a/templates/etc/systemd/system/nodepool-deleter.service.ubuntu-xenial b/templates/etc/systemd/system/nodepool-deleter.service.ubuntu-xenial
deleted file mode 100644
index 9fafbd6..0000000
--- a/templates/etc/systemd/system/nodepool-deleter.service.ubuntu-xenial
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Nodepool Deleter Service
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=nodepool
-Group=nodepool
-EnvironmentFile=-/etc/default/nodepool-deleter
-ExecStart=/bin/sh -c "${PREFIX}/bin/nodepoold -d ${ARGS}"
-
-[Install]
-WantedBy=multi-user.target
diff --git a/templates/etc/systemd/system/nodepool-launcher.service.centos-7 b/templates/etc/systemd/system/nodepool-launcher.service.centos-7
index f381aec..8c6f8b2 100644
--- a/templates/etc/systemd/system/nodepool-launcher.service.centos-7
+++ b/templates/etc/systemd/system/nodepool-launcher.service.centos-7
@@ -7,7 +7,7 @@ Type=simple
 User=nodepool
 Group=nodepool
 EnvironmentFile=-/etc/sysconfig/nodepool-launcher
-ExecStart=/bin/sh -c "${PREFIX}/bin/nodepoold -d ${ARGS}"
+ExecStart=/bin/sh -c "${PREFIX}/bin/nodepool-launcher -d ${ARGS}"
 
 [Install]
 WantedBy=multi-user.target
diff --git a/templates/etc/systemd/system/nodepool-launcher.service.ubuntu-xenial b/templates/etc/systemd/system/nodepool-launcher.service.ubuntu-xenial
index 959cb47..9d6ad6f 100644
--- a/templates/etc/systemd/system/nodepool-launcher.service.ubuntu-xenial
+++ b/templates/etc/systemd/system/nodepool-launcher.service.ubuntu-xenial
@@ -7,7 +7,7 @@ Type=simple
 User=nodepool
 Group=nodepool
 EnvironmentFile=-/etc/default/nodepool-launcher
-ExecStart=/bin/sh -c "${PREFIX}/bin/nodepoold -d ${ARGS}"
+ExecStart=/bin/sh -c "${PREFIX}/bin/nodepool-launcher -d ${ARGS}"
 
 [Install]
 WantedBy=multi-user.target
diff --git a/templates/etc/systemd/system/nodepool.service.centos-7 b/templates/etc/systemd/system/nodepool.service.centos-7
deleted file mode 100644
index 8d43c56..0000000
--- a/templates/etc/systemd/system/nodepool.service.centos-7
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Nodepool Service
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=nodepool
-Group=nodepool
-EnvironmentFile=-/etc/sysconfig/nodepool
-ExecStart=/bin/sh -c "${PREFIX}/bin/nodepoold -d ${ARGS}"
-
-[Install]
-WantedBy=multi-user.target
diff --git a/templates/etc/systemd/system/nodepool.service.ubuntu-xenial b/templates/etc/systemd/system/nodepool.service.ubuntu-xenial
deleted file mode 100644
index 9c0aee7..0000000
--- a/templates/etc/systemd/system/nodepool.service.ubuntu-xenial
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Nodepool Service
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=nodepool
-Group=nodepool
-EnvironmentFile=-/etc/default/nodepool
-ExecStart=/bin/sh -c "${PREFIX}/bin/nodepoold -d ${ARGS}"
-
-[Install]
-WantedBy=multi-user.target
diff --git a/tests/test.yaml b/tests/test.yaml
index c6a58a3..68fb792 100644
--- a/tests/test.yaml
+++ b/tests/test.yaml
@@ -32,21 +32,13 @@
         that:
           - nodepool_file_nodepool_yaml
           - nodepool_file_secure_conf
-          - nodepool_file_logging_conf
           - nodepool_file_builder_logging_conf
-          - nodepool_file_deleter_logging_conf
           - nodepool_file_launcher_logging_conf
-          - nodepool_file_nodepool_service
-          - nodepool_file_nodepool_service_config
           - nodepool_file_nodepool_builder_service
           - nodepool_file_nodepool_builder_service_config
-          - nodepool_file_nodepool_deleter_service
-          - nodepool_file_nodepool_deleter_service_config
           - nodepool_file_nodepool_launcher_service
           - nodepool_file_nodepool_launcher_service_config
-          - nodepool_service_nodepool
           - nodepool_service_nodepool_builder
-          - nodepool_service_nodepool_deleter
           - nodepool_service_nodepool_launcher
 
     - name: Ensure nodepool_user_name is nodepool.
@@ -95,20 +87,6 @@
           - nodepool_yaml_stat.stat.gr_name == 'nodepool'
           - nodepool_yaml_stat.stat.mode == '0644'
 
-    - name: Register /etc/nodepool/logging.conf
-      stat:
-        path: /etc/nodepool/logging.conf
-      register: logging_conf_stat
-
-    - name: Assert logging_conf_stat tests.
-      assert:
-        that:
-          - logging_conf_stat.stat.exists
-          - logging_conf_stat.stat.isreg
-          - logging_conf_stat.stat.pw_name == 'nodepool'
-          - logging_conf_stat.stat.gr_name == 'nodepool'
-          - logging_conf_stat.stat.mode == '0644'
-
     - name: Register /etc/nodepool/builder-logging.conf
       stat:
         path: /etc/nodepool/builder-logging.conf
@@ -123,20 +101,6 @@
           - builder_logging_conf_stat.stat.gr_name == 'nodepool'
           - builder_logging_conf_stat.stat.mode == '0644'
 
-    - name: Register /etc/nodepool/deleter-logging.conf
-      stat:
-        path: /etc/nodepool/deleter-logging.conf
-      register: deleter_logging_conf_stat
-
-    - name: Assert buidler_logging_conf_stat tests.
-      assert:
-        that:
-          - deleter_logging_conf_stat.stat.exists
-          - deleter_logging_conf_stat.stat.isreg
-          - deleter_logging_conf_stat.stat.pw_name == 'nodepool'
-          - deleter_logging_conf_stat.stat.gr_name == 'nodepool'
-          - deleter_logging_conf_stat.stat.mode == '0644'
-
     - name: Register /etc/nodepool/launcher-logging.conf
       stat:
         path: /etc/nodepool/launcher-logging.conf
@@ -187,101 +151,9 @@
           - nodepool_git_dest_stat.stat.exists
           - nodepool_git_dest_stat.stat.isdir
 
-    - name: Register /etc/default/nodepool
-      stat:
-        path: /etc/default/nodepool
-      register: debian_nodepool_sysconfig_stat
-      when: ansible_os_family == 'Debian'
-
-    - name: Assert debian_nodepool_sysconfig_stat tests.
-      assert:
-        that:
-          - debian_nodepool_sysconfig_stat.stat.exists
-          - debian_nodepool_sysconfig_stat.stat.isreg
-          - debian_nodepool_sysconfig_stat.stat.pw_name == 'root'
-          - debian_nodepool_sysconfig_stat.stat.gr_name == 'root'
-          - debian_nodepool_sysconfig_stat.stat.mode == '0644'
-      when: ansible_os_family == 'Debian'
-
-    - name: Register /etc/sysconfig/nodepool
-      stat:
-        path: /etc/sysconfig/nodepool
-      register: redhat_nodepool_sysconfig_stat
-      when: ansible_os_family == 'RedHat'
-
-    - name: Assert redhat_nodepool_sysconfig_stat tests.
-      assert:
-        that:
-          - redhat_nodepool_sysconfig_stat.stat.exists
-          - redhat_nodepool_sysconfig_stat.stat.isreg
-          - redhat_nodepool_sysconfig_stat.stat.pw_name == 'root'
-          - redhat_nodepool_sysconfig_stat.stat.gr_name == 'root'
-          - redhat_nodepool_sysconfig_stat.stat.mode == '0644'
-      when: ansible_os_family == 'RedHat'
-
-    - name: Register /etc/init.d/nodepool
-      stat:
-        path: /etc/init.d/nodepool
-      register: _nodepool_service_initd_stat
-      when:
-        - ansible_distribution == 'Ubuntu'
-        - ansible_distribution_release == 'trusty'
-
-    - name: Assert _nodepool_service_initd_stat tests.
-      assert:
-        that:
-          - _nodepool_service_initd_stat.stat.exists
-          - _nodepool_service_initd_stat.stat.isreg
-          - _nodepool_service_initd_stat.stat.pw_name == 'root'
-          - _nodepool_service_initd_stat.stat.gr_name == 'root'
-          - _nodepool_service_initd_stat.stat.mode == '0755'
-      when:
-        - ansible_distribution == 'Ubuntu'
-        - ansible_distribution_release == 'trusty'
-
-    - name: Register /etc/systemd/system/nodepool.service
-      stat:
-        path: /etc/systemd/system/nodepool.service
-      register: _nodepool_service_systemd_stat
-      when: (ansible_os_family == 'RedHat') or
-            (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'xenial')
-
-    - name: Assert _nodepool_service_systemd_stat tests.
-      assert:
-        that:
-          - _nodepool_service_systemd_stat.stat.exists
-          - _nodepool_service_systemd_stat.stat.isreg
-          - _nodepool_service_systemd_stat.stat.pw_name == 'root'
-          - _nodepool_service_systemd_stat.stat.gr_name == 'root'
-          - _nodepool_service_systemd_stat.stat.mode == '0644'
-      when: (ansible_os_family == 'RedHat') or
-            (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'xenial')
-
-    - name: Register /var/run/nodepool/nodepool.pid
-      stat:
-        path: /var/run/nodepool/nodepool.pid
-      register: _nodepool_service_pid_stat
-
-    - name: Assert /var/run/nodepool-builder/nodepool-builder.pid tests
-      assert:
-        that:
-          - _nodepool_service_pid_stat.stat.exists
-          - _nodepool_service_pid_stat.stat.isreg
-          - _nodepool_service_pid_stat.stat.pw_name == 'nodepool'
-          - _nodepool_service_pid_stat.stat.gr_name == 'nodepool'
-          - _nodepool_service_pid_stat.stat.mode == '0644'
-      when:
-        - ansible_distribution == 'Ubuntu'
-        - ansible_distribution_release == 'trusty'
-
-    - name: Ensure nodepoold is running.
-      become: yes
-      shell: /usr/sbin/service nodepool status
-      tags: skip_ansible_lint
-
     - name: Register /etc/default/nodepool-builder
       stat:
-        path: /etc/default/nodepool
+        path: /etc/default/nodepool-builder
       register: debian_nodepool_builder_sysconfig_stat
       when: ansible_os_family == 'Debian'
 
@@ -371,101 +243,9 @@
       shell: /usr/sbin/service nodepool-builder status
       tags: skip_ansible_lint
 
-    - name: Register /etc/default/nodepool-deleter
-      stat:
-        path: /etc/default/nodepool
-      register: debian_nodepool_deleter_sysconfig_stat
-      when: ansible_os_family == 'Debian'
-
-    - name: Assert debian_nodepool_deleter_sysconfig_stat tests.
-      assert:
-        that:
-          - debian_nodepool_deleter_sysconfig_stat.stat.exists
-          - debian_nodepool_deleter_sysconfig_stat.stat.isreg
-          - debian_nodepool_deleter_sysconfig_stat.stat.pw_name == 'root'
-          - debian_nodepool_deleter_sysconfig_stat.stat.gr_name == 'root'
-          - debian_nodepool_deleter_sysconfig_stat.stat.mode == '0644'
-      when: ansible_os_family == 'Debian'
-
-    - name: Register /etc/sysconfig/nodepool-deleter
-      stat:
-        path: /etc/sysconfig/nodepool-deleter
-      register: redhat_nodepool_deleter_sysconfig_stat
-      when: ansible_os_family == 'RedHat'
-
-    - name: Assert redhat_nodepool_deleter_sysconfig_stat tests.
-      assert:
-        that:
-          - redhat_nodepool_deleter_sysconfig_stat.stat.exists
-          - redhat_nodepool_deleter_sysconfig_stat.stat.isreg
-          - redhat_nodepool_deleter_sysconfig_stat.stat.pw_name == 'root'
-          - redhat_nodepool_deleter_sysconfig_stat.stat.gr_name == 'root'
-          - redhat_nodepool_deleter_sysconfig_stat.stat.mode == '0644'
-      when: ansible_os_family == 'RedHat'
-
-    - name: Register /etc/init.d/nodepool-deleter
-      stat:
-        path: /etc/init.d/nodepool-deleter
-      register: _nodepool_deleter_service_initd_stat
-      when:
-        - ansible_distribution == 'Ubuntu'
-        - ansible_distribution_release == 'trusty'
-
-    - name: Assert _nodepool_deleter_service_initd_stat tests.
-      assert:
-        that:
-          - _nodepool_deleter_service_initd_stat.stat.exists
-          - _nodepool_deleter_service_initd_stat.stat.isreg
-          - _nodepool_deleter_service_initd_stat.stat.pw_name == 'root'
-          - _nodepool_deleter_service_initd_stat.stat.gr_name == 'root'
-          - _nodepool_deleter_service_initd_stat.stat.mode == '0755'
-      when:
-        - ansible_distribution == 'Ubuntu'
-        - ansible_distribution_release == 'trusty'
-
-    - name: Register /etc/systemd/system/nodepool-deleter.service
-      stat:
-        path: /etc/systemd/system/nodepool-deleter.service
-      register: _nodepool_deleter_service_systemd_stat
-      when: (ansible_os_family == 'RedHat') or
-            (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'xenial')
-
-    - name: Assert _nodepool_deleter_service_systemd_stat tests.
-      assert:
-        that:
-          - _nodepool_deleter_service_systemd_stat.stat.exists
-          - _nodepool_deleter_service_systemd_stat.stat.isreg
-          - _nodepool_deleter_service_systemd_stat.stat.pw_name == 'root'
-          - _nodepool_deleter_service_systemd_stat.stat.gr_name == 'root'
-          - _nodepool_deleter_service_systemd_stat.stat.mode == '0644'
-      when: (ansible_os_family == 'RedHat') or
-            (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'xenial')
-
-    - name: Register /var/run/nodepool-deleter/nodepool-deleter.pid
-      stat:
-        path: /var/run/nodepool-deleter/nodepool-deleter.pid
-      register: _nodepool_deleter_service_pid_stat
-
-    - name: Assert /var/run/nodepool-deleter/nodepool-deleter.pid tests
-      assert:
-        that:
-          - _nodepool_deleter_service_pid_stat.stat.exists
-          - _nodepool_deleter_service_pid_stat.stat.isreg
-          - _nodepool_deleter_service_pid_stat.stat.pw_name == 'nodepool'
-          - _nodepool_deleter_service_pid_stat.stat.gr_name == 'nodepool'
-          - _nodepool_deleter_service_pid_stat.stat.mode == '0644'
-      when:
-        - ansible_distribution == 'Ubuntu'
-        - ansible_distribution_release == 'trusty'
-
-    - name: Ensure nodepool-deleter is running.
-      become: yes
-      shell: /usr/sbin/service nodepool-deleter status
-      tags: skip_ansible_lint
-
     - name: Register /etc/default/nodepool-launcher
       stat:
-        path: /etc/default/nodepool
+        path: /etc/default/nodepool-launcher
       register: debian_nodepool_launcher_sysconfig_stat
       when: ansible_os_family == 'Debian'
 
diff --git a/vars/redhat.yaml b/vars/redhat.yaml
index 5438cbc..5601df2 100644
--- a/vars/redhat.yaml
+++ b/vars/redhat.yaml
@@ -22,14 +22,6 @@ __nodepool_build_depends:
   - python-devel
   - zlib-devel
 
-__nodepool_file_nodepool_service_dest: /etc/systemd/system/nodepool.service
-__nodepool_file_nodepool_service_mode: 0644
-__nodepool_file_nodepool_service_src: etc/systemd/system/nodepool.service.centos-7
-
-__nodepool_file_nodepool_service_config_dest: /etc/sysconfig/nodepool
-__nodepool_file_nodepool_service_config_mode: 0644
-__nodepool_file_nodepool_service_config_src: etc/sysconfig/nodepool
-
 __nodepool_file_nodepool_builder_service_dest: /etc/systemd/system/nodepool-builder.service
 __nodepool_file_nodepool_builder_service_mode: 0644
 __nodepool_file_nodepool_builder_service_src: etc/systemd/system/nodepool-builder.service.centos-7
@@ -38,14 +30,6 @@ __nodepool_file_nodepool_builder_service_config_dest: /etc/sysconfig/nodepool-bu
 __nodepool_file_nodepool_builder_service_config_mode: 0644
 __nodepool_file_nodepool_builder_service_config_src: etc/sysconfig/nodepool-builder
 
-__nodepool_file_nodepool_deleter_service_dest: /etc/systemd/system/nodepool-deleter.service
-__nodepool_file_nodepool_deleter_service_mode: 0644
-__nodepool_file_nodepool_deleter_service_src: etc/systemd/system/nodepool-deleter.service.centos-7
-
-__nodepool_file_nodepool_deleter_service_config_dest: /etc/sysconfig/nodepool-deleter
-__nodepool_file_nodepool_deleter_service_config_mode: 0644
-__nodepool_file_nodepool_deleter_service_config_src: etc/sysconfig/nodepool-deleter
-
 __nodepool_file_nodepool_launcher_service_dest: /etc/systemd/system/nodepool-launcher.service
 __nodepool_file_nodepool_launcher_service_mode: 0644
 __nodepool_file_nodepool_launcher_service_src: etc/systemd/system/nodepool-launcher.service.centos-7
diff --git a/vars/ubuntu-trusty.yaml b/vars/ubuntu-trusty.yaml
index f360b19..2d3b0dd 100644
--- a/vars/ubuntu-trusty.yaml
+++ b/vars/ubuntu-trusty.yaml
@@ -33,14 +33,6 @@ __nodepool_build_depends:
   - python-dev
   - zlib1g-dev
 
-__nodepool_file_nodepool_service_dest: /etc/init.d/nodepool
-__nodepool_file_nodepool_service_mode: 0755
-__nodepool_file_nodepool_service_src: etc/init.d/nodepool
-
-__nodepool_file_nodepool_service_config_dest: /etc/default/nodepool
-__nodepool_file_nodepool_service_config_mode: 0644
-__nodepool_file_nodepool_service_config_src: etc/default/nodepool
-
 __nodepool_file_nodepool_builder_service_dest: /etc/init.d/nodepool-builder
 __nodepool_file_nodepool_builder_service_mode: 0755
 __nodepool_file_nodepool_builder_service_src: etc/init.d/nodepool-builder
@@ -49,14 +41,6 @@ __nodepool_file_nodepool_builder_service_config_dest: /etc/default/nodepool-buil
 __nodepool_file_nodepool_builder_service_config_mode: 0644
 __nodepool_file_nodepool_builder_service_config_src: etc/default/nodepool-builder
 
-__nodepool_file_nodepool_deleter_service_dest: /etc/init.d/nodepool-deleter
-__nodepool_file_nodepool_deleter_service_mode: 0755
-__nodepool_file_nodepool_deleter_service_src: etc/init.d/nodepool-deleter
-
-__nodepool_file_nodepool_deleter_service_config_dest: /etc/default/nodepool-deleter
-__nodepool_file_nodepool_deleter_service_config_mode: 0644
-__nodepool_file_nodepool_deleter_service_config_src: etc/default/nodepool-deleter
-
 __nodepool_file_nodepool_launcher_service_dest: /etc/init.d/nodepool-launcher
 __nodepool_file_nodepool_launcher_service_mode: 0755
 __nodepool_file_nodepool_launcher_service_src: etc/init.d/nodepool-launcher
diff --git a/vars/ubuntu-xenial.yaml b/vars/ubuntu-xenial.yaml
index 7bad620..d4b3351 100644
--- a/vars/ubuntu-xenial.yaml
+++ b/vars/ubuntu-xenial.yaml
@@ -33,14 +33,6 @@ __nodepool_build_depends:
   - python-dev
   - zlib1g-dev
 
-__nodepool_file_nodepool_service_dest: /etc/systemd/system/nodepool.service
-__nodepool_file_nodepool_service_mode: 0644
-__nodepool_file_nodepool_service_src: etc/systemd/system/nodepool.service.ubuntu-xenial
-
-__nodepool_file_nodepool_service_config_dest: /etc/default/nodepool
-__nodepool_file_nodepool_service_config_mode: 0644
-__nodepool_file_nodepool_service_config_src: etc/default/nodepool
-
 __nodepool_file_nodepool_builder_service_dest: /etc/systemd/system/nodepool-builder.service
 __nodepool_file_nodepool_builder_service_mode: 0644
 __nodepool_file_nodepool_builder_service_src: etc/systemd/system/nodepool-builder.service.ubuntu-xenial
@@ -49,14 +41,6 @@ __nodepool_file_nodepool_builder_service_config_dest: /etc/default/nodepool-buil
 __nodepool_file_nodepool_builder_service_config_mode: 0644
 __nodepool_file_nodepool_builder_service_config_src: etc/default/nodepool-builder
 
-__nodepool_file_nodepool_deleter_service_dest: /etc/systemd/system/nodepool-deleter.service
-__nodepool_file_nodepool_deleter_service_mode: 0644
-__nodepool_file_nodepool_deleter_service_src: etc/systemd/system/nodepool-deleter.service.ubuntu-xenial
-
-__nodepool_file_nodepool_deleter_service_config_dest: /etc/default/nodepool-deleter
-__nodepool_file_nodepool_deleter_service_config_mode: 0644
-__nodepool_file_nodepool_deleter_service_config_src: etc/default/nodepool-deleter
-
 __nodepool_file_nodepool_launcher_service_dest: /etc/systemd/system/nodepool-launcher.service
 __nodepool_file_nodepool_launcher_service_mode: 0644
 __nodepool_file_nodepool_launcher_service_src: etc/systemd/system/nodepool-launcher.service.ubuntu-xenial