Optimized and cleared clustering code
Some more cleaning of clustering code, disabled kmeans repeats (for speed up and to avoid infinite loops)