Drop a bunch of unneeded imports
pedantry: Class methods use cls, not self
Merge pull request #9 from bochecha/cleanup

Cleanup