[#523] adapt cluster count when point is removed
Merged cluster count fix [#523] into tests/524_clustering