Delete diagram
Fix mappings
<Greg>