Remove ClassDiagram
Remove a repeated incorrect copy paste comment
Remove a bunch of duplicated functions