[CLC-2098] Remove intractable TODO