fixed javadoc and removed unused code