More Sonar and java warning clean up
65 files changed