improved deletion with recalibration and testing