Another round of cleanup
Merge pull request #10 from mbabker/unused

Another round of cleanup