#48 cleanup of handling of timeouts