remove timeouts part 2