removed global 'server_' pointer