diff --git a/tasks/nova_db_setup.yml b/tasks/nova_db_setup.yml
index 0ab315d2..5df8adae 100644
--- a/tasks/nova_db_setup.yml
+++ b/tasks/nova_db_setup.yml
@@ -85,15 +85,3 @@
   failed_when: "nova_cell1_create.rc not in [0, 2]"
   changed_when: "nova_cell1_create.rc == 0"
   when: "_cell_uuid.rc == 1"
-
-# TODO(noonedeadpunk): Remove this task in X release
-- name: "Upgrade {{ nova_cell1_name }} to use template for connection"
-  command: >-
-    {{ nova_bin }}/nova-manage cell_v2 update_cell
-      --cell_uuid {{ _cell_uuid['stdout'].split()[3] }}
-      --database_connection {scheme}://{username}:{password}@{hostname}:{port}/{path}?{query}
-      --transport-url {scheme}://{username}:{password}@{hostname}:{port}//{path}?{query}
-  become: yes
-  become_user: "{{ nova_system_user_name }}"
-  changed_when: false
-  when: "_cell_uuid.rc == 0"