Performance improved -> no more cpts deletion when entities reset