Oc 7484 - clean up hosted server after server delete

Changes made, kindly review & pull.