sonar assisted cleanup