- Fixed issues reported by Sonar.
- Removed unused class.