Cleanup imports and unused variables.
Merge pull request #81 from lefou/cleanup

Cleanup imports and unused variables.