Fix duplicate servers after remove
Merge pull request #64 from aivus/fix_remove_servers

Fix duplicate servers after remove