Sonar cleanup

Change-Id: Ia39090179a0442c6c12116b8124ad16228a96089