Fix delete

Add
Revert "Fix delete"

This reverts commit 01522bd141925fdd45ee46ca4a44f1db700a183b.
Revert "Revert "Fix delete""

This reverts commit 779353408a2bf2678a6802926c3fb0b6437ca6b2.