[misc] Fix javadoc which is both not true and a nonsense anyway
[misc] Various cleanup