Took out clustering, modified for 0.8.2-RC2