fixed more sonarqube violatons

2 jobs for master in 44 minutes and 36 seconds (queued for 5 seconds)