removed indexes patch and unused imports
expect field-list to be exported