Got rid of some useless cruft that we never ended up using
Merge pull request #209 from etingel/cleanup

Got rid of some useless cruft that we never ended up using