remove 25 sonar issues