remove old stuff
Merge pull request #586 from goodfeli/master

remove old stuff