Work in progress: handling deletes