UI_CORE: Removed unnecessary TODO