diff --git a/Makefile b/Makefile
index 9eb2e90..3422246 100644
--- a/Makefile
+++ b/Makefile
@@ -1,132 +1,129 @@
 # vim: set noexpandtab:
 
 ANSIBLE = ansible-playbook
 SKIP_TAGS = --skip-tags "init,common"
 
 PROD_BOOK = books/main_prod.yml
 PROD_HOST = -i hosts-prod
 PROD_VARS = ../vars/main.yml
 
 TEST_BOOK = books/main_test.yml
 TEST_HOST = -i hosts-test
 TEST_VARS = ../vars/test.yml
 
-status:
-	nova list
-
 # Everything
 
 list:
 	$(ANSIBLE) $(PROD_BOOK) $(PROD_HOST) --list-hosts
 
 test-list:
 	$(ANSIBLE) $(TEST_BOOK) $(TEST_HOST) --list-hosts
 
 create:
 	$(ANSIBLE) books/openstack_prod.yml
 
 test-create:
 	$(ANSIBLE) books/openstack_test.yml
 
 init:
 	$(ANSIBLE) $(PROD_BOOK) $(PROD_HOST)
 
 test-init:
 	$(ANSIBLE) $(TEST_BOOK) $(TEST_HOST)
 
 all:
 	$(ANSIBLE) $(PROD_BOOK) $(PROD_HOST) $(SKIP_TAGS)
 
 test-all:
 	$(ANSIBLE) $(TEST_BOOK) $(TEST_HOST) $(SKIP_TAGS)
 
 restart:
 	$(ANSIBLE) books/restart.yml
 
 reboot:
 	$(ANSIBLE) books/reboot.yml
 
 stop:
 	$(ANSIBLE) books/stop.yml
 
 version:
 	$(ANSIBLE) --extra-vars="var=$(PROD_VARS)" books/versions.yml
 
 test-version:
 	$(ANSIBLE) --extra-vars="var=$(TEST_VARS)" books/versions.yml
 
 # Specific
 
 app:
 	$(ANSIBLE) $(PROD_BOOK) $(PROD_HOST) --tags conf-app $(SKIP_TAGS)
 
 test-app:
 	$(ANSIBLE) $(TEST_BOOK) $(TEST_HOST) --tags conf-app $(SKIP_TAGS)
 
 fs:
 	$(ANSIBLE) $(PROD_BOOK) $(PROD_HOST) --tags conf-fs $(SKIP_TAGS)
 
 test-fs:
 	$(ANSIBLE) $(TEST_BOOK) $(TEST_HOST) --tags conf-fs $(SKIP_TAGS)
 
 phd:
 	$(ANSIBLE) $(PROD_BOOK) $(PROD_HOST) --tags conf-phd $(SKIP_TAGS)
 
 test-phd:
 	$(ANSIBLE) $(TEST_BOOK) $(TEST_HOST) --tags conf-phd $(SKIP_TAGS)
 
 lbs:
 	$(ANSIBLE) $(PROD_BOOK) $(PROD_HOST) --tags conf-lbs $(SKIP_TAGS)
 
 test-lbs:
 	$(ANSIBLE) $(TEST_BOOK) $(TEST_HOST) --tags conf-lbs $(SKIP_TAGS)
 
 monit:
 	$(ANSIBLE) $(PROD_BOOK) $(PROD_HOST) --tags conf-monit $(SKIP_TAGS)
 
 test-monit:
 	$(ANSIBLE) $(TEST_BOOK) $(TEST_HOST) --tags conf-monit $(SKIP_TAGS)
 
 backup:
 	$(ANSIBLE) $(PROD_BOOK) $(PROD_HOST) --tags conf-backup $(SKIP_TAGS)
 
 dbs:
 	$(ANSIBLE) $(PROD_BOOK) $(PROD_HOST) --tags conf-dbs $(SKIP_TAGS)
 
 test-dbs:
 	$(ANSIBLE) $(TEST_BOOK) $(TEST_HOST) --tags conf-dbs $(SKIP_TAGS)
 
 ci:
 	$(ANSIBLE) $(PROD_BOOK) $(PROD_HOST) --tags jenkins $(SKIP_TAGS)
 
 test-ci:
 	$(ANSIBLE) $(TEST_BOOK) $(TEST_HOST) --tags jenkins $(SKIP_TAGS)
 
 ci-slave:
 	$(ANSIBLE) $(PROD_BOOK) $(PROD_HOST) --tags conf-ci-slave $(SKIP_TAGS)
 
 shib:
 	$(ANSIBLE) $(PROD_BOOK) $(PROD_HOST) --tags conf-shib $(SKIP_TAGS)
 
 gluster:
 	$(ANSIBLE) $(PROD_BOOK) $(PROD_HOST) --tags gluster $(SKIP_TAGS)
 
 common:
 	$(ANSIBLE) $(PROD_BOOK) $(PROD_HOST) --tags common --skip-tags init
 
 # Utils
 
 update-phab:
 	$(ANSIBLE) books/update_prod.yml
 
 test-update-phab:
 	$(ANSIBLE) books/update_test.yml
 
 security:
 	$(ANSIBLE) books/security-update.yml
 
 arbitrator:
 	$(ANSIBLE) books/arbitrator.yml
 
 clean:
 	$(ANSIBLE) books/cleanup.yml