Refactorized DeleteContext