BACKLOG-5331
- Implement proper delete