Clustering cleaned up