removing server-sniff - slooow