[sonar:simple-fixes] Drop use of String.valueOf

Where it's use is not justified