This now also removes Icon|Diagram with no "graphics" annotation present