Using delayed edp delete (braking hncp_pa test but that's normal)