Removed hardcoded servername