OSNG-8
removed some sonar violations