Improve cluster note deletion operation