Sonar cleanup

Change-Id: I2f7b5f3904dd3210c0ccce13bd6e38204ea518c5