Clean out old code
Merge pull request #2 from onionjake/patch-1

Clean out old code