refactoring clusters back to server.