Remove "never timeout" feature