pruning dead code

I did some source diving and couldn't find where any of this code was
used, so I'm suggesting it be removed.
Merge pull request #436 from koriroys/pruning

pruning dead code