Sonar cleanup

Change-Id: Ief9859f535ff7e85871b893020b36b88376251c9