Remove timeout code