Fixed javadoc and removed unused imports