SonarQube cleanup

Change-Id: Ieae6ae4bf47ce45828712fb5c2cfefaca573f803