Remove Sonar issue