Given that these are 'suites' now, is clean_cluster even needed?