Remove server_name use