Removing commented code. Fixing java-doc