Code review
Removes cluster for client