Improve cluster removal from GUI