Deletion refactored