Cleanup
Class Diag Sprint 2