Removed some imports, and some lines of code that were unused.
Merge pull request #1 from murphyrandle/master

Removed some extra lines