remove 21 sonar issues