Fix servers deletion, add refactoring

Change-Id: Ie566ab9b9d967aa87987239c2062381822fb0961