removed more unused stuff + added class diagram