Remove code made unnecessary by #28
Merge pull request #29 from myint/master

Remove code made unnecessary by #28