Clean up Unused Imports.
Merge pull request #7 from alexandre-normand/clean-imports

Clean up Unused Imports.