Fix for server removal