SonarQube cleanup

Change-Id: I0c5dacf2ae9b2f4b38c971c8fc09a063aceab320