Reduce major Sonar issues