Removing unused class
pom.xml modified to add javadoc plugin
Improving code quality ...
Merge branch 'merging'