Some sonar fixes. Also removed all the @versions in the javadoc