Refactor delete_server calls