Merge "Remove duplicate calls to clear_servers"