removed sonar issues