Cluster cleanup
Further chunk and cluster refactoring