cleanup according to class diagram