Merge "Remove dangling javadoc"