Remove references to server_name column