Add improved form of server removal.