Bug fix - Deleted servers were re-entering the server list if app was killed and restarted. Also, minor code cleanup.