Fixed server removal so that it works with map saving.