Add delete to popupMenu and menuBar.  Call delete in diagramModel from diagramManager. Address issues with merge.