Add javadoc comments, remove obsolete imports.