Simplify timeout handling