Remove 0 timeout feature