Get rid of timeout call