Sonar cleanup

Change-Id: Idb45e64eadb1a17e8640a60693550783e4651f7b