Sonar cleanup

Change-Id: I5eca3b8ddce71a51f8f87c2b45f00874e25d8eeb