Sonar cleanup

Change-Id: Iae45c81907990a150c21e63402be850918782240