Clean up Cluster definition