Sonar audit - cleaned