Updated the cluster removal algorithm according to study by Kei