diff --git a/defaults/main.yml b/defaults/main.yml
index 324878bd..8794ec92 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -167,10 +167,6 @@ nova_oslomsg_notify_ssl_version: "{{ oslomsg_notify_ssl_version | default('TLSv1
 nova_oslomsg_notify_ssl_ca_file: "{{ oslomsg_notify_ssl_ca_file | default('') }}"
 nova_oslomsg_notify_policies: []
 
-## Qdrouterd info
-# TODO(ansmith): Change structure when more backends will be supported
-nova_oslomsg_amqp1_enabled: "{{ nova_oslomsg_rpc_transport == 'amqp' }}"
-
 ###
 ### RabbitMQ info
 ###
@@ -571,9 +567,6 @@ nova_pip_packages:
 # Specific pip packages provided by the user
 nova_user_pip_packages: []
 
-nova_optional_oslomsg_amqp1_pip_packages:
-  - oslo.messaging[amqp1]
-
 nova_qemu_user: libvirt-qemu
 nova_qemu_group: kvm
 
diff --git a/vars/debian.yml b/vars/debian.yml
index 1c0be27c..1c49187f 100644
--- a/vars/debian.yml
+++ b/vars/debian.yml
@@ -63,11 +63,6 @@ nova_compute_packages:
 nova_compute_barbican_distro_packages:
   - cryptsetup
 
-nova_compute_oslomsg_amqp1_distro_packages:
-  - libssl-dev
-  - libsasl2-modules
-  - sasl2-bin
-
 nova_compute_kvm_distro_packages:
   - libvirt-daemon
   - libvirt-daemon-system
diff --git a/vars/distro_install.yml b/vars/distro_install.yml
index 1c60acbd..ccff2240 100644
--- a/vars/distro_install.yml
+++ b/vars/distro_install.yml
@@ -46,9 +46,6 @@ nova_package_list: |-
   {%     set _ = packages.extend(nova_compute_barbican_distro_packages) %}
   {%   endif %}
   {% endif %}
-  {% if nova_oslomsg_amqp1_enabled | bool %}
-  {%   set _ = packages.extend(nova_compute_oslomsg_amqp1_distro_packages) %}
-  {% endif %}
   {% set _ = packages.extend(nova_service_distro_packages) %}
   {{ packages }}
 
diff --git a/vars/main.yml b/vars/main.yml
index 024018a2..43471a9a 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -47,9 +47,6 @@ _nova_ironic_used: |-
 
 nova_venv_packages: |-
   {%- set pkg_list = nova_pip_packages | union(nova_user_pip_packages) %}
-  {%- if nova_oslomsg_amqp1_enabled | bool %}
-  {%-   set _ = pkg_list.extend(nova_optional_oslomsg_amqp1_pip_packages) %}
-  {%- endif %}
   {%- if nova_blazar_enabled | bool %}
   {%-   if (nova_services['nova-scheduler']['group'] in group_names) %}
   {%-     set _ = pkg_list.extend(nova_blazar_pip_packages) %}
diff --git a/vars/redhat.yml b/vars/redhat.yml
index a0b2f545..08fb5838 100644
--- a/vars/redhat.yml
+++ b/vars/redhat.yml
@@ -84,7 +84,3 @@ nova_compute_kvm_pip_packages:
 
 nova_compute_ksm_packages:
   - ksmtuned
-
-nova_compute_oslomsg_amqp1_distro_packages:
-  - cyrus-sasl-plain
-  - cyrus-sasl-md5
diff --git a/vars/source_install.yml b/vars/source_install.yml
index 299343ab..f49cc95e 100644
--- a/vars/source_install.yml
+++ b/vars/source_install.yml
@@ -32,9 +32,6 @@ nova_package_list: |-
   {%     set _ = packages.extend(nova_compute_barbican_distro_packages) %}
   {%   endif %}
   {% endif %}
-  {% if nova_oslomsg_amqp1_enabled | bool %}
-  {%   set _ = packages.extend(nova_compute_oslomsg_amqp1_distro_packages) %}
-  {% endif %}
   {{ packages }}
 
 _nova_bin: "/openstack/venvs/nova-{{ nova_venv_tag }}/bin"