WIP - support for delete in calibrate mode