remove cruft
Merge pull request #135 from pvecchione/fixes-from-matthew

remove cruft