Clean imports and fix outdated javadoc comments