missed some extra timeout code
no longer needed timeout args checks