Clean up unused code
Merge branch 'master' of http://github.com/tmerr/TrevorNet