[CLC-2098] Remove intractable TODO
Merge pull request #1325 from yuhunglin/CLC-2098

[CLC-2098] Remove intractable TODO