add and remove servers properly