Fix javadoc
Remove sout's