Updated TODO.
Improved removal of entities in core.