Fixing clustering(s) memory leaks