sonar assisted cleanup
sonar assisted cleanup