Remove last Sonar issues