Update dependencies
SonarQube inspired cleanup