Make clustering optional

Closes #1