Remove timeout; add more debug