diff --git a/ansible/roles/nova/tasks/upgrade.yml b/ansible/roles/nova/tasks/upgrade.yml
index 13027080ebdf31e8ec29145124271c9ddb1b56aa..41399e555036e4c4d4d4c2c0bf407aa031aed58d 100644
--- a/ansible/roles/nova/tasks/upgrade.yml
+++ b/ansible/roles/nova/tasks/upgrade.yml
@@ -2,14 +2,6 @@
 # Create new set of configs on nodes
 - include: config.yml
 
-# TODO(inc0): since nova is creating new database in L->M, we need to call it.
-# It should be removed later
-- include: bootstrap.yml
-
-# TODO(Jeffrey4l): Since nova need setup nova cell in N->O, we need to call it.
-# This should be removed later
-- include: simple_cell_setup.yml
-
 - include: bootstrap_service.yml
 
 - include: register.yml