SONARJAVA-299 Remove from Sonar way