Remove unused imports and close #1