Clean unused imports
Merge pull request #19 from jpvanhal/unused-imports

Clean unused imports