removed sonar warnings