Cleanup script fixes and cmp-script additions

Related-PROD: PROD-34629
Change-Id: I1127ec293b56ec30c8df1021d4e24a95a4421159
diff --git a/cleanup.sh b/cleanup.sh
index 897cee3..14f4479 100644
--- a/cleanup.sh
+++ b/cleanup.sh
@@ -308,7 +308,7 @@
 
 _clean_stacks
 _clean_servers
-
+_clean_flavors
 _clean_users
 _clean_roles
 _clean_snapshots