Removed dead code
Merge pull request #39 from lordmat0/feature/clean_up

Removed dead code