We should remove OnDemand remains and be sure when a para assigned or unassigned for a core we can track it.