Removed some dead code
Merge branch 'master' of github.com:dhalman/csc344