Issue #3008170 by joseph.olstad, NicolasH, disasm, tizzo, tim.plunkett, sumitk, jhedstrom: Deleting node type leaves orphan nodes