MB-67 #comment Fix server deletion.