[WIP] Refactorized DeleteContext