Sonar lint cleanup.