Refactor of delete methods