Refactorized DeleteContext
Updated bundle configuration
Removed comments
Merge pull request #95 from chives/dev-refactoring

Refactorized DeleteContext