Sonar cleanup

Change-Id: I3d0ceb08b123262d564e37da84478d922f4686d3