Remove some unused imports
Merge pull request #188 from timiblossom/master

Code cleaning. LGTM, committing