Correctly initialize timeout, remove some cmd line options.