diff --git a/defaults/main.yml b/defaults/main.yml
index 5ede77b..8f24872 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -7,9 +7,6 @@
 # Default Apigee Edge Private Cloud Version
 opdk_version: '4.17.09'
 
-# Default version of the Apigee mirror to use
-apigee_mirror_version: '{{ opdk_version }}'
-
 # Apigee staging installation folder
 opdk_installer_path: "/tmp/edge"
 
@@ -22,9 +19,6 @@
 # Default apigee installation home
 apigee_home: /opt/apigee
 
-# Apigee service command for 4.16.xx
-apigee_service: '{{ apigee_home }}/apigee-service/bin/apigee-service'
-
 # Cassandra nodetool command
 nodetool: '{{ apigee_home }}/apigee-cassandra/bin/nodetool'
 
@@ -34,21 +28,9 @@
 # Cassandra command line command
 cassandra_cli: '{{ apigee_home }}/apigee-cassandra/bin/cassandra-cli'
 
-# Apigee setup command for 4.16.xx
-apigee_setup: '{{ apigee_home }}/apigee-setup/bin/setup.sh'
-
-# Apigee update command for 4.16.xx
-apigee_update: '{{ apigee_home }}/apigee-setup/bin/update.sh'
-
-# Apigee all command for 4.16.xx
-apigee_all: '{{ apigee_home }}/apigee-service/bin/apigee-all'
-
 # Postgres command line tool
 psql: "/usr/bin/psql"
 
-# Apigee license file path
-opdk_license_target_file_path: "{{ opdk_installer_path }}/license.conf"
-
 # Local resource location
 local_apigee_path: ~/.apigee
 
@@ -58,9 +40,6 @@
 # defaults file for apigee-opdk-setup-default-settings
 credentials_file: '{{ local_apigee_secure }}/credentials.yml'
 
-# Apigee license file provided by customer
-opdk_license_source_file_name: '{{ local_apigee_secure }}/license.txt'
-
 # Apigee silent installation configuration file
 #opdk_installation_config_file: "{{ opdk_installer_path }}/edge-response.conf"
 
@@ -92,15 +71,6 @@
 default_apigee_repo_protocol: 'https'
 default_apigee_repo_url: '{{ default_apigee_repo_protocol }}://{{ default_apigee_repo_uri }}'
 
-# Choose whether to copy the Apigee Mirror archive from your control machine or use an existing archive on the server.
-copy_archive: yes
-
-# Apigee archive that is created when a mirror is used.
-apigee_archive_name: apigee-{{ opdk_version }}.tar.gz
-
-# Path to the Apigee archive that is created by apigee-mirror package
-apigeerepobasepath: '{{ apigee_home }}/data/apigee-mirror'
-
 # Apigee edge default pod for silent-config file
 mp_pod: gateway
 
diff --git a/tasks/update_cache.yml b/tasks/update_cache.yml
index 294b145..3a60820 100644
--- a/tasks/update_cache.yml
+++ b/tasks/update_cache.yml
@@ -4,23 +4,15 @@
     key: "{{ item.key }}"
     value: "{{ item.value }}"
   with_items:
-  - { key: 'opdk_installer_path', value: '{{ opdk_installer_path }}' }
   - { key: 'apigee_home', value: '{{ apigee_home }}' }
-  - { key: "apigeerepobasepath", value: "{{ apigeerepobasepath }}" }
-
   - { key: 'opdk_version', value: '{{ opdk_version }}' }
-  - { key: 'apigee_mirror_version', value: '{{ apigee_mirror_version }}' }
-  - { key: 'apigee_service', value: '{{ apigee_service }}' }
+
   - { key: 'nodetool', value: '{{ nodetool }}' }
   - { key: 'cqlsh', value: '{{ cqlsh }}' }
   - { key: "psql", value: "{{ psql }}" }
-  - { key: 'apigee_setup', value: '{{ apigee_setup }}' }
-  - { key: 'apigee_update', value: '{{ apigee_update }}' }
-  - { key: 'apigee_all', value: '{{ apigee_all }}' }
-  - { key: 'opdk_license_target_file_path', value: "{{ opdk_license_target_file_path }}" }
+
   - { key: 'local_apigee_path', value: "{{ local_apigee_path }}" }
   - { key: 'local_apigee_secure', value: '{{ local_apigee_secure }}' }
-  - { key: 'opdk_license_source_file_name', value: "{{ opdk_license_source_file_name }}" }
 
   - { key: 'apigee_data_backup_archive_name', value: '{{ apigee_data_backup_archive_name }}' }
   - { key: 'apigee_archive_storage_folder', value: '{{ apigee_archive_storage_folder }}' }