Issue #130
Fix remove cluster coordinator