Removed unused imports and some other stuff
Merge pull request #79 from monsta/remove-unused-stuff

Removed unused imports and some other stuff