Changed default timeout to 10 seconds, removed old code