Done cleanup within cluster implementation
12 files changed