Changes to accommodate asynchronous operation in pre delete function

Code review : Chika Arevalo