Remove unused code
Merge pull request #7 from mbabker/unused

Remove unused code