Delete refactored