More cleanup
Class Diagram update

Signed-off-by: Pascal Piche <pascal@deuxhuithuit.com>