Removed un-used code and imports
Merge pull request #2 from chadlung/master

Removed un-used code and imports