Delete refactoring