Kmeans cleanup

REQUIRE please (I know its not your fault, but we are touching the code already anyways