More progress on attachment delete.