GPII-20: simplified server removal process.