[Lint fix] Remove unused imports
[Lint fix] add description for @return tags