Removed unused imports, fixed javadoc error