WIP: support for delete