Remove/Fix outdated javadoc comments