SonarQube cleanup

Change-Id: I4ab777cb9fdc04ca871ecffa0d064aa2f1032162