Sonar cleanup

Change-Id: Ie5ccb5b6b32438798ee7b130b4bff742f2e1de63