removed unused code
clean-up using sonar proposals
clean-up using sonar proposals, sample package-info.java file