BS-9317: Implementation of Delete Refactoring