More work on bug #8138.  I added a delete feature.