A little more DBSCAN cleanup