Man, I am strugling with the exact same thing, driving me nuts.
Could you please post your working version of the delete and edit so i can learn from it.

Thanks!