Remove clustering. Fixes #303