Delete ALL the things!
DELETE! DELETE! (and add a few things)
Merge pull request #2 from tterrag1098/master

More deleting and refactoring