Modif javadocs, remove comments