SONARJAVA-244 Remove from Sonar way