remove old stuff
Merge pull request #1 from spike1292/master

remove old stuff