Add fix for servers deletion

Change-Id: I106dcf0e2befb159c8ac3eac8b4218584fdd2cfa