Class Diagram + Removing unused resources