Javadoc mods + removed unused imports