diff --git a/defaults/main.yml b/defaults/main.yml
index 015cff62..c20fca0f 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -172,15 +172,6 @@ lxc_cache_prep_dns:
 lxc_cache_prep_pre_commands: '## pre command skipped ##'
 lxc_cache_prep_post_commands: '## post command skipped ##'
 
-# User defined variable pointing to a specific variable file used when setting
-# up the base container image. Deployers can use the provided container variable
-# files by simply inputting the file name
-# "{{ ansible_facts['distribution'] }}-{{ ansible_facts['distribution_version'] }}-container.yml"
-# or by providing the full path to a local file containing all of the variables
-# needed to prepare a container. built-in supported values are:
-#   [redhat-7.yml, ubuntu-16.04.yml, ubuntu-18.04.yml]
-# lxc_user_defined_container: null
-
 # Full path to the base image prep script. By default this will use the
 # named script for a given OS within the "templates/prep-scripts" directory.
 # If a deployer wishes to override this script with something else they can
diff --git a/tasks/lxc_cache_rootfs.yml b/tasks/lxc_cache_rootfs.yml
index 39f83673..dab91243 100644
--- a/tasks/lxc_cache_rootfs.yml
+++ b/tasks/lxc_cache_rootfs.yml
@@ -55,25 +55,6 @@
     mode: "0755"
   register: create_new_dir
 
-- name: Tasks for image download
-  when:
-    - lxc_hosts_container_build_command | length == 0
-  block:
-    - name: Wait for base image download
-      async_status:
-        jid: "{{ prestage_image.ansible_job_id }}"
-      register: _lxc_prestage_image_result
-      until: _lxc_prestage_image_result.finished
-      delay: 5
-      retries: "{{ lxc_cache_prep_timeout | int // 5 }}"
-
-    - name: Unpack base image
-      unarchive:
-        src: "/tmp/{{ cache_basename }}"
-        dest: "/var/lib/machines/{{ lxc_container_base_name }}"
-        remote_src: yes
-      when: create_new_dir is changed
-
 - name: Build the base image using a CLI tool
   command: "{{ lxc_hosts_container_build_command }}"
   when: lxc_hosts_container_build_command | length > 0