DNN-5733 - Tune RollBack and Delete methdos