Lots of JavaDoc fixes, remove unnecessary code