Removed unused imports and updated class diagram.