Make sure server is stopped before deleting, as if you don't, the delete will partially fail.
Remove TODO since prior patch fixes it.
Merge pull request #185 from IronTetsubo/pull1

Make sure a server is stopped before deleting it