Revert grid clustering algorithm back (discard Bryan's changes)