Remove server checking