Kmeans cleanup

and here