A small improvement regarding cluster connection of client, code cleanup...

..., clear out client-default-config

fixes #1213