fix some javadocs
remove unused calls