Server remove fix