Remove lots of [very unnecessary] code
Merge pull request #8 from matthew-andrews/stupid

Remove lots of [very unnecessary] code