[WG-UMA] Did some cleanup work on the business model diagrams/mappings