Remove some unused code
Merge pull request #4 from biola/cleanup

Remove some unused code