cleanup up UML

Added attr types (not yet rendered) in diagram
Removed unused class