javadoc
removed apache commons library usage
Cleanup (useless deprecation; annotations)