[coretext] Cleanup
[coretext] Add TODO